Start working on Dimension & Metric reorganization