Minor changes in project structure