Updating to new project structure