diff --git a/ApplicationLibCode/GrpcInterface/CMakeLists.txt b/GrpcInterface/CMakeLists.txt
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/CMakeLists.txt
rename to GrpcInterface/CMakeLists.txt
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/App.proto b/GrpcInterface/GrpcProtos/App.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/App.proto
rename to GrpcInterface/GrpcProtos/App.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/Case.proto b/GrpcInterface/GrpcProtos/Case.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/Case.proto
rename to GrpcInterface/GrpcProtos/Case.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/Commands.proto b/GrpcInterface/GrpcProtos/Commands.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/Commands.proto
rename to GrpcInterface/GrpcProtos/Commands.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/Definitions.proto b/GrpcInterface/GrpcProtos/Definitions.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/Definitions.proto
rename to GrpcInterface/GrpcProtos/Definitions.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/Grid.proto b/GrpcInterface/GrpcProtos/Grid.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/Grid.proto
rename to GrpcInterface/GrpcProtos/Grid.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/NNCProperties.proto b/GrpcInterface/GrpcProtos/NNCProperties.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/NNCProperties.proto
rename to GrpcInterface/GrpcProtos/NNCProperties.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/PdmObject.proto b/GrpcInterface/GrpcProtos/PdmObject.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/PdmObject.proto
rename to GrpcInterface/GrpcProtos/PdmObject.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/Project.proto b/GrpcInterface/GrpcProtos/Project.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/Project.proto
rename to GrpcInterface/GrpcProtos/Project.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/Properties.proto b/GrpcInterface/GrpcProtos/Properties.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/Properties.proto
rename to GrpcInterface/GrpcProtos/Properties.proto
diff --git a/ApplicationLibCode/GrpcInterface/GrpcProtos/SimulationWell.proto b/GrpcInterface/GrpcProtos/SimulationWell.proto
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/GrpcProtos/SimulationWell.proto
rename to GrpcInterface/GrpcProtos/SimulationWell.proto
diff --git a/ApplicationLibCode/GrpcInterface/Python/.gitignore b/GrpcInterface/Python/.gitignore
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/.gitignore
rename to GrpcInterface/Python/.gitignore
diff --git a/ApplicationLibCode/GrpcInterface/Python/LICENSE b/GrpcInterface/Python/LICENSE
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/LICENSE
rename to GrpcInterface/Python/LICENSE
diff --git a/ApplicationLibCode/GrpcInterface/Python/MANIFEST.in b/GrpcInterface/Python/MANIFEST.in
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/MANIFEST.in
rename to GrpcInterface/Python/MANIFEST.in
diff --git a/ApplicationLibCode/GrpcInterface/Python/README.md b/GrpcInterface/Python/README.md
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/README.md
rename to GrpcInterface/Python/README.md
diff --git a/ApplicationLibCode/GrpcInterface/Python/autoformat_pep8.txt b/GrpcInterface/Python/autoformat_pep8.txt
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/autoformat_pep8.txt
rename to GrpcInterface/Python/autoformat_pep8.txt
diff --git a/ApplicationLibCode/GrpcInterface/Python/create_pip_package.txt b/GrpcInterface/Python/create_pip_package.txt
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/create_pip_package.txt
rename to GrpcInterface/Python/create_pip_package.txt
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/README_DOCUMENTATION.txt b/GrpcInterface/Python/doc/README_DOCUMENTATION.txt
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/README_DOCUMENTATION.txt
rename to GrpcInterface/Python/doc/README_DOCUMENTATION.txt
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/make.bat b/GrpcInterface/Python/doc/make.bat
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/make.bat
rename to GrpcInterface/Python/doc/make.bat
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/make_and_copy.bat b/GrpcInterface/Python/doc/make_and_copy.bat
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/make_and_copy.bat
rename to GrpcInterface/Python/doc/make_and_copy.bat
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/source/PythonExamples.rst b/GrpcInterface/Python/doc/source/PythonExamples.rst
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/source/PythonExamples.rst
rename to GrpcInterface/Python/doc/source/PythonExamples.rst
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/source/PythonRips.rst b/GrpcInterface/Python/doc/source/PythonRips.rst
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/source/PythonRips.rst
rename to GrpcInterface/Python/doc/source/PythonRips.rst
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/source/conf.py b/GrpcInterface/Python/doc/source/conf.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/source/conf.py
rename to GrpcInterface/Python/doc/source/conf.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/doc/source/rips.rst b/GrpcInterface/Python/doc/source/rips.rst
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/doc/source/rips.rst
rename to GrpcInterface/Python/doc/source/rips.rst
diff --git a/ApplicationLibCode/GrpcInterface/Python/requirements.txt b/GrpcInterface/Python/requirements.txt
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/requirements.txt
rename to GrpcInterface/Python/requirements.txt
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/all_cases.py b/GrpcInterface/Python/rips/PythonExamples/all_cases.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/all_cases.py
rename to GrpcInterface/Python/rips/PythonExamples/all_cases.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/all_simulation_wells.py b/GrpcInterface/Python/rips/PythonExamples/all_simulation_wells.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/all_simulation_wells.py
rename to GrpcInterface/Python/rips/PythonExamples/all_simulation_wells.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/all_wells.py b/GrpcInterface/Python/rips/PythonExamples/all_wells.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/all_wells.py
rename to GrpcInterface/Python/rips/PythonExamples/all_wells.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/alter_wbs_plot.py b/GrpcInterface/Python/rips/PythonExamples/alter_wbs_plot.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/alter_wbs_plot.py
rename to GrpcInterface/Python/rips/PythonExamples/alter_wbs_plot.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/case_grid_group.py b/GrpcInterface/Python/rips/PythonExamples/case_grid_group.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/case_grid_group.py
rename to GrpcInterface/Python/rips/PythonExamples/case_grid_group.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/case_info_streaming_example.py b/GrpcInterface/Python/rips/PythonExamples/case_info_streaming_example.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/case_info_streaming_example.py
rename to GrpcInterface/Python/rips/PythonExamples/case_info_streaming_example.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/cell_result_data.py b/GrpcInterface/Python/rips/PythonExamples/cell_result_data.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/cell_result_data.py
rename to GrpcInterface/Python/rips/PythonExamples/cell_result_data.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/command_example.py b/GrpcInterface/Python/rips/PythonExamples/command_example.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/command_example.py
rename to GrpcInterface/Python/rips/PythonExamples/command_example.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/create_and_export_stim_plan_model.py b/GrpcInterface/Python/rips/PythonExamples/create_and_export_stim_plan_model.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/create_and_export_stim_plan_model.py
rename to GrpcInterface/Python/rips/PythonExamples/create_and_export_stim_plan_model.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/create_wbs_plot.py b/GrpcInterface/Python/rips/PythonExamples/create_wbs_plot.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/create_wbs_plot.py
rename to GrpcInterface/Python/rips/PythonExamples/create_wbs_plot.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/error_handling.py b/GrpcInterface/Python/rips/PythonExamples/error_handling.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/error_handling.py
rename to GrpcInterface/Python/rips/PythonExamples/error_handling.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/export_contour_maps.py b/GrpcInterface/Python/rips/PythonExamples/export_contour_maps.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/export_contour_maps.py
rename to GrpcInterface/Python/rips/PythonExamples/export_contour_maps.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/export_plots.py b/GrpcInterface/Python/rips/PythonExamples/export_plots.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/export_plots.py
rename to GrpcInterface/Python/rips/PythonExamples/export_plots.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/export_snapshots.py b/GrpcInterface/Python/rips/PythonExamples/export_snapshots.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/export_snapshots.py
rename to GrpcInterface/Python/rips/PythonExamples/export_snapshots.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/grid_information.py b/GrpcInterface/Python/rips/PythonExamples/grid_information.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/grid_information.py
rename to GrpcInterface/Python/rips/PythonExamples/grid_information.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/import_well_paths_and_logs.py b/GrpcInterface/Python/rips/PythonExamples/import_well_paths_and_logs.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/import_well_paths_and_logs.py
rename to GrpcInterface/Python/rips/PythonExamples/import_well_paths_and_logs.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/input_prop_test_async.py b/GrpcInterface/Python/rips/PythonExamples/input_prop_test_async.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/input_prop_test_async.py
rename to GrpcInterface/Python/rips/PythonExamples/input_prop_test_async.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/input_prop_test_sync.py b/GrpcInterface/Python/rips/PythonExamples/input_prop_test_sync.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/input_prop_test_sync.py
rename to GrpcInterface/Python/rips/PythonExamples/input_prop_test_sync.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/instance_example.py b/GrpcInterface/Python/rips/PythonExamples/instance_example.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/instance_example.py
rename to GrpcInterface/Python/rips/PythonExamples/instance_example.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/launch_with_commandline_options.py b/GrpcInterface/Python/rips/PythonExamples/launch_with_commandline_options.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/launch_with_commandline_options.py
rename to GrpcInterface/Python/rips/PythonExamples/launch_with_commandline_options.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/modeled_well_path.py b/GrpcInterface/Python/rips/PythonExamples/modeled_well_path.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/modeled_well_path.py
rename to GrpcInterface/Python/rips/PythonExamples/modeled_well_path.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/new_summary_plot.py b/GrpcInterface/Python/rips/PythonExamples/new_summary_plot.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/new_summary_plot.py
rename to GrpcInterface/Python/rips/PythonExamples/new_summary_plot.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/replace_case.py b/GrpcInterface/Python/rips/PythonExamples/replace_case.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/replace_case.py
rename to GrpcInterface/Python/rips/PythonExamples/replace_case.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/selected_cases.py b/GrpcInterface/Python/rips/PythonExamples/selected_cases.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/selected_cases.py
rename to GrpcInterface/Python/rips/PythonExamples/selected_cases.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/selected_cells.py b/GrpcInterface/Python/rips/PythonExamples/selected_cells.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/selected_cells.py
rename to GrpcInterface/Python/rips/PythonExamples/selected_cells.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/set_cell_result.py b/GrpcInterface/Python/rips/PythonExamples/set_cell_result.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/set_cell_result.py
rename to GrpcInterface/Python/rips/PythonExamples/set_cell_result.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/set_flow_diagnostics_result.py b/GrpcInterface/Python/rips/PythonExamples/set_flow_diagnostics_result.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/set_flow_diagnostics_result.py
rename to GrpcInterface/Python/rips/PythonExamples/set_flow_diagnostics_result.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/set_grid_properties.py b/GrpcInterface/Python/rips/PythonExamples/set_grid_properties.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/set_grid_properties.py
rename to GrpcInterface/Python/rips/PythonExamples/set_grid_properties.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_average_async.py b/GrpcInterface/Python/rips/PythonExamples/soil_average_async.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_average_async.py
rename to GrpcInterface/Python/rips/PythonExamples/soil_average_async.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_average_sync.py b/GrpcInterface/Python/rips/PythonExamples/soil_average_sync.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_average_sync.py
rename to GrpcInterface/Python/rips/PythonExamples/soil_average_sync.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_porv_async.py b/GrpcInterface/Python/rips/PythonExamples/soil_porv_async.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_porv_async.py
rename to GrpcInterface/Python/rips/PythonExamples/soil_porv_async.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_porv_sync.py b/GrpcInterface/Python/rips/PythonExamples/soil_porv_sync.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/soil_porv_sync.py
rename to GrpcInterface/Python/rips/PythonExamples/soil_porv_sync.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/summary_cases.py b/GrpcInterface/Python/rips/PythonExamples/summary_cases.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/summary_cases.py
rename to GrpcInterface/Python/rips/PythonExamples/summary_cases.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/summary_vectors.py b/GrpcInterface/Python/rips/PythonExamples/summary_vectors.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/summary_vectors.py
rename to GrpcInterface/Python/rips/PythonExamples/summary_vectors.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/surface_import.py b/GrpcInterface/Python/rips/PythonExamples/surface_import.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/surface_import.py
rename to GrpcInterface/Python/rips/PythonExamples/surface_import.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/view_example.py b/GrpcInterface/Python/rips/PythonExamples/view_example.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/PythonExamples/view_example.py
rename to GrpcInterface/Python/rips/PythonExamples/view_example.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/__init__.py b/GrpcInterface/Python/rips/__init__.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/__init__.py
rename to GrpcInterface/Python/rips/__init__.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/case.py b/GrpcInterface/Python/rips/case.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/case.py
rename to GrpcInterface/Python/rips/case.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/contour_map.py b/GrpcInterface/Python/rips/contour_map.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/contour_map.py
rename to GrpcInterface/Python/rips/contour_map.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/grid.py b/GrpcInterface/Python/rips/grid.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/grid.py
rename to GrpcInterface/Python/rips/grid.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/gridcasegroup.py b/GrpcInterface/Python/rips/gridcasegroup.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/gridcasegroup.py
rename to GrpcInterface/Python/rips/gridcasegroup.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/grpc_retry_interceptor.py b/GrpcInterface/Python/rips/grpc_retry_interceptor.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/grpc_retry_interceptor.py
rename to GrpcInterface/Python/rips/grpc_retry_interceptor.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/instance.py b/GrpcInterface/Python/rips/instance.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/instance.py
rename to GrpcInterface/Python/rips/instance.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/pdmobject.py b/GrpcInterface/Python/rips/pdmobject.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/pdmobject.py
rename to GrpcInterface/Python/rips/pdmobject.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/plot.py b/GrpcInterface/Python/rips/plot.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/plot.py
rename to GrpcInterface/Python/rips/plot.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/project.py b/GrpcInterface/Python/rips/project.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/project.py
rename to GrpcInterface/Python/rips/project.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/retry_policy.py b/GrpcInterface/Python/rips/retry_policy.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/retry_policy.py
rename to GrpcInterface/Python/rips/retry_policy.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/simulation_well.py b/GrpcInterface/Python/rips/simulation_well.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/simulation_well.py
rename to GrpcInterface/Python/rips/simulation_well.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/conftest.py b/GrpcInterface/Python/rips/tests/conftest.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/conftest.py
rename to GrpcInterface/Python/rips/tests/conftest.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/dataroot.py b/GrpcInterface/Python/rips/tests/dataroot.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/dataroot.py
rename to GrpcInterface/Python/rips/tests/dataroot.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_cases.py b/GrpcInterface/Python/rips/tests/test_cases.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_cases.py
rename to GrpcInterface/Python/rips/tests/test_cases.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_commands.py b/GrpcInterface/Python/rips/tests/test_commands.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_commands.py
rename to GrpcInterface/Python/rips/tests/test_commands.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_grids.py b/GrpcInterface/Python/rips/tests/test_grids.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_grids.py
rename to GrpcInterface/Python/rips/tests/test_grids.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_nnc_properties.py b/GrpcInterface/Python/rips/tests/test_nnc_properties.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_nnc_properties.py
rename to GrpcInterface/Python/rips/tests/test_nnc_properties.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_project.py b/GrpcInterface/Python/rips/tests/test_project.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_project.py
rename to GrpcInterface/Python/rips/tests/test_project.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_properties.py b/GrpcInterface/Python/rips/tests/test_properties.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_properties.py
rename to GrpcInterface/Python/rips/tests/test_properties.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_simulation_wells.py b/GrpcInterface/Python/rips/tests/test_simulation_wells.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_simulation_wells.py
rename to GrpcInterface/Python/rips/tests/test_simulation_wells.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_summary_cases.py b/GrpcInterface/Python/rips/tests/test_summary_cases.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_summary_cases.py
rename to GrpcInterface/Python/rips/tests/test_summary_cases.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/tests/test_wells.py b/GrpcInterface/Python/rips/tests/test_wells.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/tests/test_wells.py
rename to GrpcInterface/Python/rips/tests/test_wells.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/view.py b/GrpcInterface/Python/rips/view.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/view.py
rename to GrpcInterface/Python/rips/view.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/rips/well_log_plot.py b/GrpcInterface/Python/rips/well_log_plot.py
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/rips/well_log_plot.py
rename to GrpcInterface/Python/rips/well_log_plot.py
diff --git a/ApplicationLibCode/GrpcInterface/Python/setup.py.cmake b/GrpcInterface/Python/setup.py.cmake
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/Python/setup.py.cmake
rename to GrpcInterface/Python/setup.py.cmake
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcAppService.cpp b/GrpcInterface/RiaGrpcAppService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcAppService.cpp
rename to GrpcInterface/RiaGrpcAppService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcAppService.h b/GrpcInterface/RiaGrpcAppService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcAppService.h
rename to GrpcInterface/RiaGrpcAppService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcCallbacks.h b/GrpcInterface/RiaGrpcCallbacks.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcCallbacks.h
rename to GrpcInterface/RiaGrpcCallbacks.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcCallbacks.inl b/GrpcInterface/RiaGrpcCallbacks.inl
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcCallbacks.inl
rename to GrpcInterface/RiaGrpcCallbacks.inl
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcCaseService.cpp b/GrpcInterface/RiaGrpcCaseService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcCaseService.cpp
rename to GrpcInterface/RiaGrpcCaseService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcCaseService.h b/GrpcInterface/RiaGrpcCaseService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcCaseService.h
rename to GrpcInterface/RiaGrpcCaseService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcCommandService.cpp b/GrpcInterface/RiaGrpcCommandService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcCommandService.cpp
rename to GrpcInterface/RiaGrpcCommandService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcCommandService.h b/GrpcInterface/RiaGrpcCommandService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcCommandService.h
rename to GrpcInterface/RiaGrpcCommandService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcGridService.cpp b/GrpcInterface/RiaGrpcGridService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcGridService.cpp
rename to GrpcInterface/RiaGrpcGridService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcGridService.h b/GrpcInterface/RiaGrpcGridService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcGridService.h
rename to GrpcInterface/RiaGrpcGridService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcHelper.cpp b/GrpcInterface/RiaGrpcHelper.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcHelper.cpp
rename to GrpcInterface/RiaGrpcHelper.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcHelper.h b/GrpcInterface/RiaGrpcHelper.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcHelper.h
rename to GrpcInterface/RiaGrpcHelper.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcNNCPropertiesService.cpp b/GrpcInterface/RiaGrpcNNCPropertiesService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcNNCPropertiesService.cpp
rename to GrpcInterface/RiaGrpcNNCPropertiesService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcNNCPropertiesService.h b/GrpcInterface/RiaGrpcNNCPropertiesService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcNNCPropertiesService.h
rename to GrpcInterface/RiaGrpcNNCPropertiesService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcPdmObjectService.cpp b/GrpcInterface/RiaGrpcPdmObjectService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcPdmObjectService.cpp
rename to GrpcInterface/RiaGrpcPdmObjectService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcPdmObjectService.h b/GrpcInterface/RiaGrpcPdmObjectService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcPdmObjectService.h
rename to GrpcInterface/RiaGrpcPdmObjectService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcProjectService.cpp b/GrpcInterface/RiaGrpcProjectService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcProjectService.cpp
rename to GrpcInterface/RiaGrpcProjectService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcProjectService.h b/GrpcInterface/RiaGrpcProjectService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcProjectService.h
rename to GrpcInterface/RiaGrpcProjectService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcPropertiesService.cpp b/GrpcInterface/RiaGrpcPropertiesService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcPropertiesService.cpp
rename to GrpcInterface/RiaGrpcPropertiesService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcPropertiesService.h b/GrpcInterface/RiaGrpcPropertiesService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcPropertiesService.h
rename to GrpcInterface/RiaGrpcPropertiesService.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcServer.cpp b/GrpcInterface/RiaGrpcServer.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcServer.cpp
rename to GrpcInterface/RiaGrpcServer.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcServer.h b/GrpcInterface/RiaGrpcServer.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcServer.h
rename to GrpcInterface/RiaGrpcServer.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcServiceInterface.cpp b/GrpcInterface/RiaGrpcServiceInterface.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcServiceInterface.cpp
rename to GrpcInterface/RiaGrpcServiceInterface.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcServiceInterface.h b/GrpcInterface/RiaGrpcServiceInterface.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcServiceInterface.h
rename to GrpcInterface/RiaGrpcServiceInterface.h
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcSimulationWellService.cpp b/GrpcInterface/RiaGrpcSimulationWellService.cpp
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcSimulationWellService.cpp
rename to GrpcInterface/RiaGrpcSimulationWellService.cpp
diff --git a/ApplicationLibCode/GrpcInterface/RiaGrpcSimulationWellService.h b/GrpcInterface/RiaGrpcSimulationWellService.h
similarity index 100%
rename from ApplicationLibCode/GrpcInterface/RiaGrpcSimulationWellService.h
rename to GrpcInterface/RiaGrpcSimulationWellService.h