Reorganise class loader