moved some more stuff
more stuff moved into autoloaders