Directory structure reworked