Reorganized Hyperspace directory layout