Switched to traditional project structure