Reorganise modules