Rework project directory structure