added improved structure of the project