Reworking project layout