Renamed project, refactored namespace dirs