Improved structure of the project