Change Folder Names

Changed the folder name and namespace