Reorganization of dimensions

Follow