Changing to new project structure