Reorganise main.less