Correct the structure of the project and it's scripts