Project cleanup
Renaming project in various file