diff --git a/.clang-format b/.clang-format
index 61b271deaf..5dd0f9481d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -44,6 +44,9 @@ IncludeCategories:
   - Regex:           '^"map/map_integration_tests/'
     Priority:        4763
 
+  - Regex:           '^"api/api_tests/'
+    Priority:        4765
+
   - Regex:           '^"openlr/openlr_tests/'
     Priority:        4770
 
@@ -203,6 +206,9 @@ IncludeCategories:
   - Regex:           '^"map/'
     Priority:        47000
 
+  - Regex:           '^"api/'
+    Priority:        47050
+
   - Regex:           '^"openlr/'
     Priority:        47100
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 135e3c1c10..febd03ce6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -290,6 +290,7 @@ else()
   message(FATAL_ERROR "Cannot find python.")
 endif()
 
+add_subdirectory(api)
 add_subdirectory(base)
 add_subdirectory(coding)
 add_subdirectory(descriptions)
diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt
index fc743baff4..c0b7a4a773 100644
--- a/android/jni/CMakeLists.txt
+++ b/android/jni/CMakeLists.txt
@@ -114,6 +114,7 @@ target_link_libraries(
   z
   # MapsWithMe libs
   map
+  api
   tracking
   routing
   traffic
diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
new file mode 100644
index 0000000000..21e12fc960
--- /dev/null
+++ b/api/CMakeLists.txt
@@ -0,0 +1,11 @@
+project(api)
+
+set(
+  SRC
+  ge0_generator.cpp
+  ge0_generator.hpp
+)
+
+omim_add_library(${PROJECT_NAME} ${SRC})
+
+omim_add_test_subdirectory(api_tests)
diff --git a/api/api_tests/CMakeLists.txt b/api/api_tests/CMakeLists.txt
new file mode 100644
index 0000000000..4b2ab83f64
--- /dev/null
+++ b/api/api_tests/CMakeLists.txt
@@ -0,0 +1,21 @@
+project(api_tests)
+
+set(
+  SRC
+  ge0_generator_tests.cpp
+)
+
+omim_add_test(${PROJECT_NAME} ${SRC})
+
+omim_link_libraries(
+  ${PROJECT_NAME}
+  api
+  platform
+  coding
+  base
+  oauthcpp
+  stats_client
+  ${LIBZ}
+)
+
+link_qt5_core(${PROJECT_NAME})
diff --git a/api/tests/c/api-client-test.c b/api/api_tests/ge0_generator_tests.cpp
similarity index 99%
rename from api/tests/c/api-client-test.c
rename to api/api_tests/ge0_generator_tests.cpp
index 48855c1328..8f6817274c 100644
--- a/api/tests/c/api-client-test.c
+++ b/api/api_tests/ge0_generator_tests.cpp
@@ -1,10 +1,14 @@
-#include "../../../3party/fct/fct.h"
-#include "../../src/c/api-client.h"
-#include "../../internal/c/api-client-internals.h"
+ #include "testing/testing.hpp"
+
+#include "api/ge0_generator.hpp"
+
+#include "3party/fct/fct.h"
 
 static const int MAX_POINT_BYTES = 10;
 static const int TEST_COORD_BYTES = 9;
 
+#if 0
+
 char const * TestLatLonToStr(double lat, double lon)
 {
   static char s[TEST_COORD_BYTES + 1] = {0};
@@ -14,7 +18,6 @@ char const * TestLatLonToStr(double lat, double lon)
 
 FCT_BGN()
 {
-
   FCT_QTEST_BGN(MapsWithMe_Base64Char)
   {
     fct_chk_eq_int('A', MapsWithMe_Base64Char(0));
@@ -436,6 +439,7 @@ FCT_BGN()
     fct_chk_eq_int(37, res);
   }
   FCT_QTEST_END();
-
 }
 FCT_END();
+
+#endif
diff --git a/api/src/php/mwm_api.php b/api/ge0.php
similarity index 100%
rename from api/src/php/mwm_api.php
rename to api/ge0.php
diff --git a/api/src/c/api-client.c b/api/ge0_generator.cpp
similarity index 96%
rename from api/src/c/api-client.c
rename to api/ge0_generator.cpp
index ef748a9ece..5d39729bc6 100644
--- a/api/src/c/api-client.c
+++ b/api/ge0_generator.cpp
@@ -1,13 +1,10 @@
-#include "api-client.h"
+#include "api/ge0_generator.hpp"
+
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
-// Max number of base64 bytes to encode a geo point.
-#define MAPSWITHME_MAX_POINT_BYTES 10
-#define MAPSWITHME_MAX_COORD_BITS (MAPSWITHME_MAX_POINT_BYTES * 3)
-
 char MapsWithMe_Base64Char(int x)
 {
   assert(x >= 0 && x < 64);
@@ -94,7 +91,7 @@ size_t MapsWithMe_UrlEncodeString(char const * s, size_t size, char ** res)
 {
   size_t i;
   char * out;
-  *res = malloc(size * 3 + 1);
+  *res = (char*)malloc(size * 3 + 1);
   out = *res;
   for (i = 0; i < size; ++i)
   {
diff --git a/api/src/c/api-client.h b/api/ge0_generator.hpp
similarity index 70%
rename from api/src/c/api-client.h
rename to api/ge0_generator.hpp
index c2abea96d3..cf840a8d06 100644
--- a/api/src/c/api-client.h
+++ b/api/ge0_generator.hpp
@@ -1,6 +1,25 @@
 #ifndef MAPSWITHME_API_CLIENT
 #define MAPSWITHME_API_CLIENT
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Max number of base64 bytes to encode a geo point.
+#define MAPSWITHME_MAX_POINT_BYTES 10
+#define MAPSWITHME_MAX_COORD_BITS (MAPSWITHME_MAX_POINT_BYTES * 3)
+
+char MapsWithMe_Base64Char(int x);
+int MapsWithMe_LatToInt(double lat, int maxValue);
+double MapsWithMe_LonIn180180(double lon);
+int MapsWithMe_LonToInt(double lon, int maxValue);
+void MapsWithMe_LatLonToString(double lat, double lon, char * s, int nBytes);
+
+#ifdef __cplusplus
+}  // Closing brace for extern "C"
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/api/internal/c/api-client-internals.h b/api/internal/c/api-client-internals.h
deleted file mode 100644
index b7fd54329a..0000000000
--- a/api/internal/c/api-client-internals.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef MAPSWITHME_API_INTERNAL_API_CLIENT_INTERNALS
-#define MAPSWITHME_API_INTERNAL_API_CLIENT_INTERNALS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAPSWITHME_MAX_POINT_BYTES 10
-#define MAPSWITHME_MAX_COORD_BITS (MAPSWITHME_MAX_POINT_BYTES * 3)
-
-char MapsWithMe_Base64Char(int x);
-int MapsWithMe_LatToInt(double lat, int maxValue);
-double MapsWithMe_LonIn180180(double lon);
-int MapsWithMe_LonToInt(double lon, int maxValue);
-void MapsWithMe_LatLonToString(double lat, double lon, char * s, int nBytes);
-
-#ifdef __cplusplus
-}  // Closing brace for extern "C"
-#endif
-
-
-#endif  // MAPSWITHME_API_INTERNAL_API_CLIENT_INTERNALS
diff --git a/api/test.sh b/api/test.sh
deleted file mode 100755
index 65dfdede73..0000000000
--- a/api/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e -u -x
-clang src/c/api-client.c  tests/c/api-client-test.c -o /tmp/api-client-test
-/tmp/api-client-test
diff --git a/generator/generator_integration_tests/CMakeLists.txt b/generator/generator_integration_tests/CMakeLists.txt
index ea61d5dc3e..da492284b2 100644
--- a/generator/generator_integration_tests/CMakeLists.txt
+++ b/generator/generator_integration_tests/CMakeLists.txt
@@ -17,6 +17,7 @@ omim_link_libraries(
   drape_frontend
   shaders
   map
+  api
   routing
   search
   storage
diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt
index 438ab9a265..dd9bafa75b 100644
--- a/map/CMakeLists.txt
+++ b/map/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories(
 
 set(
   SRC
-  ../api/src/c/api-client.c
   api_mark_point.cpp
   api_mark_point.hpp
   benchmark_tools.hpp
diff --git a/map/benchmark_tool/CMakeLists.txt b/map/benchmark_tool/CMakeLists.txt
index df7a5ee9ce..4130d22c3e 100644
--- a/map/benchmark_tool/CMakeLists.txt
+++ b/map/benchmark_tool/CMakeLists.txt
@@ -18,6 +18,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   web_api
   editor
   indexer
diff --git a/map/extrapolation_benchmark/CMakeLists.txt b/map/extrapolation_benchmark/CMakeLists.txt
index 9212772043..20990c1419 100644
--- a/map/extrapolation_benchmark/CMakeLists.txt
+++ b/map/extrapolation_benchmark/CMakeLists.txt
@@ -15,6 +15,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   web_api
   routing
   metrics
diff --git a/map/framework.cpp b/map/framework.cpp
index fab9567b7e..0f9b333747 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -96,6 +96,8 @@
 #include "partners_api/opentable_api.hpp"
 #include "partners_api/partners.hpp"
 
+#include "api/ge0_generator.hpp"
+
 #include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/math.hpp"
@@ -104,9 +106,6 @@
 #include "base/string_utils.hpp"
 #include "base/timer.hpp"
 
-#include "api/internal/c/api-client-internals.h"
-#include "api/src/c/api-client.h"
-
 #include <algorithm>
 #include <sstream>
 
@@ -2657,6 +2656,7 @@ StringsBundle const & Framework::GetStringsBundle()
   return m_stringsBundle;
 }
 
+// static
 string Framework::CodeGe0url(Bookmark const * bmk, bool addName)
 {
   double lat = mercator::YToLat(bmk->GetPivot().y);
@@ -2664,6 +2664,7 @@ string Framework::CodeGe0url(Bookmark const * bmk, bool addName)
   return CodeGe0url(lat, lon, bmk->GetScale(), addName ? bmk->GetPreferredName() : "");
 }
 
+// static
 string Framework::CodeGe0url(double lat, double lon, double zoomLevel, string const & name)
 {
   size_t const resultSize = MapsWithMe_GetMaxBufferSize(static_cast<int>(name.size()));
diff --git a/map/framework.hpp b/map/framework.hpp
index c86c8a7852..9dfba671c4 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -721,8 +721,8 @@ public:
                               double bearing, double speed, double elapsedSeconds);
 
 public:
-  std::string CodeGe0url(Bookmark const * bmk, bool addName);
-  std::string CodeGe0url(double lat, double lon, double zoomLevel, std::string const & name);
+  static std::string CodeGe0url(Bookmark const * bmk, bool addName);
+  static std::string CodeGe0url(double lat, double lon, double zoomLevel, std::string const & name);
 
   /// @name Api
   std::string GenerateApiBackUrl(ApiMarkPoint const & point) const;
diff --git a/map/ge0_parser.cpp b/map/ge0_parser.cpp
index 0f0832dc96..96cdd620cf 100644
--- a/map/ge0_parser.cpp
+++ b/map/ge0_parser.cpp
@@ -2,12 +2,12 @@
 
 #include "map/mwm_url.hpp"
 
-#include "api/internal/c/api-client-internals.h"
-
 #include "geometry/mercator.hpp"
 
 #include "coding/url_encode.hpp"
 
+#include "api/ge0_generator.hpp"
+
 #include "base/math.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/map/map_integration_tests/CMakeLists.txt b/map/map_integration_tests/CMakeLists.txt
index c2b76f1073..7fbd110d92 100644
--- a/map/map_integration_tests/CMakeLists.txt
+++ b/map/map_integration_tests/CMakeLists.txt
@@ -10,6 +10,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   web_api
   search_tests_support
   editor_tests_support
diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt
index eab48bb9b4..91f4825907 100644
--- a/map/map_tests/CMakeLists.txt
+++ b/map/map_tests/CMakeLists.txt
@@ -41,6 +41,7 @@ omim_link_libraries(
   generator_tests_support
   generator
   map
+  api
   drape_frontend
   shaders
   drape
diff --git a/map/map_tests/ge0_parser_tests.cpp b/map/map_tests/ge0_parser_tests.cpp
index 7cebce4e51..3d6d75869a 100644
--- a/map/map_tests/ge0_parser_tests.cpp
+++ b/map/map_tests/ge0_parser_tests.cpp
@@ -3,8 +3,7 @@
 #include "map/ge0_parser.hpp"
 #include "map/mwm_url.hpp"
 
-#include "api/internal/c/api-client-internals.h"
-#include "api/src/c/api-client.h"
+#include "api/ge0_generator.hpp"
 
 #include "base/macros.hpp"
 
diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt
index a3f2b923b2..365c033e74 100644
--- a/map/mwm_tests/CMakeLists.txt
+++ b/map/mwm_tests/CMakeLists.txt
@@ -11,6 +11,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   web_api
   search
   storage
diff --git a/mapshot/CMakeLists.txt b/mapshot/CMakeLists.txt
index cfe6d2c031..e0448cda06 100644
--- a/mapshot/CMakeLists.txt
+++ b/mapshot/CMakeLists.txt
@@ -16,6 +16,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   software_renderer
   drape_frontend
   shaders
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
index 9f9b8800b5..1c59de6da6 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
@@ -34,6 +34,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   qt_common
   map
+  api
   drape_frontend
   shaders
   routing
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 587e024ac8..4e966c057c 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -70,6 +70,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   qt_common
   map
+  api
   drape_frontend
   shaders
   generator
diff --git a/routing/routing_benchmarks/CMakeLists.txt b/routing/routing_benchmarks/CMakeLists.txt
index e2db6c3107..42e4cbeaa1 100644
--- a/routing/routing_benchmarks/CMakeLists.txt
+++ b/routing/routing_benchmarks/CMakeLists.txt
@@ -16,6 +16,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   routing
   traffic
   routing_common
diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt
index cffdc4682c..64d8e89153 100644
--- a/routing/routing_consistency_tests/CMakeLists.txt
+++ b/routing/routing_consistency_tests/CMakeLists.txt
@@ -17,6 +17,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   routing
   traffic
   routing_common
diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt
index f37555f455..a78fcc05bb 100644
--- a/routing/routing_integration_tests/CMakeLists.txt
+++ b/routing/routing_integration_tests/CMakeLists.txt
@@ -41,6 +41,7 @@ omim_link_libraries(
   editor_tests_support
   generator
   map
+  api
   tracking
   drape_frontend
   shaders
diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt
index e5382a1877..5753326f78 100644
--- a/routing/routing_tests/CMakeLists.txt
+++ b/routing/routing_tests/CMakeLists.txt
@@ -47,6 +47,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
+  api
   routing
   platform_tests_support
   traffic
diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt
index edac2d415f..613721dd0d 100644
--- a/search/search_quality/assessment_tool/CMakeLists.txt
+++ b/search/search_quality/assessment_tool/CMakeLists.txt
@@ -41,6 +41,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   qt_common
   map
+  api
   drape_frontend
   shaders
   routing
diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt
index 7be242e851..4aec78cffd 100644
--- a/storage/storage_integration_tests/CMakeLists.txt
+++ b/storage/storage_integration_tests/CMakeLists.txt
@@ -22,6 +22,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   platform_tests_support
   map
+  api
   drape_frontend
   shaders
   routing
diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt
index 7bc7ab069a..7b18b7dfea 100644
--- a/storage/storage_tests/CMakeLists.txt
+++ b/storage/storage_tests/CMakeLists.txt
@@ -27,6 +27,7 @@ omim_link_libraries(
   drape_frontend
   shaders
   map
+  api
   storage
   drape
   generator
diff --git a/xcode/api/api.xcodeproj/project.pbxproj b/xcode/api/api.xcodeproj/project.pbxproj
index 7f2498c3c6..7f995433a0 100644
--- a/xcode/api/api.xcodeproj/project.pbxproj
+++ b/xcode/api/api.xcodeproj/project.pbxproj
@@ -7,22 +7,38 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3496AB901DC1F7D400C5DDBA /* api-client-test.c in Sources */ = {isa = PBXBuildFile; fileRef = 3496AB8E1DC1F71200C5DDBA /* api-client-test.c */; };
 		3496AB911DC1F7E000C5DDBA /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675347171A40577A00A0A8C3 /* libapi.a */; };
-		675347271A4057A700A0A8C3 /* api-client.c in Sources */ = {isa = PBXBuildFile; fileRef = 675347251A4057A700A0A8C3 /* api-client.c */; };
-		675347281A4057A700A0A8C3 /* api-client.h in Headers */ = {isa = PBXBuildFile; fileRef = 675347261A4057A700A0A8C3 /* api-client.h */; };
-		6753472B1A4057C500A0A8C3 /* api-client-internals.h in Headers */ = {isa = PBXBuildFile; fileRef = 6753472A1A4057C500A0A8C3 /* api-client-internals.h */; };
+		390F890623E0F1CB00476FCF /* ge0_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 390F890423E0F1CB00476FCF /* ge0_generator.hpp */; };
+		390F890723E0F1CB00476FCF /* ge0_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 390F890523E0F1CB00476FCF /* ge0_generator.cpp */; };
+		391A145723E0FC5200A448F4 /* ge0_generator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 391A145623E0FC5200A448F4 /* ge0_generator_tests.cpp */; };
+		391A145923E0FC5C00A448F4 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 391A145823E0FC5C00A448F4 /* testingmain.cpp */; };
+		391A145C23E0FC7F00A448F4 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145B23E0FC7F00A448F4 /* libplatform.a */; };
+		391A145E23E0FC8400A448F4 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145D23E0FC8400A448F4 /* libcoding.a */; };
+		391A146023E0FC8700A448F4 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145F23E0FC8700A448F4 /* libbase.a */; };
+		391A146223E0FC8B00A448F4 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146123E0FC8B00A448F4 /* liboauthcpp.a */; };
+		391A146423E0FC9200A448F4 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146323E0FC9200A448F4 /* libalohalitics.a */; };
+		391A146623E0FC9A00A448F4 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146523E0FC9A00A448F4 /* libz.tbd */; };
+		391A146823E0FC9E00A448F4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146723E0FC9E00A448F4 /* Security.framework */; };
+		391A146A23E0FCB700A448F4 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146923E0FCB700A448F4 /* CoreLocation.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		34763F471DBE28F800D370CF /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		34763F481DBE28F800D370CF /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		3496AB761DC1F6CD00C5DDBA /* api_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = api_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		3496AB8E1DC1F71200C5DDBA /* api-client-test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "api-client-test.c"; sourceTree = "<group>"; };
+		390F890423E0F1CB00476FCF /* ge0_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ge0_generator.hpp; path = ../../api/ge0_generator.hpp; sourceTree = "<group>"; };
+		390F890523E0F1CB00476FCF /* ge0_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ge0_generator.cpp; path = ../../api/ge0_generator.cpp; sourceTree = "<group>"; };
+		391A145623E0FC5200A448F4 /* ge0_generator_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ge0_generator_tests.cpp; path = ../../../api/api_tests/ge0_generator_tests.cpp; sourceTree = "<group>"; };
+		391A145823E0FC5C00A448F4 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		391A145B23E0FC7F00A448F4 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		391A145D23E0FC8400A448F4 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		391A145F23E0FC8700A448F4 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		391A146123E0FC8B00A448F4 /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		391A146323E0FC9200A448F4 /* libalohalitics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libalohalitics.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		391A146523E0FC9A00A448F4 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		391A146723E0FC9E00A448F4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		391A146923E0FCB700A448F4 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		675347171A40577A00A0A8C3 /* libapi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libapi.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		675347251A4057A700A0A8C3 /* api-client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "api-client.c"; path = "src/c/api-client.c"; sourceTree = "<group>"; };
-		675347261A4057A700A0A8C3 /* api-client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "api-client.h"; path = "src/c/api-client.h"; sourceTree = "<group>"; };
-		6753472A1A4057C500A0A8C3 /* api-client-internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "api-client-internals.h"; path = "c/api-client-internals.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -30,6 +46,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				391A146A23E0FCB700A448F4 /* CoreLocation.framework in Frameworks */,
+				391A146823E0FC9E00A448F4 /* Security.framework in Frameworks */,
+				391A146623E0FC9A00A448F4 /* libz.tbd in Frameworks */,
+				391A146423E0FC9200A448F4 /* libalohalitics.a in Frameworks */,
+				391A146223E0FC8B00A448F4 /* liboauthcpp.a in Frameworks */,
+				391A146023E0FC8700A448F4 /* libbase.a in Frameworks */,
+				391A145E23E0FC8400A448F4 /* libcoding.a in Frameworks */,
+				391A145C23E0FC7F00A448F4 /* libplatform.a in Frameworks */,
 				3496AB911DC1F7E000C5DDBA /* libapi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -44,23 +68,40 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3496AB8D1DC1F6E400C5DDBA /* api_tests */ = {
+		391A145523E0FC4100A448F4 /* api_tests */ = {
 			isa = PBXGroup;
 			children = (
-				3496AB8E1DC1F71200C5DDBA /* api-client-test.c */,
+				391A145823E0FC5C00A448F4 /* testingmain.cpp */,
+				391A145623E0FC5200A448F4 /* ge0_generator_tests.cpp */,
 			);
-			name = api_tests;
-			path = ../../api/tests/c;
+			path = api_tests;
+			sourceTree = "<group>";
+		};
+		391A145A23E0FC7F00A448F4 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				391A146923E0FCB700A448F4 /* CoreLocation.framework */,
+				391A146723E0FC9E00A448F4 /* Security.framework */,
+				391A146523E0FC9A00A448F4 /* libz.tbd */,
+				391A146323E0FC9200A448F4 /* libalohalitics.a */,
+				391A146123E0FC8B00A448F4 /* liboauthcpp.a */,
+				391A145F23E0FC8700A448F4 /* libbase.a */,
+				391A145D23E0FC8400A448F4 /* libcoding.a */,
+				391A145B23E0FC7F00A448F4 /* libplatform.a */,
+			);
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		6753470E1A40577A00A0A8C3 = {
 			isa = PBXGroup;
 			children = (
+				391A145523E0FC4100A448F4 /* api_tests */,
+				390F890523E0F1CB00476FCF /* ge0_generator.cpp */,
+				390F890423E0F1CB00476FCF /* ge0_generator.hpp */,
 				34763F471DBE28F800D370CF /* common-debug.xcconfig */,
 				34763F481DBE28F800D370CF /* common-release.xcconfig */,
-				3496AB8D1DC1F6E400C5DDBA /* api_tests */,
-				675347191A40577A00A0A8C3 /* api */,
 				675347181A40577A00A0A8C3 /* Products */,
+				391A145A23E0FC7F00A448F4 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -73,25 +114,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		675347191A40577A00A0A8C3 /* api */ = {
-			isa = PBXGroup;
-			children = (
-				675347291A4057AB00A0A8C3 /* internal */,
-				675347251A4057A700A0A8C3 /* api-client.c */,
-				675347261A4057A700A0A8C3 /* api-client.h */,
-			);
-			name = api;
-			path = ../../api;
-			sourceTree = "<group>";
-		};
-		675347291A4057AB00A0A8C3 /* internal */ = {
-			isa = PBXGroup;
-			children = (
-				6753472A1A4057C500A0A8C3 /* api-client-internals.h */,
-			);
-			path = internal;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -99,8 +121,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				675347281A4057A700A0A8C3 /* api-client.h in Headers */,
-				6753472B1A4057C500A0A8C3 /* api-client-internals.h in Headers */,
+				390F890623E0F1CB00476FCF /* ge0_generator.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -164,6 +185,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -193,7 +215,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3496AB901DC1F7D400C5DDBA /* api-client-test.c in Sources */,
+				391A145723E0FC5200A448F4 /* ge0_generator_tests.cpp in Sources */,
+				391A145923E0FC5C00A448F4 /* testingmain.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -201,7 +224,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				675347271A4057A700A0A8C3 /* api-client.c in Sources */,
+				390F890723E0F1CB00476FCF /* ge0_generator.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};