reworking directory structure