Directory structure rework