Reworked project layout