Reorganise namespace loading