Tweaked project structure