Reworking directory structure