directory structure rework