Minor changes in Project structure