Updated the project directory structure to math the files namespace