Fixing to follow the project structure of the new template