Reorganise directory to cooperate with redports
Merge branch 'vendor'