Dir structure reorganization