Much better project structure.