Reorganized storage entites