reworked folder structure