Modified project structure