Altered namespace for directory structure
Updated autoloading schema