More override annotations and fix reflection in API to point to proper
class
More cleanup and simplifying of code
Use class references
Import cleanup
Format the module loading log properly
Lots of cleanup and simplifying, tons more to go