Fixed inconsistencies with the project and the file structure