Removed 'Core' Folder and added namespaces for sub-dir