Clean-up and Namespace Fixes, autoload working.