Improved file structure of the project