A bit better project structure.