folder structure reworking