Renamed Project folders to match Namespaces