Improved structure of project