Project Clean up

Cleaning up the name change and project structure.