Directory structure reorganization