Tweaking project structure