Changing namespaces to better autoloading