CHANGE: improved structure of the project