Tweaked project organization