Fixing namespacing & autoloading