Reworking some things and renaming the project