diff --git a/README.md b/README.md
index 6e51276b..71c7ba2f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Angel3 Framework
-[](https://github.com/dukefirehawk/angel)
+[](https://github.com/dukefirehawk/angel)
[](https://dart.dev/null-safety)
diff --git a/angel3_logo.svg b/angel3_logo.svg
new file mode 100644
index 00000000..ea984e5f
--- /dev/null
+++ b/angel3_logo.svg
@@ -0,0 +1,148 @@
+
+
+
+
diff --git a/archived_packages/eventsource.zip b/archived/eventsource.zip
similarity index 100%
rename from archived_packages/eventsource.zip
rename to archived/eventsource.zip
diff --git a/logo.png b/archived/logo.png
similarity index 100%
rename from logo.png
rename to archived/logo.png
diff --git a/logo3.png b/archived/logo3.png
similarity index 100%
rename from logo3.png
rename to archived/logo3.png
diff --git a/archived_packages/orm.zip b/archived/orm.zip
similarity index 100%
rename from archived_packages/orm.zip
rename to archived/orm.zip
diff --git a/archived_packages/poll.zip b/archived/poll.zip
similarity index 100%
rename from archived_packages/poll.zip
rename to archived/poll.zip
diff --git a/archived_packages/relations.zip b/archived/relations.zip
similarity index 100%
rename from archived_packages/relations.zip
rename to archived/relations.zip
diff --git a/archived_packages/rethink.zip b/archived/rethink.zip
similarity index 100%
rename from archived_packages/rethink.zip
rename to archived/rethink.zip
diff --git a/archived_packages/seeder.zip b/archived/seeder.zip
similarity index 100%
rename from archived_packages/seeder.zip
rename to archived/seeder.zip
diff --git a/tool/archived/move_repos b/archived/tool/archived/move_repos
similarity index 100%
rename from tool/archived/move_repos
rename to archived/tool/archived/move_repos
diff --git a/tool/archived/pull_subproject b/archived/tool/archived/pull_subproject
similarity index 100%
rename from tool/archived/pull_subproject
rename to archived/tool/archived/pull_subproject
diff --git a/archived_packages/typed_service.zip b/archived/typed_service.zip
similarity index 100%
rename from archived_packages/typed_service.zip
rename to archived/typed_service.zip
diff --git a/archived_packages/wings.zip b/archived/wings.zip
similarity index 100%
rename from archived_packages/wings.zip
rename to archived/wings.zip
diff --git a/experiment/container/example1/analysis_options.yaml b/experiment/container/example1/analysis_options.yaml
deleted file mode 100644
index ea2c9e94..00000000
--- a/experiment/container/example1/analysis_options.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include: package:lints/recommended.yaml
\ No newline at end of file
diff --git a/experiment/container/example1/bin/example.dart b/experiment/container/example1/bin/example.dart
deleted file mode 100644
index baaa299a..00000000
--- a/experiment/container/example1/bin/example.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'package:angel3_container/mirrors.dart';
-import 'package:angel3_framework/angel3_framework.dart';
-import 'package:angel3_framework/http.dart';
-import 'package:logging/logging.dart';
-
-void main() async {
- print("Starting up");
- //Logger.root.onRecord.listen(print);
-
- var app = Angel(logger: Logger('example'), reflector: MirrorsReflector());
- var http = AngelHttp(app);
-
- app.get("/", (req, res) => "Hello, world!");
-
- // Simple fallback to throw a 404 on unknown paths.
- /*
- app.fallback((req, res) {
- throw AngelHttpException.notFound(
- message: 'Unknown path: "${req.uri?.path}"',
- );
- });
- */
-
- await http.startServer('localhost', 3000);
-
- print("End");
-}
diff --git a/experiment/container/example1/bin/main.dart b/experiment/container/example1/bin/main.dart
deleted file mode 100644
index 55ba50ac..00000000
--- a/experiment/container/example1/bin/main.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'dart:mirrors';
-import 'package:example1/src/models.dart';
-
-void main() {
- final stopwatch = Stopwatch()..start();
-
- var reflectedClass = reflect(Shape());
-
- reflectedClass.invoke(#draw, []);
-
- //reflectedClass.invoke(Symbol('draw'), []);
-
- print('Reflection executed in ${stopwatch.elapsed.inMilliseconds} ms');
- stopwatch.stop();
-
- printAnnotationValue(String);
- printAnnotationValue(Shape);
- printAnnotationValue(Square);
-}
-
-class Shape {
- void draw() => print("Draw Shape");
-}
-
-@Person('Will', 'Tom')
-class Square {
- void greetHii() {
- print("Hii Welcome to flutter agency");
- }
-}
-
-void printAnnotationValue(final Type clazz) {
- final DeclarationMirror clazzDeclaration = reflectClass(clazz);
- final ClassMirror someAnnotationMirror = reflectClass(Person);
- final annotationInstsanceMirror =
- clazzDeclaration.metadata.where((d) => d.type == someAnnotationMirror);
- if (annotationInstsanceMirror.isEmpty) {
- print('No annotated class found');
- return;
- }
- final someAnnotationInstance =
- (annotationInstsanceMirror.first.reflectee as Person);
- print(someAnnotationInstance.firstName);
-}
diff --git a/experiment/container/example1/lib/src/models.dart b/experiment/container/example1/lib/src/models.dart
deleted file mode 100644
index abc1b6d8..00000000
--- a/experiment/container/example1/lib/src/models.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-class Person {
- final String firstName;
- final String lastName;
- const Person(this.firstName, this.lastName);
-}
diff --git a/experiment/container/example1/pubspec.yaml b/experiment/container/example1/pubspec.yaml
deleted file mode 100644
index bd25ed33..00000000
--- a/experiment/container/example1/pubspec.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: example1
-version: 0.0.1
-description: Example 1.
-environment:
- sdk: '>=2.18.0 <3.0.0'
-dependencies:
- angel3_container: ^7.0.0
- angel3_http_exception: ^7.0.0
- angel3_framework: ^7.0.0
- angel3_model: ^7.0.0
- angel3_route: ^7.0.0
- angel3_mock_request: ^7.0.0
- belatuk_merge_map: ^4.0.0
- belatuk_combinator: ^4.0.0
- belatuk_http_server: ^3.0.0
- charcode: ^1.2.0
- file: ^6.1.0
- http_parser: ^4.0.0
- http2: ^2.0.0
- logging: ^1.0.0
- matcher: ^0.12.10
- meta: ^1.3.0
- mime: ^1.0.0
- path: ^1.8.0
- quiver: ^3.0.1
- recase: ^4.0.0
- stack_trace: ^1.10.0
- string_scanner: ^1.1.0
- tuple: ^2.0.0
- uuid: ^3.0.1
- collection: ^1.15.0
-dev_dependencies:
- http: ^0.13.1
- io: ^1.0.0
- test: ^1.21.0
- lints: ^2.0.0
-# dependency_overrides:
-# angel3_container:
-# path: ../container/angel_container
-# angel3_http_exception:
-# path: ../http_exception
-# angel3_model:
-# path: ../model
-# angel3_route:
-# path: ../route
-# angel3_mock_request:
-# path: ../mock_request
-
diff --git a/experiment/container/example2/analysis_options.yaml b/experiment/container/example2/analysis_options.yaml
deleted file mode 100644
index ea2c9e94..00000000
--- a/experiment/container/example2/analysis_options.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include: package:lints/recommended.yaml
\ No newline at end of file
diff --git a/experiment/container/example2/bin/example1.dart b/experiment/container/example2/bin/example1.dart
deleted file mode 100644
index ee4a6f7c..00000000
--- a/experiment/container/example2/bin/example1.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'package:angel3_container/mirrors.dart';
-import 'package:angel3_framework/angel3_framework.dart';
-import 'package:angel3_framework/http.dart';
-
-@Expose('/controller', method: 'GET')
-class MyController extends Controller {
- @Expose('/', method: 'GET')
- Future route1(RequestContext req, ResponseContext res) async {
- return "My route";
- }
-}
-
-@Expose('/sales', middleware: [process1])
-class SalesController extends Controller {
- @Expose('/', middleware: [process2])
- Future route1(RequestContext req, ResponseContext res) async {
- return "Sales route";
- }
-}
-
-bool process1(RequestContext req, ResponseContext res) {
- res.write('Hello, ');
- return true;
-}
-
-bool process2(RequestContext req, ResponseContext res) {
- res.write('From Sales, ');
- return true;
-}
-
-void main() async {
- // Using Mirror Reflector
- var app = Angel(reflector: MirrorsReflector());
-
- // My Controller
- app.container.registerSingleton(MyController());
- await app.mountController();
-
- // Sales Controller
- app.container.registerSingleton(SalesController());
- await app.mountController();
-
- var http = AngelHttp(app);
- var server = await http.startServer('localhost', 3000);
- print("Angel server listening at ${http.uri}");
-}
diff --git a/experiment/container/example2/bin/example2.dart b/experiment/container/example2/bin/example2.dart
deleted file mode 100644
index 959c6764..00000000
--- a/experiment/container/example2/bin/example2.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-import 'package:angel3_container/mirrors.dart';
-import 'package:angel3_framework/angel3_framework.dart';
-import 'package:angel3_framework/http.dart';
-
-class Todo extends Model {
- String? text;
- String? over;
-
- Todo({this.text, this.over});
-
- Map toJson() {
- return {
- 'text': text,
- 'over': over,
- };
- }
-}
-
-@Expose('/todo', method: 'GET')
-class TodoController extends Controller {
- @Expose('/')
- Todo todo(Todo singleton) => singleton;
-}
-
-@Expose('/controller', method: 'GET')
-class MyController extends Controller {
- @Expose('/', method: 'GET')
- Future route1(RequestContext req, ResponseContext res) async {
- return "My route";
- }
-
- //Todo todo(Todo singleton) => singleton;
-}
-
-@Expose('/sales', middleware: [process1])
-class SalesController extends Controller {
- @Expose('/', middleware: [process2])
- Future route1(RequestContext req, ResponseContext res) async {
- return "Sales route";
- }
-}
-
-bool process1(RequestContext req, ResponseContext res) {
- res.write('Hello, ');
- return true;
-}
-
-bool process2(RequestContext req, ResponseContext res) {
- res.write('From Sales, ');
- return true;
-}
-
-void main() async {
- // Using Mirror Reflector
- var app = Angel(reflector: MirrorsReflector());
-
- await app.configure(MyController().configureServer);
- await app.configure(SalesController().configureServer);
-
- var http = AngelHttp(app);
- var server = await http.startServer('localhost', 3000);
- print("Angel server listening at ${http.uri}");
-}
diff --git a/experiment/container/example2/bin/example3_controller.dart b/experiment/container/example2/bin/example3_controller.dart
deleted file mode 100644
index c01d640d..00000000
--- a/experiment/container/example2/bin/example3_controller.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:angel3_container_generator/angel3_container_generator.dart';
-import 'package:angel3_framework/angel3_framework.dart';
-import 'package:angel3_framework/http.dart';
-
-import 'example3_controller.reflectable.dart';
-
-@contained
-@Expose('/controller', method: 'GET')
-class MyController extends Controller {
- @Expose('/')
- Order order(Order singleton) => singleton;
-
- //Todo todo(Todo singleton) => singleton;
-}
-
-class Todo extends Model {
- String? text;
- String? over;
-
- Todo({this.text, this.over});
-
- Map toJson() {
- return {
- 'text': text,
- 'over': over,
- };
- }
-}
-
-class FoodItem {
- final String name;
- final num price;
- final num qty;
-
- FoodItem(this.name, this.price, this.qty);
-}
-
-class Order {
- FoodItem item;
-
- String? get name => item.name;
-
- Order(this.item);
-}
-
-void main() async {
- //var reflector = const GeneratedReflector();
- //Container container = Container(reflector);
- //container.registerSingleton(SalesController());
-
- // Using GeneratedReflector
- initializeReflectable();
- var app = Angel(reflector: GeneratedReflector());
-
- // Using MirrorReflector
- //var app = Angel(reflector: MirrorsReflector());
- //await app.configure(MyController().configureServer);
-
- // My Controller
- //app.container.registerSingleton(MyController());
- //await app.mountController();
- await app.configure(MyController().configureServer);
-
- // Sales Controller
- //app.container.registerSingleton(SalesController());
- //await app.mountController();
-
- var http = AngelHttp(app);
-
- var server = await http.startServer('localhost', 3000);
- print("Angel server listening at ${http.uri}");
-}
diff --git a/experiment/container/example2/bin/example3_controller.reflectable.dart b/experiment/container/example2/bin/example3_controller.reflectable.dart
deleted file mode 100644
index 751e0f40..00000000
--- a/experiment/container/example2/bin/example3_controller.reflectable.dart
+++ /dev/null
@@ -1,10610 +0,0 @@
-// This file has been generated by the reflectable package.
-// https://github.com/dart-lang/reflectable.
-
-import 'dart:core';
-import 'dart:async' as prefix10;
-import 'dart:convert' as prefix20;
-import 'dart:math' as prefix28;
-import 'example3_controller.dart' as prefix1;
-import 'package:angel3_container/src/container.dart' as prefix26;
-import 'package:angel3_container/src/reflector.dart' as prefix8;
-import 'package:angel3_container/src/throwing.dart' as prefix14;
-import 'package:angel3_container_generator/angel3_container_generator.dart'
- as prefix0;
-import 'package:angel3_framework/src/core/controller.dart' as prefix2;
-import 'package:angel3_framework/src/core/env.dart' as prefix15;
-import 'package:angel3_framework/src/core/hooked_service.dart' as prefix22;
-import 'package:angel3_framework/src/core/metadata.dart' as prefix11;
-import 'package:angel3_framework/src/core/request_context.dart' as prefix23;
-import 'package:angel3_framework/src/core/response_context.dart' as prefix27;
-import 'package:angel3_framework/src/core/routable.dart' as prefix9;
-import 'package:angel3_framework/src/core/server.dart' as prefix6;
-import 'package:angel3_framework/src/core/service.dart' as prefix25;
-import 'package:angel3_route/src/middleware_pipeline.dart' as prefix19;
-import 'package:angel3_route/src/router.dart' as prefix7;
-import 'package:belatuk_combinator/src/combinator/combinator.dart' as prefix18;
-import 'package:logging/src/logger.dart' as prefix24;
-import 'package:meta/meta.dart' as prefix16;
-import 'package:mime/src/mime_type.dart' as prefix21;
-import 'package:reflectable/capability.dart' as prefix13;
-import 'package:reflectable/mirrors.dart' as prefix12;
-import 'package:reflectable/reflectable.dart' as prefix3;
-import 'package:reflectable/src/reflectable_base.dart' as prefix5;
-import 'package:reflectable/src/reflectable_builder_based.dart' as prefix4;
-import 'package:tuple/tuple.dart' as prefix17;
-
-// ignore_for_file: camel_case_types
-// ignore_for_file: implementation_imports
-// ignore_for_file: prefer_adjacent_string_concatenation
-// ignore_for_file: prefer_collection_literals
-// ignore_for_file: unnecessary_const
-
-// ignore:unused_import
-import 'package:reflectable/mirrors.dart' as m;
-// ignore:unused_import
-import 'package:reflectable/src/reflectable_builder_based.dart' as r;
-// ignore:unused_import
-import 'package:reflectable/reflectable.dart' as r show Reflectable;
-
-final _data = {
- const prefix0.ContainedReflectable(): r.ReflectorData(
- [
- r.NonGenericClassMirrorImpl(
- r'MyController',
- r'.MyController',
- 134217735,
- 0,
- const prefix0.ContainedReflectable(),
- const [112, 113],
- const [
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 112
- ],
- const [],
- 2,
- {},
- {},
- {r'': (bool b) => () => b ? prefix1.MyController() : null},
- 0,
- 0,
- const [],
- const