Reorganise the Equipment module to be less of a mess