Restructured the project.
Renamed