reworked project folder structure