diff --git a/packages/configuration/.gitignore b/packages/configuration/.gitignore
index 5e6bb7e7..24d68312 100644
--- a/packages/configuration/.gitignore
+++ b/packages/configuration/.gitignore
@@ -1,63 +1,32 @@
-# Created by .ignore support plugin (hsz.mobi)
-### JetBrains template
-.idea
-*.iml
+# See https://www.dartlang.org/tools/private-files.html
 
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# Files and directories created by pub
+.dart_tool
+.packages
+.pub/
+build/
 
-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
+# If you're building an application, you may want to check-in your pubspec.lock
+pubspec.lock
 
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
+# Directory created by dartdoc
+# If you don't generate documentation locally you can remove this line.
+doc/api/
 
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
 ### Dart template
 # See https://www.dartlang.org/tools/private-files.html
 
 # Files and directories created by pub
-.buildlog
-.packages
+
+# SDK 1.20 and later (no longer creates packages directories)
+
+# Older SDK versions
+# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
 .project
-.pub/
-build/
+.buildlog
 **/packages/
 
+
 # Files created by dart2js
 # (Most Dart developers will use pub build to compile Dart, use/modify these
 #  rules if you intend to use dart2js directly
@@ -70,10 +39,33 @@ build/
 *.info.json
 
 # Directory created by dartdoc
-doc/api/
 
 # Don't commit pubspec lock file
 # (Library packages only! Remove pattern if developing an application package)
-pubspec.lock
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-.dart_tool
\ No newline at end of file
+# User-specific stuff:
+
+## VsCode
+.vscode/
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+.idea/
+/out/
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
diff --git a/packages/configuration/AUTHORS.md b/packages/configuration/AUTHORS.md
index 2a973de6..ac95ab58 100644
--- a/packages/configuration/AUTHORS.md
+++ b/packages/configuration/AUTHORS.md
@@ -1,2 +1,12 @@
-Tobe O <thosakwe@gmail.com>
-Thomas Hii <thomashii@dukefirehawk.com>
\ No newline at end of file
+Primary Authors
+===============
+
+* __[Thomas Hii](dukefirehawk.apps@gmail.com)__
+
+    Thomas is the current maintainer of the code base. He has refactored and migrated the 
+    code base to support NNBD.
+
+* __[Tobe O](thosakwe@gmail.com)__
+
+    Tobe has written much of the original code prior to NNBD migration. He has moved on and
+    is no longer involved with the project.
diff --git a/packages/configuration/LICENSE b/packages/configuration/LICENSE
index eb4ce33e..b593ac86 100644
--- a/packages/configuration/LICENSE
+++ b/packages/configuration/LICENSE
@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2016 angel-dart
+Copyright (c) 2021 dukefirehawk.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/configuration/README.md b/packages/configuration/README.md
index 7fa10919..274267d1 100644
--- a/packages/configuration/README.md
+++ b/packages/configuration/README.md
@@ -1,7 +1,9 @@
-# configuration
+# angel3_configuration
+[![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_configuration)
+[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
+
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/configuration/LICENSE)
 
-[![Pub](https://img.shields.io/pub/v/angel_configuration.svg)](https://pub.dartlang.org/packages/angel_configuration)
-[![build status](https://travis-ci.org/angel-dart/configuration.svg)](https://travis-ci.org/angel-dart/configuration)
 
 Automatic YAML configuration loader for Angel.
 
@@ -17,7 +19,7 @@ In `pubspec.yaml`:
 
 ```yaml
 dependencies:
-    angel_configuration: ^2.0.0
+    angel3_configuration: ^3.0.0
 ```
 
 # Usage
diff --git a/packages/configuration/example/main.dart b/packages/configuration/example/main.dart
index 1344cc1e..4a9e435b 100644
--- a/packages/configuration/example/main.dart
+++ b/packages/configuration/example/main.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:angel_configuration/angel_configuration.dart';
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_configuration/angel3_configuration.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:file/local.dart';
 
 Future<void> main() async {
diff --git a/packages/configuration/lib/angel_configuration.dart b/packages/configuration/lib/angel3_configuration.dart
similarity index 96%
rename from packages/configuration/lib/angel_configuration.dart
rename to packages/configuration/lib/angel3_configuration.dart
index 5803c368..41615436 100644
--- a/packages/configuration/lib/angel_configuration.dart
+++ b/packages/configuration/lib/angel3_configuration.dart
@@ -1,11 +1,11 @@
-library angel_configuration;
+library angel3_configuration;
 
 import 'dart:async';
 
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:dotenv/dotenv.dart' as dotenv;
 import 'package:file/file.dart';
-import 'package:merge_map/merge_map.dart';
+import 'package:angel3_merge_map/angel3_merge_map.dart';
 import 'package:yaml/yaml.dart';
 
 Future<void> _loadYamlFile(Map map, File yamlFile, Map<String, String> env,
diff --git a/packages/configuration/pubspec.yaml b/packages/configuration/pubspec.yaml
index 86010d59..4d90ce8c 100644
--- a/packages/configuration/pubspec.yaml
+++ b/packages/configuration/pubspec.yaml
@@ -1,27 +1,19 @@
-name: angel_configuration
+name: angel3_configuration
 description: Automatic YAML application configuration loader for Angel, with .env support.
 version: 3.0.0
-homepage: https://github.com/dukefirehawk/angel
+homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/configuration
 publish_to: none
 environment:
   sdk: '>=2.12.0 <3.0.0'
 dependencies:
-  angel_framework:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/framework
+  angel3_framework: ^4.0.0
+  angel3_merge_map: ^2.0.0
   dotenv: ^3.0.0-nullsafety.0
 #  file: ^5.0.0
-  merge_map:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/merge_map
   yaml: ^3.1.0
 dev_dependencies:
   io: ^1.0.0
 #  logging: ^0.11.0
   pedantic: ^1.11.0
-#  pretty_logging: ^1.0.0
+  angel3_pretty_logging: ^3.0.0
   test: ^1.17.3
diff --git a/packages/configuration/test/all_test.dart b/packages/configuration/test/all_test.dart
index d9839ef0..c7eea151 100644
--- a/packages/configuration/test/all_test.dart
+++ b/packages/configuration/test/all_test.dart
@@ -1,14 +1,15 @@
 import 'dart:async';
 
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_configuration/angel_configuration.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_configuration/angel3_configuration.dart';
+import 'package:angel3_pretty_logging/angel3_pretty_logging.dart';
 import 'package:file/local.dart';
 import 'package:io/ansi.dart';
 import 'package:logging/logging.dart';
 import 'package:test/test.dart';
 
 Future<void> main() async {
-  //Logger.root.onRecord.listen(prettyLog);
+  Logger.root.onRecord.listen(prettyLog);
 
   // Note: Set ANGEL_ENV to 'development'
   var app = Angel(logger: Logger('angel_configuration'));
diff --git a/packages/hot/.gitignore b/packages/hot/.gitignore
index 99e7978e..24d68312 100644
--- a/packages/hot/.gitignore
+++ b/packages/hot/.gitignore
@@ -1,39 +1,55 @@
 # See https://www.dartlang.org/tools/private-files.html
 
 # Files and directories created by pub
+.dart_tool
 .packages
 .pub/
 build/
+
 # If you're building an application, you may want to check-in your pubspec.lock
 pubspec.lock
 
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.
 doc/api/
+
+### Dart template
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+
+# SDK 1.20 and later (no longer creates packages directories)
+
+# Older SDK versions
+# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
+.project
+.buildlog
+**/packages/
+
+
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
+*.dart.js
+*.part.js
+*.js.deps
+*.js.map
+*.info.json
+
+# Directory created by dartdoc
+
+# Don't commit pubspec lock file
+# (Library packages only! Remove pattern if developing an application package)
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
 
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
+## VsCode
+.vscode/
 
 ## File-based project format:
 *.iws
@@ -41,9 +57,8 @@ doc/api/
 ## Plugin-specific files:
 
 # IntelliJ
+.idea/
 /out/
-
-# mpeltonen/sbt-idea plugin
 .idea_modules/
 
 # JIRA plugin
diff --git a/packages/hot/AUTHORS.md b/packages/hot/AUTHORS.md
index 2a973de6..ac95ab58 100644
--- a/packages/hot/AUTHORS.md
+++ b/packages/hot/AUTHORS.md
@@ -1,2 +1,12 @@
-Tobe O <thosakwe@gmail.com>
-Thomas Hii <thomashii@dukefirehawk.com>
\ No newline at end of file
+Primary Authors
+===============
+
+* __[Thomas Hii](dukefirehawk.apps@gmail.com)__
+
+    Thomas is the current maintainer of the code base. He has refactored and migrated the 
+    code base to support NNBD.
+
+* __[Tobe O](thosakwe@gmail.com)__
+
+    Tobe has written much of the original code prior to NNBD migration. He has moved on and
+    is no longer involved with the project.
diff --git a/packages/hot/LICENSE b/packages/hot/LICENSE
index 89074fd3..b593ac86 100644
--- a/packages/hot/LICENSE
+++ b/packages/hot/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 The Angel Framework
+Copyright (c) 2021 dukefirehawk.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/validate/.gitignore b/packages/validate/.gitignore
index 8160f445..24d68312 100644
--- a/packages/validate/.gitignore
+++ b/packages/validate/.gitignore
@@ -1,15 +1,34 @@
 # See https://www.dartlang.org/tools/private-files.html
 
 # Files and directories created by pub
-.buildlog
+.dart_tool
 .packages
-.project
 .pub/
 build/
+
+# If you're building an application, you may want to check-in your pubspec.lock
+pubspec.lock
+
+# Directory created by dartdoc
+# If you don't generate documentation locally you can remove this line.
+doc/api/
+
+### Dart template
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+
+# SDK 1.20 and later (no longer creates packages directories)
+
+# Older SDK versions
+# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
+.project
+.buildlog
 **/packages/
 
+
 # Files created by dart2js
-# (Most Dart developers will use pub build to compile Dart, use/modify these 
+# (Most Dart developers will use pub build to compile Dart, use/modify these
 #  rules if you intend to use dart2js directly
 #  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
 #  differentiate from explicit Javascript files)
@@ -20,13 +39,33 @@ build/
 *.info.json
 
 # Directory created by dartdoc
-doc/api/
 
-# Don't commit pubspec lock file 
+# Don't commit pubspec lock file
 # (Library packages only! Remove pattern if developing an application package)
-pubspec.lock
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-log.txt
+# User-specific stuff:
 
-.idea
-.dart_tool
\ No newline at end of file
+## VsCode
+.vscode/
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+.idea/
+/out/
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
diff --git a/packages/validate/AUTHORS.md b/packages/validate/AUTHORS.md
index 2a973de6..ac95ab58 100644
--- a/packages/validate/AUTHORS.md
+++ b/packages/validate/AUTHORS.md
@@ -1,2 +1,12 @@
-Tobe O <thosakwe@gmail.com>
-Thomas Hii <thomashii@dukefirehawk.com>
\ No newline at end of file
+Primary Authors
+===============
+
+* __[Thomas Hii](dukefirehawk.apps@gmail.com)__
+
+    Thomas is the current maintainer of the code base. He has refactored and migrated the 
+    code base to support NNBD.
+
+* __[Tobe O](thosakwe@gmail.com)__
+
+    Tobe has written much of the original code prior to NNBD migration. He has moved on and
+    is no longer involved with the project.
diff --git a/packages/validate/LICENSE b/packages/validate/LICENSE
index 15fe44bd..b593ac86 100644
--- a/packages/validate/LICENSE
+++ b/packages/validate/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 The Angel Framework
+Copyright (c) 2021 dukefirehawk.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal