Reorganise and references