Changed file structure of the project