refactored the layout of the project