Correct project structure in Policy component

	FIles moved to correct directory
	CMakeLists files corrected
	Headers corrected

64 files changed, 120 insertions, 235 deletions

diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt
index 6d529e1572..debcfe66c2 100644
--- a/src/appMain/CMakeLists.txt
+++ b/src/appMain/CMakeLists.txt
@@ -119,15 +119,13 @@ include_directories (
   ${COMPONENTS_DIR}/smart_objects/include/
   ${COMPONENTS_DIR}/media_manager/include/
   ${COMPONENTS_DIR}/telemetry_monitor/include
-  ${COMPONENTS_DIR}/policy/src/policy/include/
-  ${COMPONENTS_DIR}/policy/src/policy/usage_statistics/include/
+  ${COMPONENTS_DIR}/policy/include/
   ${COMPONENTS_DIR}/resumption/include/
   ${MESSAGE_BROKER_INCLUDE_DIRECTORY}
   ${ENCRYPTION_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}
   ${CMAKE_BINARY_DIR}/src/components/
   ${COMPONENTS_DIR}/dbus/include/
-  ${CMAKE_BINARY_DIR}/src/components/policy/src/policy
   ${CMAKE_SOURCE_DIR}
   ${default_media_inc}
   ${LOG4CXX_INCLUDE_DIRECTORY}
diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt
index b8e4d65340..d44cf6c69e 100644
--- a/src/components/application_manager/CMakeLists.txt
+++ b/src/components/application_manager/CMakeLists.txt
@@ -49,8 +49,7 @@ include_directories (
   ${COMPONENTS_DIR}/rpc_base/include/
   ${COMPONENTS_DIR}/interfaces
   ${CMAKE_BINARY_DIR}/src/components/
-  ${COMPONENTS_DIR}/policy/src/policy/include/
-  ${COMPONENTS_DIR}/policy/src/policy/usage_statistics/include/
+  ${COMPONENTS_DIR}/policy/include/
   ${JSONCPP_INCLUDE_DIRECTORY}
   ${ENCRYPTION_INCLUDE_DIRECTORY}
   ${MESSAGE_BROKER_INCLUDE_DIRECTORY}
diff --git a/src/components/application_manager/include/application_manager/usage_statistics.h b/src/components/application_manager/include/application_manager/usage_statistics.h
index 970c815607..b84c820a60 100644
--- a/src/components/application_manager/include/application_manager/usage_statistics.h
+++ b/src/components/application_manager/include/application_manager/usage_statistics.h
@@ -35,8 +35,8 @@
 
 #include <string>
 #include <memory>
-#include "usage_statistics/counter.h"
-#include "usage_statistics/app_stopwatch.h"
+#include "policy/usage_statistics/counter.h"
+#include "policy/usage_statistics/app_stopwatch.h"
 #include "utils/macro.h"
 #include "utils/shared_ptr.h"
 #include "interfaces/MOBILE_API.h"
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 938df1b6a6..2e7e64b769 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -60,7 +60,7 @@
 #include "interfaces/HMI_API_schema.h"
 #include "application_manager/application_impl.h"
 #include "media_manager/media_manager.h"
-#include "usage_statistics/counter.h"
+#include "policy/usage_statistics/counter.h"
 #include "utils/custom_string.h"
 #include <time.h>
 
diff --git a/src/components/policy/src/policy/include/policy/policy_types.h b/src/components/include/policy/policy_types.h
index f03278619c..f03278619c 100644
--- a/src/components/policy/src/policy/include/policy/policy_types.h
+++ b/src/components/include/policy/policy_types.h
diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt
index abb25f1eff..69af6e7841 100644
--- a/src/components/media_manager/CMakeLists.txt
+++ b/src/components/media_manager/CMakeLists.txt
@@ -63,8 +63,7 @@ set(LIBRARIES
     glib-2.0
 )
 else(EXTENDED_MEDIA_MODE)
-set(default_includes
-)
+
 set(default_sources
     ${COMPONENTS_DIR}/media_manager/src/audio/socket_audio_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/audio/pipe_audio_streamer_adapter.cc
@@ -96,9 +95,7 @@ include_directories (
     ${COMPONENTS_DIR}/config_profile/include/
     ${JSONCPP_INCLUDE_DIRECTORY}
     ${CMAKE_BINARY_DIR}/src/components/
-    ${CMAKE_SOURCE_DIR}/src/components/policy/src/policy/include/
-    ${CMAKE_SOURCE_DIR}/src/components/policy/src/policy/usage_statistics/include/
-    ${default_includes}
+    ${COMPONENTS_DIR}/policy/include/
     ${LOG4CXX_INCLUDE_DIRECTORY}
 )
 
diff --git a/src/components/policy/CMakeLists.txt b/src/components/policy/CMakeLists.txt
index f32ef344d2..4b61055e71 100644
--- a/src/components/policy/CMakeLists.txt
+++ b/src/components/policy/CMakeLists.txt
@@ -28,11 +28,87 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-# --- Policy
-add_subdirectory(./src/policy)
-#======================= Unit-Test section =======================
-if(BUILD_TESTS)
-  add_subdirectory(test)
+set(target Policy)
+set(install_destination bin)
+set(copy_destination ${CMAKE_BINARY_DIR}/src/appMain)
+set(library_name ${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
+
+#Generation of policy table interface...
+#include(${CMAKE_SOURCE_DIR}/tools/intergen/GenerateInterfaceLibrary.cmake)
+
+include_directories (
+  ${COMPONENTS_DIR}/policy/include
+  ${COMPONENTS_DIR}/rpc_base/include
+  ${JSONCPP_INCLUDE_DIRECTORY}
+  ${COMPONENTS_DIR}/utils/include/
+  ${COMPONENTS_DIR}/config_profile/include
+  ${LOG4CXX_INCLUDE_DIRECTORY}
+)
+
+set(SOURCES
+  ./src/policy_manager_impl.cc
+  ./src/policy_helper.cc
+  ./src/policy_table.cc
+  ./src/sql_pt_queries.cc
+  ./src/sql_pt_representation.cc
+  ./src/update_status_manager.cc
+  ./src/cache_manager.cc
+  ${CMAKE_SOURCE_DIR}/src/components/rpc_base/src/rpc_base/rpc_base.cc
+)
+
+# --- Table struct section
+set(policy_struct_target policy_struct)
+set(POLICY_TABLE_SOURCES
+  ./src/policy_table/enums.cc
+  ./src/policy_table/types.cc
+  ./src/policy_table/validation.cc
+)
+
+add_library(${policy_struct_target} ${POLICY_TABLE_SOURCES})
+target_link_libraries(${policy_struct_target} Utils)
+# --- end of Table struct section
+
+# --- Usage statistics section
+set(USAGE_STATISTICS_SOURCES
+  src/usage_statistics/counter.cc
+)
+add_library(UsageStatistics ${USAGE_STATISTICS_SOURCES})
+# --- end of Usage statistics section
+
+set(LIBRARIES ConfigProfile policy_struct dbms jsoncpp Utils)
+if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
+  # --- QDB Wrapper 
+  include_directories (${COMPONENTS_DIR}/utils/include/utils)
+else ()
+  # --- SQLite Wrapper
+  include_directories (${COMPONENTS_DIR}/utils/include/utils)
+  list(APPEND LIBRARIES sqlite3)
+endif ()
+
+add_library(${target} SHARED ${SOURCES})
+target_link_libraries(${target} ${LIBRARIES} )
+
+if(ENABLE_LOG)
+  target_link_libraries(${target} log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
-#=================================================================
 
+add_custom_target(copy_library_${target} ALL
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_BINARY_DIR}/${library_name}
+    ${copy_destination}
+    DEPENDS ${target}
+    COMMENT "Copying library ${library_name}")
+
+install(TARGETS ${target}
+  DESTINATION ${install_destination}
+  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE
+)
+
+if(BUILD_TESTS)
+  add_subdirectory(test)
+endif() # BUILD_TESTS
diff --git a/src/components/policy/src/policy/Readme.txt b/src/components/policy/Readme.txt
index 370fab238a..370fab238a 100644
--- a/src/components/policy/src/policy/Readme.txt
+++ b/src/components/policy/Readme.txt
diff --git a/src/components/policy/src/policy/include/policy/cache_manager.h b/src/components/policy/include/policy/cache_manager.h
index 3a46d395f3..3a46d395f3 100644
--- a/src/components/policy/src/policy/include/policy/cache_manager.h
+++ b/src/components/policy/include/policy/cache_manager.h
diff --git a/src/components/policy/src/policy/include/policy/cache_manager_interface.h b/src/components/policy/include/policy/cache_manager_interface.h
index 958864a4a6..2b8a9fa101 100644
--- a/src/components/policy/src/policy/include/policy/cache_manager_interface.h
+++ b/src/components/policy/include/policy/cache_manager_interface.h
@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "utils/shared_ptr.h"
-#include "usage_statistics/counter.h"
+#include "policy/usage_statistics/counter.h"
 #include "policy/policy_types.h"
 #include "policy/policy_settings.h"
 
diff --git a/src/components/policy/src/policy/include/policy/policy_helper.h b/src/components/policy/include/policy/policy_helper.h
index cd79c393be..746c5efeba 100644
--- a/src/components/policy/src/policy/include/policy/policy_helper.h
+++ b/src/components/policy/include/policy/policy_helper.h
@@ -33,7 +33,7 @@
 #ifndef SRC_COMPONENTS_POLICY_INCLUDE_POLICY_POLICY_HELPER_H_
 #define SRC_COMPONENTS_POLICY_INCLUDE_POLICY_POLICY_HELPER_H_
 
-#include "functions.h"
+#include "policy/policy_table/functions.h"
 #include "utils/shared_ptr.h"
 #include "policy/policy_types.h"
 
diff --git a/src/components/policy/src/policy/include/policy/policy_listener.h b/src/components/policy/include/policy/policy_listener.h
index 9592e6a712..9592e6a712 100644
--- a/src/components/policy/src/policy/include/policy/policy_listener.h
+++ b/src/components/policy/include/policy/policy_listener.h
diff --git a/src/components/policy/src/policy/include/policy/policy_manager.h b/src/components/policy/include/policy/policy_manager.h
index 70ec5d23a2..70ec5d23a2 100644
--- a/src/components/policy/src/policy/include/policy/policy_manager.h
+++ b/src/components/policy/include/policy/policy_manager.h
diff --git a/src/components/policy/src/policy/include/policy/policy_manager_impl.h b/src/components/policy/include/policy/policy_manager_impl.h
index 23727b243d..66a96bf7a7 100644
--- a/src/components/policy/src/policy/include/policy/policy_manager_impl.h
+++ b/src/components/policy/include/policy/policy_manager_impl.h
@@ -43,7 +43,7 @@
 #include "policy/policy_table.h"
 #include "policy/cache_manager_interface.h"
 #include "policy/update_status_manager.h"
-#include "functions.h"
+#include "policy/policy_table/functions.h"
 #include "policy/usage_statistics/statistics_manager.h"
 #include "policy/policy_helper.h"
 #include "utils/timer.h"
diff --git a/src/components/policy/src/policy/include/policy/policy_table.h b/src/components/policy/include/policy/policy_table.h
index fdd4c9c2fc..fdd4c9c2fc 100644
--- a/src/components/policy/src/policy/include/policy/policy_table.h
+++ b/src/components/policy/include/policy/policy_table.h
diff --git a/src/components/policy/src/policy/policy_table/table_struct/enums.h b/src/components/policy/include/policy/policy_table/enums.h
index 523c2e9d04..523c2e9d04 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/enums.h
+++ b/src/components/policy/include/policy/policy_table/enums.h
diff --git a/src/components/policy/src/policy/policy_table/table_struct/functions.h b/src/components/policy/include/policy/policy_table/functions.h
index ee4b16b649..ee4b16b649 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/functions.h
+++ b/src/components/policy/include/policy/policy_table/functions.h
diff --git a/src/components/policy/src/policy/policy_table/table_struct/types.h b/src/components/policy/include/policy/policy_table/types.h
index ce8af22044..ce8af22044 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/types.h
+++ b/src/components/policy/include/policy/policy_table/types.h
diff --git a/src/components/policy/src/policy/include/policy/pt_ext_representation.h b/src/components/policy/include/policy/pt_ext_representation.h
index 2c5db4f002..2c5db4f002 100644
--- a/src/components/policy/src/policy/include/policy/pt_ext_representation.h
+++ b/src/components/policy/include/policy/pt_ext_representation.h
diff --git a/src/components/policy/src/policy/include/policy/pt_representation.h b/src/components/policy/include/policy/pt_representation.h
index 650c94b931..122f5326d8 100644
--- a/src/components/policy/src/policy/include/policy/pt_representation.h
+++ b/src/components/policy/include/policy/pt_representation.h
@@ -36,7 +36,7 @@
 #include <vector>
 #include <string>
 #include "policy/policy_types.h"
-#include "types.h"
+#include "policy/policy_table/types.h"
 #include "policy/policy_settings.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
diff --git a/src/components/policy/src/policy/include/policy/sql_pt_ext_queries.h b/src/components/policy/include/policy/sql_pt_ext_queries.h
index 2b65df45f3..2b65df45f3 100644
--- a/src/components/policy/src/policy/include/policy/sql_pt_ext_queries.h
+++ b/src/components/policy/include/policy/sql_pt_ext_queries.h
diff --git a/src/components/policy/src/policy/include/policy/sql_pt_ext_representation.h b/src/components/policy/include/policy/sql_pt_ext_representation.h
index 1d33750b12..1d33750b12 100644
--- a/src/components/policy/src/policy/include/policy/sql_pt_ext_representation.h
+++ b/src/components/policy/include/policy/sql_pt_ext_representation.h
diff --git a/src/components/policy/src/policy/include/policy/sql_pt_queries.h b/src/components/policy/include/policy/sql_pt_queries.h
index a2fbdef3f5..a2fbdef3f5 100644
--- a/src/components/policy/src/policy/include/policy/sql_pt_queries.h
+++ b/src/components/policy/include/policy/sql_pt_queries.h
diff --git a/src/components/policy/src/policy/include/policy/sql_pt_representation.h b/src/components/policy/include/policy/sql_pt_representation.h
index 223acb5f3d..89ee3788f0 100644
--- a/src/components/policy/src/policy/include/policy/sql_pt_representation.h
+++ b/src/components/policy/include/policy/sql_pt_representation.h
@@ -37,7 +37,7 @@
 #include <vector>
 #include "policy/pt_representation.h"
 #include "rpc_base/rpc_base.h"
-#include "types.h"
+#include "policy/policy_table/types.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
 
diff --git a/src/components/policy/src/policy/include/policy/sql_wrapper.h b/src/components/policy/include/policy/sql_wrapper.h
index d6639f6635..d6639f6635 100644
--- a/src/components/policy/src/policy/include/policy/sql_wrapper.h
+++ b/src/components/policy/include/policy/sql_wrapper.h
diff --git a/src/components/policy/src/policy/include/policy/update_status_manager.h b/src/components/policy/include/policy/update_status_manager.h
index b4f52a8b03..b4f52a8b03 100644
--- a/src/components/policy/src/policy/include/policy/update_status_manager.h
+++ b/src/components/policy/include/policy/update_status_manager.h
diff --git a/src/components/policy/src/policy/include/policy/update_status_manager_interface.h b/src/components/policy/include/policy/update_status_manager_interface.h
index 4c74910791..4c74910791 100644
--- a/src/components/policy/src/policy/include/policy/update_status_manager_interface.h
+++ b/src/components/policy/include/policy/update_status_manager_interface.h
diff --git a/src/components/policy/src/policy/usage_statistics/include/usage_statistics/app_stopwatch.h b/src/components/policy/include/policy/usage_statistics/app_stopwatch.h
index 0f9ce35459..0f9ce35459 100644
--- a/src/components/policy/src/policy/usage_statistics/include/usage_statistics/app_stopwatch.h
+++ b/src/components/policy/include/policy/usage_statistics/app_stopwatch.h
diff --git a/src/components/policy/src/policy/usage_statistics/include/usage_statistics/counter.h b/src/components/policy/include/policy/usage_statistics/counter.h
index 15db8f86f0..6f50013bcd 100644
--- a/src/components/policy/src/policy/usage_statistics/include/usage_statistics/counter.h
+++ b/src/components/policy/include/policy/usage_statistics/counter.h
@@ -35,7 +35,7 @@
 
 #include <ctime>
 #include "policy/usage_statistics/statistics_manager.h"
-#include "usage_statistics/app_stopwatch.h"
+#include "policy/usage_statistics/app_stopwatch.h"
 #include "utils/shared_ptr.h"
 #include "utils/timer.h"
 #include "utils/macro.h"
diff --git a/src/components/policy/src/policy/include/policy/user_consent_manager.h b/src/components/policy/include/policy/user_consent_manager.h
index 55c6239a6c..55c6239a6c 100644
--- a/src/components/policy/src/policy/include/policy/user_consent_manager.h
+++ b/src/components/policy/include/policy/user_consent_manager.h
diff --git a/src/components/policy/src/policy/policy_table_interface.xml b/src/components/policy/policy_table_interface.xml
index 6b671226ae..6b671226ae 100644
--- a/src/components/policy/src/policy/policy_table_interface.xml
+++ b/src/components/policy/policy_table_interface.xml
diff --git a/src/components/policy/src/policy/policy_table_interface_ext.xml b/src/components/policy/policy_table_interface_ext.xml
index 468eec2b0b..468eec2b0b 100644
--- a/src/components/policy/src/policy/policy_table_interface_ext.xml
+++ b/src/components/policy/policy_table_interface_ext.xml
diff --git a/src/components/policy/src/policy/specification.txt b/src/components/policy/specification.txt
index b00a2932e0..b00a2932e0 100644
--- a/src/components/policy/src/policy/specification.txt
+++ b/src/components/policy/specification.txt
diff --git a/src/components/policy/src/policy/src/cache_manager.cc b/src/components/policy/src/cache_manager.cc
index 1fa6cec72f..1fa6cec72f 100644
--- a/src/components/policy/src/policy/src/cache_manager.cc
+++ b/src/components/policy/src/cache_manager.cc
diff --git a/src/components/policy/src/policy/CMakeLists.txt b/src/components/policy/src/policy/CMakeLists.txt
deleted file mode 100644
index 00ad52b628..0000000000
--- a/src/components/policy/src/policy/CMakeLists.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright (c) 2013, Ford Motor Company
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of the Ford Motor Company nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-set(target Policy)
-set(install_destination bin)
-set(copy_destination ${CMAKE_BINARY_DIR}/src/appMain)
-set(library_name ${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
-
-#Generation of policy table interface...
-#include(${CMAKE_SOURCE_DIR}/tools/intergen/GenerateInterfaceLibrary.cmake)
-
-include_directories (
-  ./include
-  ./usage_statistics/include
-  ${CMAKE_SOURCE_DIR}/src/components/rpc_base/include
-  ${JSONCPP_INCLUDE_DIRECTORY}
-  #${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/components/utils/include/
-  ${CMAKE_SOURCE_DIR}/src/components
-  ${CMAKE_SOURCE_DIR}/src/components/config_profile/include
-  ${CMAKE_SOURCE_DIR}/src/components/policy/src/policy/table_struct
-  ${LOG4CXX_INCLUDE_DIRECTORY}
-)
-
-set(SOURCES
-  ./src/policy_manager_impl.cc
-  ./src/policy_helper.cc
-  ./src/policy_table.cc
-  ./src/sql_pt_queries.cc
-  ./src/sql_pt_representation.cc
-  ./src/update_status_manager.cc
-  ./src/cache_manager.cc
-  ${CMAKE_SOURCE_DIR}/src/components/rpc_base/src/rpc_base/rpc_base.cc
-)
-
-
-add_subdirectory(usage_statistics)
-
-include_directories(./policy_table/table_struct)
-add_subdirectory(policy_table/table_struct)
-
-set(LIBRARIES ConfigProfile policy_struct dbms jsoncpp Utils)
-if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
-  # --- QDB Wrapper 
-  include_directories (${COMPONENTS_DIR}/utils/include/utils)
-else ()
-  # --- SQLite Wrapper
-  include_directories (${COMPONENTS_DIR}/utils/include/utils)
-  list(APPEND LIBRARIES sqlite3)
-endif ()
-
-add_library(${target} SHARED ${SOURCES})
-target_link_libraries(${target} ${LIBRARIES} )
-
-if(ENABLE_LOG)
-  target_link_libraries(${target} log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
-endif()
-
-add_custom_target(copy_library_${target} ALL
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${CMAKE_CURRENT_BINARY_DIR}/${library_name}
-    ${copy_destination}
-    DEPENDS ${target}
-    COMMENT "Copying library ${library_name}")
-
-install(TARGETS ${target}
-  DESTINATION ${install_destination}
-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-    GROUP_READ GROUP_EXECUTE
-    WORLD_READ WORLD_EXECUTE
-)
diff --git a/src/components/policy/src/policy/policy_table/table_struct/CMakeLists.txt b/src/components/policy/src/policy/policy_table/table_struct/CMakeLists.txt
deleted file mode 100644
index 6d67c71d8b..0000000000
--- a/src/components/policy/src/policy/policy_table/table_struct/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2013, Ford Motor Company
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of the Ford Motor Company nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-set(target policy_struct)
-
-include_directories(.)
-
-set(SOURCES
-  ./enums.cc
-  ./types.cc
-  ./validation.cc
-)
-
-add_library(${target} ${SOURCES})
-target_link_libraries(${target} Utils)
diff --git a/src/components/policy/src/policy/usage_statistics/CMakeLists.txt b/src/components/policy/src/policy/usage_statistics/CMakeLists.txt
deleted file mode 100644
index b57431b8f8..0000000000
--- a/src/components/policy/src/policy/usage_statistics/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2014, Ford Motor Company
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of the Ford Motor Company nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-include_directories(include)
-
-set(SOURCES
-  src/counter.cc
-)
-
-add_library(UsageStatistics ${SOURCES})
diff --git a/src/components/policy/src/policy/src/policy_helper.cc b/src/components/policy/src/policy_helper.cc
index b72a041a83..b72a041a83 100644
--- a/src/components/policy/src/policy/src/policy_helper.cc
+++ b/src/components/policy/src/policy_helper.cc
diff --git a/src/components/policy/src/policy/src/policy_manager_impl.cc b/src/components/policy/src/policy_manager_impl.cc
index c67403d835..c67403d835 100644
--- a/src/components/policy/src/policy/src/policy_manager_impl.cc
+++ b/src/components/policy/src/policy_manager_impl.cc
diff --git a/src/components/policy/src/policy/src/policy_table.cc b/src/components/policy/src/policy_table.cc
index c5c6e3e132..c5c6e3e132 100644
--- a/src/components/policy/src/policy/src/policy_table.cc
+++ b/src/components/policy/src/policy_table.cc
diff --git a/src/components/policy/src/policy/policy_table/table_struct/enums.cc b/src/components/policy/src/policy_table/enums.cc
index c8da3aebcd..26c7b96b32 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/enums.cc
+++ b/src/components/policy/src/policy_table/enums.cc
@@ -1,5 +1,5 @@
 // This file is generated, do not edit
-#include "./enums.h"
+#include "policy/policy_table/enums.h"
 
 namespace rpc {
 namespace policy_table_interface_base {
diff --git a/src/components/policy/src/policy/policy_table/table_struct/types.cc b/src/components/policy/src/policy_table/types.cc
index 4f1e3e50eb..9d9029747e 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/types.cc
+++ b/src/components/policy/src/policy_table/types.cc
@@ -1,5 +1,5 @@
 // This file is generated, do not edit
-#include "./types.h"
+#include "policy/policy_table/types.h"
 #include "rpc_base/rpc_base_json_inl.h"
 
 namespace rpc {
diff --git a/src/components/policy/src/policy/policy_table/table_struct/validation.cc b/src/components/policy/src/policy_table/validation.cc
index 1c73ea3281..b9bcbfa7ab 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/validation.cc
+++ b/src/components/policy/src/policy_table/validation.cc
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include "./types.h"
+#include "policy/policy_table/types.h"
 #include "utils/logger.h"
 
 namespace {
diff --git a/src/components/policy/src/policy/src/sql_pt_ext_queries.cc b/src/components/policy/src/sql_pt_ext_queries.cc
index 3fde462a32..3fde462a32 100644
--- a/src/components/policy/src/policy/src/sql_pt_ext_queries.cc
+++ b/src/components/policy/src/sql_pt_ext_queries.cc
diff --git a/src/components/policy/src/policy/src/sql_pt_ext_representation.cc b/src/components/policy/src/sql_pt_ext_representation.cc
index c64efaaede..c64efaaede 100644
--- a/src/components/policy/src/policy/src/sql_pt_ext_representation.cc
+++ b/src/components/policy/src/sql_pt_ext_representation.cc
diff --git a/src/components/policy/src/policy/src/sql_pt_queries.cc b/src/components/policy/src/sql_pt_queries.cc
index 2656918858..2656918858 100644
--- a/src/components/policy/src/policy/src/sql_pt_queries.cc
+++ b/src/components/policy/src/sql_pt_queries.cc
diff --git a/src/components/policy/src/policy/src/sql_pt_representation.cc b/src/components/policy/src/sql_pt_representation.cc
index d2c8ac05fa..d2c8ac05fa 100644
--- a/src/components/policy/src/policy/src/sql_pt_representation.cc
+++ b/src/components/policy/src/sql_pt_representation.cc
diff --git a/src/components/policy/src/policy/src/update_status_manager.cc b/src/components/policy/src/update_status_manager.cc
index f821b9655b..f821b9655b 100644
--- a/src/components/policy/src/policy/src/update_status_manager.cc
+++ b/src/components/policy/src/update_status_manager.cc
diff --git a/src/components/policy/src/policy/usage_statistics/src/counter.cc b/src/components/policy/src/usage_statistics/counter.cc
index 4280aa0f67..c5d7eaf9df 100644
--- a/src/components/policy/src/policy/usage_statistics/src/counter.cc
+++ b/src/components/policy/src/usage_statistics/counter.cc
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_POLICY_INCLUDE_POLICY_STATISTICS_MANAGER_H_
 
 #include <cassert>
-#include "usage_statistics/counter.h"
+#include "policy/usage_statistics/counter.h"
 #include "utils/date_time.h"
 #include "utils/make_shared.h"
 #include "utils/timer_task_impl.h"
diff --git a/src/components/policy/test/CMakeLists.txt b/src/components/policy/test/CMakeLists.txt
index a511a71f20..95a61f92ff 100644
--- a/src/components/policy/test/CMakeLists.txt
+++ b/src/components/policy/test/CMakeLists.txt
@@ -33,13 +33,10 @@ include_directories(
   ${COMPONENTS_DIR}
   ${GMOCK_INCLUDE_DIRECTORY}
   ${JSONCPP_INCLUDE_DIRECTORY}
-  ${COMPONENTS_DIR}/policy/src/policy/include/
-  ${COMPONENTS_DIR}/policy/src/policy/usage_statistics/include
+  ${COMPONENTS_DIR}/policy/include
   ${COMPONENTS_DIR}/rpc_base/include
   ${COMPONENTS_DIR}/config_profile/include
   ${COMPONENTS_DIR}/utils/include/
-  ${COMPONENTS_DIR}/policy/src/policy/policy_table/table_struct
-  ${COMPONENTS_DIR}/policy/src/policy/policy_table/
   ${COMPONENTS_DIR}/policy/test/include/
 )
 
diff --git a/src/components/policy/test/counter_test.cc b/src/components/policy/test/counter_test.cc
index 7efe88419e..84b6d7fef4 100644
--- a/src/components/policy/test/counter_test.cc
+++ b/src/components/policy/test/counter_test.cc
@@ -32,7 +32,7 @@
 #include "gmock/gmock.h"
 
 #include "policy/mock_statistics_manager.h"
-#include "usage_statistics/counter.h"
+#include "policy/usage_statistics/counter.h"
 
 using ::testing::StrictMock;
 using ::testing::InSequence;
diff --git a/src/components/policy/test/generated_code_test.cc b/src/components/policy/test/generated_code_test.cc
index 52bf4c639b..8b1a4d7478 100644
--- a/src/components/policy/test/generated_code_test.cc
+++ b/src/components/policy/test/generated_code_test.cc
@@ -35,8 +35,8 @@
 
 #include "json/reader.h"
 #include "json/value.h"
-#include "table_struct/enums.h"
-#include "table_struct/types.h"
+#include "policy/policy_table/enums.h"
+#include "policy/policy_table/types.h"
 #include "rpc_base/gtest_support.h"
 
 using rpc::policy_table_interface_base::Table;
diff --git a/src/components/policy/test/include/mock_app_stopwatch.h b/src/components/policy/test/include/mock_app_stopwatch.h
index de34e9e3c4..481d887cb2 100644
--- a/src/components/policy/test/include/mock_app_stopwatch.h
+++ b/src/components/policy/test/include/mock_app_stopwatch.h
@@ -33,7 +33,7 @@
 #define SRC_COMPONENTS_INCLUDE_TEST_POLICY_USAGE_STATISTICS_MOCK_APP_STOPWATCH_H_
 
 #include "gmock/gmock.h"
-#include "usage_statistics/app_stopwatch.h"
+#include "policy/usage_statistics/app_stopwatch.h"
 #include "policy/usage_statistics/statistics_manager.h"
 
 namespace test {
diff --git a/src/components/policy/test/include/mock_policy_listener.h b/src/components/policy/test/include/mock_policy_listener.h
index 8a50ad62fc..73905f4dcb 100644
--- a/src/components/policy/test/include/mock_policy_listener.h
+++ b/src/components/policy/test/include/mock_policy_listener.h
@@ -38,7 +38,7 @@
 
 #include "policy/policy_listener.h"
 #include "rpc_base/rpc_base.h"
-#include "table_struct/types.h"
+#include "policy/policy_table/types.h"
 #include "utils/custom_string.h"
 
 namespace policy_table = ::rpc::policy_table_interface_base;
diff --git a/src/components/policy/test/include/mock_pt_ext_representation.h b/src/components/policy/test/include/mock_pt_ext_representation.h
index bafce1471a..4f6eb7e08f 100644
--- a/src/components/policy/test/include/mock_pt_ext_representation.h
+++ b/src/components/policy/test/include/mock_pt_ext_representation.h
@@ -39,7 +39,7 @@
 
 #include "policy/pt_ext_representation.h"
 #include "rpc_base/rpc_base.h"
-#include "table_struct/types.h"
+#include "policy/policy_table/types.h"
 #include "mock_pt_representation.h"
 
 namespace policy_table = ::rpc::policy_table_interface_base;
diff --git a/src/components/policy/test/include/mock_pt_representation.h b/src/components/policy/test/include/mock_pt_representation.h
index 7906018721..045c901be2 100644
--- a/src/components/policy/test/include/mock_pt_representation.h
+++ b/src/components/policy/test/include/mock_pt_representation.h
@@ -39,7 +39,7 @@
 
 #include "policy/pt_representation.h"
 #include "rpc_base/rpc_base.h"
-#include "table_struct/types.h"
+#include "policy/policy_table/types.h"
 
 namespace policy_table = ::rpc::policy_table_interface_base;
 
diff --git a/src/components/policy/test/policy_manager_impl_test.cc b/src/components/policy/test/policy_manager_impl_test.cc
index c1239d9f47..f9addf1fb3 100644
--- a/src/components/policy/test/policy_manager_impl_test.cc
+++ b/src/components/policy/test/policy_manager_impl_test.cc
@@ -40,8 +40,8 @@
 
 #include "policy/policy_manager_impl.h"
 #include "config_profile/profile.h"
-#include "table_struct/enums.h"
-#include "table_struct/types.h"
+#include "policy/policy_table/enums.h"
+#include "policy/policy_table/types.h"
 #include "policy/mock_policy_settings.h"
 #include "mock_policy_listener.h"
 #include "mock_cache_manager.h"
diff --git a/src/components/policy/test/shared_library_test.cc b/src/components/policy/test/shared_library_test.cc
index 53238a463d..f4177f0fd9 100644
--- a/src/components/policy/test/shared_library_test.cc
+++ b/src/components/policy/test/shared_library_test.cc
@@ -48,7 +48,7 @@ namespace policy {
 TEST(SharedLibraryTest,
      FullTest_OpenLibrarySetSymbolCloseLibrary_ExpectActsWithoutErrors) {
   // Arrange
-  const std::string kLib = "../src/policy/libPolicy.so";
+  const std::string kLib = "../libPolicy.so";
   void* handle = dlopen(kLib.c_str(), RTLD_LAZY);
 
   // Assert
diff --git a/src/components/policy/test/sql_pt_representation_test.cc b/src/components/policy/test/sql_pt_representation_test.cc
index 08c0e65584..b886e80827 100644
--- a/src/components/policy/test/sql_pt_representation_test.cc
+++ b/src/components/policy/test/sql_pt_representation_test.cc
@@ -49,8 +49,8 @@
 #include "utils/shared_ptr.h"
 #include "utils/make_shared.h"
 #include "utils/file_system.h"
-#include "./types.h"
-#include "./enums.h"
+#include "policy/policy_table/types.h"
+#include "policy/policy_table/enums.h"
 #include "rpc_base/rpc_base.h"
 #include "utils/sqlite_wrapper/sql_database.h"
 
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt
index 815720e15c..f3004dc61e 100644
--- a/src/components/telemetry_monitor/CMakeLists.txt
+++ b/src/components/telemetry_monitor/CMakeLists.txt
@@ -38,8 +38,7 @@ include_directories (
   ${COMPONENTS_DIR}/connection_handler/include/
   ${COMPONENTS_DIR}/transport_manager/include/
   ${COMPONENTS_DIR}/application_manager/include/
-  ${COMPONENTS_DIR}/policy/src/policy/include/
-  ${COMPONENTS_DIR}/policy/src/policy/usage_statistics/include
+  ${COMPONENTS_DIR}/policy/include/
   ${COMPONENTS_DIR}/hmi_message_handler/include/
   ${COMPONENTS_DIR}/formatters/include/
   ${COMPONENTS_DIR}/media_manager/include/
diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt
index 483f00661d..cc4f0a13c2 100644
--- a/src/components/utils/test/CMakeLists.txt
+++ b/src/components/utils/test/CMakeLists.txt
@@ -73,7 +73,7 @@ set(testLibraries
   ConfigProfile
 )
 
-include_directories(${COMPONENTS_DIR}/policy/src/policy/policy_table/table_struct)
+include_directories(${COMPONENTS_DIR}/policy/include)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
   # --- Tests for QDB Wrapper
diff --git a/src/components/utils/test/include/generated_code_with_sqlite_test.h b/src/components/utils/test/include/generated_code_with_sqlite_test.h
index 1abeb5f6b6..dcf85aafe1 100644
--- a/src/components/utils/test/include/generated_code_with_sqlite_test.h
+++ b/src/components/utils/test/include/generated_code_with_sqlite_test.h
@@ -33,7 +33,7 @@
 #define SRC_COMPONENTS_POLICY_TEST_POLICY_INCLUDE_GENERATED_CODE_WITH_SQLITE_TEST_H_
 
 #include <string>
-#include "./types.h"
+#include "policy/policy_table/types.h"
 #include "rpc_base/rpc_base.h"
 #include "sqlite_wrapper/sql_query.h"
 #include "sqlite_wrapper/sql_database.h"
diff --git a/tools/policy_table_validator/CMakeLists.txt b/tools/policy_table_validator/CMakeLists.txt
index 2a372d7ffa..7d9194e473 100644
--- a/tools/policy_table_validator/CMakeLists.txt
+++ b/tools/policy_table_validator/CMakeLists.txt
@@ -1,16 +1,15 @@
 #set( CMAKE_VERBOSE_MAKEFILE on )
 
 include_directories(
-	${CMAKE_SOURCE_DIR}/src/components/policy/src/policy/
-        ${CMAKE_SOURCE_DIR}/src/components/rpc_base/include/
-        ${CMAKE_SOURCE_DIR}/src/components/utils/include/
+  ${CMAKE_SOURCE_DIR}/src/components/policy/include
+  ${CMAKE_SOURCE_DIR}/src/components/rpc_base/include/
+  ${CMAKE_SOURCE_DIR}/src/components/utils/include/
 	${JSONCPP_INCLUDE_DIRECTORY}
 )
 
 
 link_directories (
-    ${CMAKE_BINARY_DIR}/src/components/policy/src/policy/policy_table/table_struct/
-    ${CMAKE_BINARY_DIR}/src/components/rpc_base/
+  ${CMAKE_BINARY_DIR}/src/components/rpc_base/
 )
 
 
diff --git a/tools/policy_table_validator/main.cpp b/tools/policy_table_validator/main.cpp
index 16454ca128..509182edbf 100644
--- a/tools/policy_table_validator/main.cpp
+++ b/tools/policy_table_validator/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cstdlib>
-#include "policy_table/table_struct/types.h"
+#include "policy/policy_table/types.h"
 
 #include "json/reader.h"
 #include "utils/file_system.h"