Folder restructure
Modified namespace