diff --git a/surround_view/OWNERS b/cpp/surround_view/OWNERS
similarity index 100%
rename from surround_view/OWNERS
rename to cpp/surround_view/OWNERS
diff --git a/surround_view/app/Android.bp b/cpp/surround_view/app/Android.bp
similarity index 100%
rename from surround_view/app/Android.bp
rename to cpp/surround_view/app/Android.bp
diff --git a/surround_view/app/SurroundViewServiceCallback.cpp b/cpp/surround_view/app/SurroundViewServiceCallback.cpp
similarity index 100%
rename from surround_view/app/SurroundViewServiceCallback.cpp
rename to cpp/surround_view/app/SurroundViewServiceCallback.cpp
diff --git a/surround_view/app/SurroundViewServiceCallback.h b/cpp/surround_view/app/SurroundViewServiceCallback.h
similarity index 100%
rename from surround_view/app/SurroundViewServiceCallback.h
rename to cpp/surround_view/app/SurroundViewServiceCallback.h
diff --git a/surround_view/app/shader.cpp b/cpp/surround_view/app/shader.cpp
similarity index 100%
rename from surround_view/app/shader.cpp
rename to cpp/surround_view/app/shader.cpp
diff --git a/surround_view/app/shader.h b/cpp/surround_view/app/shader.h
similarity index 100%
rename from surround_view/app/shader.h
rename to cpp/surround_view/app/shader.h
diff --git a/surround_view/app/shader_simpleTex.h b/cpp/surround_view/app/shader_simpleTex.h
similarity index 100%
rename from surround_view/app/shader_simpleTex.h
rename to cpp/surround_view/app/shader_simpleTex.h
diff --git a/surround_view/app/sv_app.cpp b/cpp/surround_view/app/sv_app.cpp
similarity index 100%
rename from surround_view/app/sv_app.cpp
rename to cpp/surround_view/app/sv_app.cpp
diff --git a/surround_view/app/sv_app.rc b/cpp/surround_view/app/sv_app.rc
similarity index 100%
rename from surround_view/app/sv_app.rc
rename to cpp/surround_view/app/sv_app.rc
diff --git a/surround_view/sepolicy/file_contexts b/cpp/surround_view/sepolicy/file_contexts
similarity index 100%
rename from surround_view/sepolicy/file_contexts
rename to cpp/surround_view/sepolicy/file_contexts
diff --git a/surround_view/sepolicy/sv_app.te b/cpp/surround_view/sepolicy/sv_app.te
similarity index 100%
rename from surround_view/sepolicy/sv_app.te
rename to cpp/surround_view/sepolicy/sv_app.te
diff --git a/surround_view/sepolicy/sv_service_impl.te b/cpp/surround_view/sepolicy/sv_service_impl.te
similarity index 100%
rename from surround_view/sepolicy/sv_service_impl.te
rename to cpp/surround_view/sepolicy/sv_service_impl.te
diff --git a/surround_view/service-impl/Android.bp b/cpp/surround_view/service-impl/Android.bp
similarity index 100%
rename from surround_view/service-impl/Android.bp
rename to cpp/surround_view/service-impl/Android.bp
diff --git a/surround_view/service-impl/AnimationModule.cpp b/cpp/surround_view/service-impl/AnimationModule.cpp
similarity index 100%
rename from surround_view/service-impl/AnimationModule.cpp
rename to cpp/surround_view/service-impl/AnimationModule.cpp
diff --git a/surround_view/service-impl/AnimationModule.h b/cpp/surround_view/service-impl/AnimationModule.h
similarity index 100%
rename from surround_view/service-impl/AnimationModule.h
rename to cpp/surround_view/service-impl/AnimationModule.h
diff --git a/surround_view/service-impl/AnimationModuleTests.cpp b/cpp/surround_view/service-impl/AnimationModuleTests.cpp
similarity index 100%
rename from surround_view/service-impl/AnimationModuleTests.cpp
rename to cpp/surround_view/service-impl/AnimationModuleTests.cpp
diff --git a/surround_view/service-impl/CameraUtils.cpp b/cpp/surround_view/service-impl/CameraUtils.cpp
similarity index 100%
rename from surround_view/service-impl/CameraUtils.cpp
rename to cpp/surround_view/service-impl/CameraUtils.cpp
diff --git a/surround_view/service-impl/CameraUtils.h b/cpp/surround_view/service-impl/CameraUtils.h
similarity index 100%
rename from surround_view/service-impl/CameraUtils.h
rename to cpp/surround_view/service-impl/CameraUtils.h
diff --git a/surround_view/service-impl/CarModelConfigReader.cpp b/cpp/surround_view/service-impl/CarModelConfigReader.cpp
similarity index 100%
rename from surround_view/service-impl/CarModelConfigReader.cpp
rename to cpp/surround_view/service-impl/CarModelConfigReader.cpp
diff --git a/surround_view/service-impl/CarModelConfigReader.h b/cpp/surround_view/service-impl/CarModelConfigReader.h
similarity index 100%
rename from surround_view/service-impl/CarModelConfigReader.h
rename to cpp/surround_view/service-impl/CarModelConfigReader.h
diff --git a/surround_view/service-impl/CarModelConfigReaderTests.cpp b/cpp/surround_view/service-impl/CarModelConfigReaderTests.cpp
similarity index 100%
rename from surround_view/service-impl/CarModelConfigReaderTests.cpp
rename to cpp/surround_view/service-impl/CarModelConfigReaderTests.cpp
diff --git a/surround_view/service-impl/ConfigReader.cpp b/cpp/surround_view/service-impl/ConfigReader.cpp
similarity index 100%
rename from surround_view/service-impl/ConfigReader.cpp
rename to cpp/surround_view/service-impl/ConfigReader.cpp
diff --git a/surround_view/service-impl/ConfigReader.h b/cpp/surround_view/service-impl/ConfigReader.h
similarity index 100%
rename from surround_view/service-impl/ConfigReader.h
rename to cpp/surround_view/service-impl/ConfigReader.h
diff --git a/surround_view/service-impl/ConfigReaderTests.cpp b/cpp/surround_view/service-impl/ConfigReaderTests.cpp
similarity index 100%
rename from surround_view/service-impl/ConfigReaderTests.cpp
rename to cpp/surround_view/service-impl/ConfigReaderTests.cpp
diff --git a/surround_view/service-impl/ConfigReaderUtil.cpp b/cpp/surround_view/service-impl/ConfigReaderUtil.cpp
similarity index 100%
rename from surround_view/service-impl/ConfigReaderUtil.cpp
rename to cpp/surround_view/service-impl/ConfigReaderUtil.cpp
diff --git a/surround_view/service-impl/ConfigReaderUtil.h b/cpp/surround_view/service-impl/ConfigReaderUtil.h
similarity index 100%
rename from surround_view/service-impl/ConfigReaderUtil.h
rename to cpp/surround_view/service-impl/ConfigReaderUtil.h
diff --git a/surround_view/service-impl/IOModule.cpp b/cpp/surround_view/service-impl/IOModule.cpp
similarity index 100%
rename from surround_view/service-impl/IOModule.cpp
rename to cpp/surround_view/service-impl/IOModule.cpp
diff --git a/surround_view/service-impl/IOModule.h b/cpp/surround_view/service-impl/IOModule.h
similarity index 100%
rename from surround_view/service-impl/IOModule.h
rename to cpp/surround_view/service-impl/IOModule.h
diff --git a/surround_view/service-impl/IOModuleCommon.h b/cpp/surround_view/service-impl/IOModuleCommon.h
similarity index 100%
rename from surround_view/service-impl/IOModuleCommon.h
rename to cpp/surround_view/service-impl/IOModuleCommon.h
diff --git a/surround_view/service-impl/MathHelp.h b/cpp/surround_view/service-impl/MathHelp.h
similarity index 100%
rename from surround_view/service-impl/MathHelp.h
rename to cpp/surround_view/service-impl/MathHelp.h
diff --git a/surround_view/service-impl/Matrix4x4.h b/cpp/surround_view/service-impl/Matrix4x4.h
similarity index 100%
rename from surround_view/service-impl/Matrix4x4.h
rename to cpp/surround_view/service-impl/Matrix4x4.h
diff --git a/surround_view/service-impl/MtlReader.cpp b/cpp/surround_view/service-impl/MtlReader.cpp
similarity index 100%
rename from surround_view/service-impl/MtlReader.cpp
rename to cpp/surround_view/service-impl/MtlReader.cpp
diff --git a/surround_view/service-impl/MtlReader.h b/cpp/surround_view/service-impl/MtlReader.h
similarity index 100%
rename from surround_view/service-impl/MtlReader.h
rename to cpp/surround_view/service-impl/MtlReader.h
diff --git a/surround_view/service-impl/ObjReader.cpp b/cpp/surround_view/service-impl/ObjReader.cpp
similarity index 100%
rename from surround_view/service-impl/ObjReader.cpp
rename to cpp/surround_view/service-impl/ObjReader.cpp
diff --git a/surround_view/service-impl/ObjReader.h b/cpp/surround_view/service-impl/ObjReader.h
similarity index 100%
rename from surround_view/service-impl/ObjReader.h
rename to cpp/surround_view/service-impl/ObjReader.h
diff --git a/surround_view/service-impl/ObjReaderTests.cpp b/cpp/surround_view/service-impl/ObjReaderTests.cpp
similarity index 100%
rename from surround_view/service-impl/ObjReaderTests.cpp
rename to cpp/surround_view/service-impl/ObjReaderTests.cpp
diff --git a/surround_view/service-impl/SurroundView2dSession.cpp b/cpp/surround_view/service-impl/SurroundView2dSession.cpp
similarity index 100%
rename from surround_view/service-impl/SurroundView2dSession.cpp
rename to cpp/surround_view/service-impl/SurroundView2dSession.cpp
diff --git a/surround_view/service-impl/SurroundView2dSession.h b/cpp/surround_view/service-impl/SurroundView2dSession.h
similarity index 100%
rename from surround_view/service-impl/SurroundView2dSession.h
rename to cpp/surround_view/service-impl/SurroundView2dSession.h
diff --git a/surround_view/service-impl/SurroundView3dSession.cpp b/cpp/surround_view/service-impl/SurroundView3dSession.cpp
similarity index 100%
rename from surround_view/service-impl/SurroundView3dSession.cpp
rename to cpp/surround_view/service-impl/SurroundView3dSession.cpp
diff --git a/surround_view/service-impl/SurroundView3dSession.h b/cpp/surround_view/service-impl/SurroundView3dSession.h
similarity index 100%
rename from surround_view/service-impl/SurroundView3dSession.h
rename to cpp/surround_view/service-impl/SurroundView3dSession.h
diff --git a/surround_view/service-impl/SurroundViewService.cpp b/cpp/surround_view/service-impl/SurroundViewService.cpp
similarity index 100%
rename from surround_view/service-impl/SurroundViewService.cpp
rename to cpp/surround_view/service-impl/SurroundViewService.cpp
diff --git a/surround_view/service-impl/SurroundViewService.h b/cpp/surround_view/service-impl/SurroundViewService.h
similarity index 100%
rename from surround_view/service-impl/SurroundViewService.h
rename to cpp/surround_view/service-impl/SurroundViewService.h
diff --git a/surround_view/service-impl/SurroundViewSessionTests.cpp b/cpp/surround_view/service-impl/SurroundViewSessionTests.cpp
similarity index 100%
rename from surround_view/service-impl/SurroundViewSessionTests.cpp
rename to cpp/surround_view/service-impl/SurroundViewSessionTests.cpp
diff --git a/surround_view/service-impl/VhalHandler.cpp b/cpp/surround_view/service-impl/VhalHandler.cpp
similarity index 100%
rename from surround_view/service-impl/VhalHandler.cpp
rename to cpp/surround_view/service-impl/VhalHandler.cpp
diff --git a/surround_view/service-impl/VhalHandler.h b/cpp/surround_view/service-impl/VhalHandler.h
similarity index 100%
rename from surround_view/service-impl/VhalHandler.h
rename to cpp/surround_view/service-impl/VhalHandler.h
diff --git a/surround_view/service-impl/VhalHandlerTests.cpp b/cpp/surround_view/service-impl/VhalHandlerTests.cpp
similarity index 100%
rename from surround_view/service-impl/VhalHandlerTests.cpp
rename to cpp/surround_view/service-impl/VhalHandlerTests.cpp
diff --git a/surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc b/cpp/surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc
similarity index 100%
rename from surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc
rename to cpp/surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc
diff --git a/surround_view/service-impl/core_lib.h b/cpp/surround_view/service-impl/core_lib.h
similarity index 100%
rename from surround_view/service-impl/core_lib.h
rename to cpp/surround_view/service-impl/core_lib.h
diff --git a/surround_view/service-impl/lib/arm64/libcore_lib_shared.so b/cpp/surround_view/service-impl/lib/arm64/libcore_lib_shared.so
similarity index 100%
rename from surround_view/service-impl/lib/arm64/libcore_lib_shared.so
rename to cpp/surround_view/service-impl/lib/arm64/libcore_lib_shared.so
Binary files differ
diff --git a/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so b/cpp/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
similarity index 100%
rename from surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
rename to cpp/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
Binary files differ
diff --git a/surround_view/service-impl/lib/x86/libcore_lib_shared.so b/cpp/surround_view/service-impl/lib/x86/libcore_lib_shared.so
similarity index 100%
rename from surround_view/service-impl/lib/x86/libcore_lib_shared.so
rename to cpp/surround_view/service-impl/lib/x86/libcore_lib_shared.so
Binary files differ
diff --git a/surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml b/cpp/surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml
similarity index 100%
rename from surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml
rename to cpp/surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml
diff --git a/surround_view/service-impl/mock-evs/MockEvsCamera.cpp b/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.cpp
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockEvsCamera.cpp
rename to cpp/surround_view/service-impl/mock-evs/MockEvsCamera.cpp
diff --git a/surround_view/service-impl/mock-evs/MockEvsCamera.h b/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.h
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockEvsCamera.h
rename to cpp/surround_view/service-impl/mock-evs/MockEvsCamera.h
diff --git a/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp b/cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
rename to cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
diff --git a/surround_view/service-impl/mock-evs/MockEvsEnumerator.h b/cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.h
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockEvsEnumerator.h
rename to cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.h
diff --git a/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp b/cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
rename to cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
diff --git a/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h b/cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
rename to cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
diff --git a/surround_view/service-impl/service.cpp b/cpp/surround_view/service-impl/service.cpp
similarity index 100%
rename from surround_view/service-impl/service.cpp
rename to cpp/surround_view/service-impl/service.cpp
diff --git a/surround_view/service-impl/sv_3d_params.h b/cpp/surround_view/service-impl/sv_3d_params.h
similarity index 100%
rename from surround_view/service-impl/sv_3d_params.h
rename to cpp/surround_view/service-impl/sv_3d_params.h
diff --git a/surround_view/service-impl/test_data/0.png b/cpp/surround_view/service-impl/test_data/0.png
similarity index 100%
rename from surround_view/service-impl/test_data/0.png
rename to cpp/surround_view/service-impl/test_data/0.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/1.png b/cpp/surround_view/service-impl/test_data/1.png
similarity index 100%
rename from surround_view/service-impl/test_data/1.png
rename to cpp/surround_view/service-impl/test_data/1.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/2.png b/cpp/surround_view/service-impl/test_data/2.png
similarity index 100%
rename from surround_view/service-impl/test_data/2.png
rename to cpp/surround_view/service-impl/test_data/2.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/3.png b/cpp/surround_view/service-impl/test_data/3.png
similarity index 100%
rename from surround_view/service-impl/test_data/3.png
rename to cpp/surround_view/service-impl/test_data/3.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/sample_car.obj b/cpp/surround_view/service-impl/test_data/sample_car.obj
similarity index 100%
rename from surround_view/service-impl/test_data/sample_car.obj
rename to cpp/surround_view/service-impl/test_data/sample_car.obj
diff --git a/surround_view/service-impl/test_data/sample_car_material.mtl b/cpp/surround_view/service-impl/test_data/sample_car_material.mtl
similarity index 100%
rename from surround_view/service-impl/test_data/sample_car_material.mtl
rename to cpp/surround_view/service-impl/test_data/sample_car_material.mtl
diff --git a/surround_view/service-impl/test_data/sv_sample_car_model_config.xml b/cpp/surround_view/service-impl/test_data/sv_sample_car_model_config.xml
similarity index 100%
rename from surround_view/service-impl/test_data/sv_sample_car_model_config.xml
rename to cpp/surround_view/service-impl/test_data/sv_sample_car_model_config.xml
diff --git a/surround_view/service-impl/test_data/sv_sample_config.xml b/cpp/surround_view/service-impl/test_data/sv_sample_config.xml
similarity index 100%
rename from surround_view/service-impl/test_data/sv_sample_config.xml
rename to cpp/surround_view/service-impl/test_data/sv_sample_config.xml