refactoring..
Figured out a better way for autoloading
Finished, cleaning up
Merge branch '4.3-refactor-autoload' into 4.3