Cosmetic changes, mostly renaming

Renaming the project, deleting empty lines and comments