Switched to 1 project structure