Adjust to new project structure