Spacemap reorganization