More changes to project structure