Minor changes to project structure