Reorganise for new repo layout convention