directory structure reworking