Improved structure of the project and removed profiling functions: