From: Krzysztof Jackiewicz <k.jackiewicz@samsung.com>
Date: Thu, 16 Apr 2015 10:01:05 +0000 (+0200)
Subject: Rename /tests to /ckm to align with tizen branch
X-Git-Tag: security-manager_5.5_testing~9^2~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d370c9cedc0044f12e434de5669da4689156e64;hp=fa4f892c33fe7c611aae6c43cf6cfa0bca26ecf5;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Rename /tests to /ckm to align with tizen branch

[Issue#] N/A
[Feature/Bug] N/A
[Problem] N/A
[Cause] N/A
[Solution] Renamed

[Verification] Compile, run tests

Change-Id: Ic24c4b694de04e44ceb6947f6628872f09def079
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bec6a0b..c684579 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,4 +85,4 @@ SET(COMMON_TARGET_TEST "tests-common")
 
 ############################# subdirectories ##################################
 
-ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(src)
diff --git a/tests/CMakeLists.txt b/src/CMakeLists.txt
similarity index 92%
rename from tests/CMakeLists.txt
rename to src/CMakeLists.txt
index cff3c9a..df2812a 100644
--- a/tests/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,7 @@ TARGET_LINK_LIBRARIES(${DPL_FRAMEWORK_TEST_LIBRARY}
     ${SYS_FRAMEWORK_TEST_LIBRARIES}
     )
 
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/tests/security-tests.sh
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/src/security-tests.sh
     DESTINATION bin
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
@@ -57,7 +57,7 @@ INSTALL(FILES ${PROJECT_SOURCE_DIR}/tests/security-tests.sh
                 WORLD_EXECUTE
     )
 
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/tests/security-tests-all.sh
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/src/security-tests-all.sh
     DESTINATION bin
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
@@ -69,7 +69,7 @@ INSTALL(FILES ${PROJECT_SOURCE_DIR}/tests/security-tests-all.sh
     )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/test-performance-check.sh
+    ${PROJECT_SOURCE_DIR}/src/test-performance-check.sh
     DESTINATION bin
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
diff --git a/tests/ckm/CMakeLists.txt b/src/ckm/CMakeLists.txt
similarity index 69%
rename from tests/ckm/CMakeLists.txt
rename to src/ckm/CMakeLists.txt
index b53411c..b0f4610 100644
--- a/tests/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@ -39,22 +39,22 @@ PKG_CHECK_MODULES(CKM_DEP
 # Targets definition
 
 SET(CKM_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/ckm/access_provider2.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/main.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/capi-testcases.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/capi-certificate-chains.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/capi-access_control.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/async-api.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/ckm-common.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/cc-mode.cpp
-#    ${PROJECT_SOURCE_DIR}/tests/ckm/password-integration.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/clean-env.cpp
-    ${PROJECT_SOURCE_DIR}/tests/ckm/test-certs.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/access_provider2.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/main.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/capi-testcases.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/capi-certificate-chains.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/capi-access_control.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/async-api.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/ckm-common.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/cc-mode.cpp
+#    ${PROJECT_SOURCE_DIR}/src/ckm/password-integration.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/clean-env.cpp
+    ${PROJECT_SOURCE_DIR}/src/ckm/test-certs.cpp
 )
 
 INCLUDE_DIRECTORIES(SYSTEM ${CKM_DEP_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/tests/common/ )
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/tests/ckm/ )
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/common/ )
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/ckm/ )
 
 ADD_EXECUTABLE(${TARGET_CKM_TESTS} ${CKM_SOURCES})
 
diff --git a/tests/ckm/access_provider2.cpp b/src/ckm/access_provider2.cpp
similarity index 100%
rename from tests/ckm/access_provider2.cpp
rename to src/ckm/access_provider2.cpp
diff --git a/tests/ckm/access_provider2.h b/src/ckm/access_provider2.h
similarity index 100%
rename from tests/ckm/access_provider2.h
rename to src/ckm/access_provider2.h
diff --git a/tests/ckm/async-api.cpp b/src/ckm/async-api.cpp
similarity index 100%
rename from tests/ckm/async-api.cpp
rename to src/ckm/async-api.cpp
diff --git a/tests/ckm/capi-access_control.cpp b/src/ckm/capi-access_control.cpp
similarity index 100%
rename from tests/ckm/capi-access_control.cpp
rename to src/ckm/capi-access_control.cpp
diff --git a/tests/ckm/capi-certificate-chains.cpp b/src/ckm/capi-certificate-chains.cpp
similarity index 100%
rename from tests/ckm/capi-certificate-chains.cpp
rename to src/ckm/capi-certificate-chains.cpp
diff --git a/tests/ckm/capi-t3096.p12 b/src/ckm/capi-t3096.p12
similarity index 100%
rename from tests/ckm/capi-t3096.p12
rename to src/ckm/capi-t3096.p12
diff --git a/tests/ckm/capi-testcases.cpp b/src/ckm/capi-testcases.cpp
similarity index 100%
rename from tests/ckm/capi-testcases.cpp
rename to src/ckm/capi-testcases.cpp
diff --git a/tests/ckm/cc-mode.cpp b/src/ckm/cc-mode.cpp
similarity index 100%
rename from tests/ckm/cc-mode.cpp
rename to src/ckm/cc-mode.cpp
diff --git a/tests/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
similarity index 100%
rename from tests/ckm/ckm-common.cpp
rename to src/ckm/ckm-common.cpp
diff --git a/tests/ckm/ckm-common.h b/src/ckm/ckm-common.h
similarity index 100%
rename from tests/ckm/ckm-common.h
rename to src/ckm/ckm-common.h
diff --git a/tests/ckm/clean-env.cpp b/src/ckm/clean-env.cpp
similarity index 100%
rename from tests/ckm/clean-env.cpp
rename to src/ckm/clean-env.cpp
diff --git a/tests/ckm/clean-env.h b/src/ckm/clean-env.h
similarity index 100%
rename from tests/ckm/clean-env.h
rename to src/ckm/clean-env.h
diff --git a/tests/ckm/keys/im_ca.crt b/src/ckm/keys/im_ca.crt
similarity index 100%
rename from tests/ckm/keys/im_ca.crt
rename to src/ckm/keys/im_ca.crt
diff --git a/tests/ckm/keys/im_ca.csr b/src/ckm/keys/im_ca.csr
similarity index 100%
rename from tests/ckm/keys/im_ca.csr
rename to src/ckm/keys/im_ca.csr
diff --git a/tests/ckm/keys/im_ca.key b/src/ckm/keys/im_ca.key
similarity index 100%
rename from tests/ckm/keys/im_ca.key
rename to src/ckm/keys/im_ca.key
diff --git a/tests/ckm/keys/root_ca.crt b/src/ckm/keys/root_ca.crt
similarity index 100%
rename from tests/ckm/keys/root_ca.crt
rename to src/ckm/keys/root_ca.crt
diff --git a/tests/ckm/keys/root_ca.key b/src/ckm/keys/root_ca.key
similarity index 100%
rename from tests/ckm/keys/root_ca.key
rename to src/ckm/keys/root_ca.key
diff --git a/tests/ckm/keys/test.crt b/src/ckm/keys/test.crt
similarity index 100%
rename from tests/ckm/keys/test.crt
rename to src/ckm/keys/test.crt
diff --git a/tests/ckm/keys/test.csr b/src/ckm/keys/test.csr
similarity index 100%
rename from tests/ckm/keys/test.csr
rename to src/ckm/keys/test.csr
diff --git a/tests/ckm/keys/test.key b/src/ckm/keys/test.key
similarity index 100%
rename from tests/ckm/keys/test.key
rename to src/ckm/keys/test.key
diff --git a/tests/ckm/main.cpp b/src/ckm/main.cpp
similarity index 100%
rename from tests/ckm/main.cpp
rename to src/ckm/main.cpp
diff --git a/tests/ckm/password-integration.cpp b/src/ckm/password-integration.cpp
similarity index 100%
rename from tests/ckm/password-integration.cpp
rename to src/ckm/password-integration.cpp
diff --git a/tests/ckm/pkcs.p12 b/src/ckm/pkcs.p12
similarity index 100%
rename from tests/ckm/pkcs.p12
rename to src/ckm/pkcs.p12
diff --git a/tests/ckm/test-certs.cpp b/src/ckm/test-certs.cpp
similarity index 100%
rename from tests/ckm/test-certs.cpp
rename to src/ckm/test-certs.cpp
diff --git a/tests/ckm/test-certs.h b/src/ckm/test-certs.h
similarity index 100%
rename from tests/ckm/test-certs.h
rename to src/ckm/test-certs.h
diff --git a/tests/ckm/test1801.pkcs12 b/src/ckm/test1801.pkcs12
similarity index 100%
rename from tests/ckm/test1801.pkcs12
rename to src/ckm/test1801.pkcs12
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
new file mode 100644
index 0000000..11a444f
--- /dev/null
+++ b/src/common/CMakeLists.txt
@@ -0,0 +1,40 @@
+INCLUDE(FindPkgConfig)
+
+#dependencies
+PKG_CHECK_MODULES(COMMON_TARGET_DEP
+    libsmack
+    dbus-1
+    sqlite3
+    REQUIRED
+    )
+
+#files to compile
+SET(COMMON_TARGET_TEST_SOURCES
+    ${PROJECT_SOURCE_DIR}/src/common/tests_common.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/access_provider.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/smack_access.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/dbus_connection.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/dbus_message_in.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/dbus_message_out.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/service_manager.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/memory.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/db_sqlite.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/fs_label_manager.cpp
+    )
+
+#system and local includes
+INCLUDE_DIRECTORIES(SYSTEM ${COMMON_TARGET_DEP_INCLUDE_DIRS})
+
+INCLUDE_DIRECTORIES(
+    ${PROJECT_SOURCE_DIR}/src/framework/include
+    ${PROJECT_SOURCE_DIR}/src/common
+    )
+
+
+#output OBJECT format
+ADD_LIBRARY(${COMMON_TARGET_TEST} ${COMMON_TARGET_TEST_SOURCES})
+
+TARGET_LINK_LIBRARIES(${COMMON_TARGET_TEST} ${COMMON_TARGET_DEP_LIBRARIES}
+    dpl-test-framework)
+
+INSTALL (FILES ${PROJECT_SOURCE_DIR}/src/common/security-tests.conf DESTINATION /etc/dbus-1/system.d)
diff --git a/tests/common/access_provider.cpp b/src/common/access_provider.cpp
similarity index 100%
rename from tests/common/access_provider.cpp
rename to src/common/access_provider.cpp
diff --git a/tests/common/access_provider.h b/src/common/access_provider.h
similarity index 100%
rename from tests/common/access_provider.h
rename to src/common/access_provider.h
diff --git a/tests/common/db_sqlite.cpp b/src/common/db_sqlite.cpp
similarity index 100%
rename from tests/common/db_sqlite.cpp
rename to src/common/db_sqlite.cpp
diff --git a/tests/common/db_sqlite.h b/src/common/db_sqlite.h
similarity index 100%
rename from tests/common/db_sqlite.h
rename to src/common/db_sqlite.h
diff --git a/tests/common/dbus_connection.cpp b/src/common/dbus_connection.cpp
similarity index 100%
rename from tests/common/dbus_connection.cpp
rename to src/common/dbus_connection.cpp
diff --git a/tests/common/dbus_connection.h b/src/common/dbus_connection.h
similarity index 100%
rename from tests/common/dbus_connection.h
rename to src/common/dbus_connection.h
diff --git a/tests/common/dbus_message_in.cpp b/src/common/dbus_message_in.cpp
similarity index 100%
rename from tests/common/dbus_message_in.cpp
rename to src/common/dbus_message_in.cpp
diff --git a/tests/common/dbus_message_in.h b/src/common/dbus_message_in.h
similarity index 100%
rename from tests/common/dbus_message_in.h
rename to src/common/dbus_message_in.h
diff --git a/tests/common/dbus_message_out.cpp b/src/common/dbus_message_out.cpp
similarity index 100%
rename from tests/common/dbus_message_out.cpp
rename to src/common/dbus_message_out.cpp
diff --git a/tests/common/dbus_message_out.h b/src/common/dbus_message_out.h
similarity index 100%
rename from tests/common/dbus_message_out.h
rename to src/common/dbus_message_out.h
diff --git a/tests/common/fs_label_manager.cpp b/src/common/fs_label_manager.cpp
similarity index 100%
rename from tests/common/fs_label_manager.cpp
rename to src/common/fs_label_manager.cpp
diff --git a/tests/common/fs_label_manager.h b/src/common/fs_label_manager.h
similarity index 100%
rename from tests/common/fs_label_manager.h
rename to src/common/fs_label_manager.h
diff --git a/tests/common/memory.cpp b/src/common/memory.cpp
similarity index 100%
rename from tests/common/memory.cpp
rename to src/common/memory.cpp
diff --git a/tests/common/memory.h b/src/common/memory.h
similarity index 100%
rename from tests/common/memory.h
rename to src/common/memory.h
diff --git a/tests/common/security-tests.conf b/src/common/security-tests.conf
similarity index 100%
rename from tests/common/security-tests.conf
rename to src/common/security-tests.conf
diff --git a/tests/common/service_manager.cpp b/src/common/service_manager.cpp
similarity index 100%
rename from tests/common/service_manager.cpp
rename to src/common/service_manager.cpp
diff --git a/tests/common/service_manager.h b/src/common/service_manager.h
similarity index 100%
rename from tests/common/service_manager.h
rename to src/common/service_manager.h
diff --git a/tests/common/smack_access.cpp b/src/common/smack_access.cpp
similarity index 100%
rename from tests/common/smack_access.cpp
rename to src/common/smack_access.cpp
diff --git a/tests/common/smack_access.h b/src/common/smack_access.h
similarity index 100%
rename from tests/common/smack_access.h
rename to src/common/smack_access.h
diff --git a/tests/common/tests_common.cpp b/src/common/tests_common.cpp
similarity index 100%
rename from tests/common/tests_common.cpp
rename to src/common/tests_common.cpp
diff --git a/tests/common/tests_common.h b/src/common/tests_common.h
similarity index 100%
rename from tests/common/tests_common.h
rename to src/common/tests_common.h
diff --git a/tests/common/timeout.h b/src/common/timeout.h
similarity index 100%
rename from tests/common/timeout.h
rename to src/common/timeout.h
diff --git a/tests/cynara-tests/CMakeLists.txt b/src/cynara-tests/CMakeLists.txt
similarity index 53%
rename from tests/cynara-tests/CMakeLists.txt
rename to src/cynara-tests/CMakeLists.txt
index 98037dd..cde27fe 100644
--- a/tests/cynara-tests/CMakeLists.txt
+++ b/src/cynara-tests/CMakeLists.txt
@@ -31,23 +31,23 @@ PKG_CHECK_MODULES(CYNARA_TARGET_DEP
 
 #files to compile
 SET(CYNARA_TARGET_TEST_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_admin.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_agent.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_agent_request.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_agent_response.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_client.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_client_async_client.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_client_async_request_monitor.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_client_async_status_monitor.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_commons.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_cynara_mask.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_env.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_file_operations.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/plugins.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/cynara-test.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/test_cases.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/test_cases_async.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/test_cases_db.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_admin.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_agent.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_agent_request.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_agent_response.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_client.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_client_async_client.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_client_async_request_monitor.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_client_async_status_monitor.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_commons.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_cynara_mask.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_env.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_file_operations.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/plugins.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/cynara-test.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/test_cases.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/test_cases_async.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/test_cases_db.cpp
     )
 
 #header directories
@@ -56,9 +56,9 @@ INCLUDE_DIRECTORIES(SYSTEM
     )
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/
+    ${PROJECT_SOURCE_DIR}/src/common/
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/
     )
 
 
@@ -85,12 +85,12 @@ INSTALL(TARGETS ${CYNARA_TARGET_TEST}
     )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/WRT_test_for_cynara_rules.smack
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/WRT_test_for_cynara_rules.smack
     DESTINATION /usr/share/privilege-control/
 )
 
 INSTALL(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/db_patterns
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/db_patterns
     DESTINATION /etc/security-tests/
 )
 
diff --git a/tests/cynara-tests/WRT_test_for_cynara_rules.smack b/src/cynara-tests/WRT_test_for_cynara_rules.smack
similarity index 100%
rename from tests/cynara-tests/WRT_test_for_cynara_rules.smack
rename to src/cynara-tests/WRT_test_for_cynara_rules.smack
diff --git a/tests/cynara-tests/common/cynara_test_admin.cpp b/src/cynara-tests/common/cynara_test_admin.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_admin.cpp
rename to src/cynara-tests/common/cynara_test_admin.cpp
diff --git a/tests/cynara-tests/common/cynara_test_admin.h b/src/cynara-tests/common/cynara_test_admin.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_admin.h
rename to src/cynara-tests/common/cynara_test_admin.h
diff --git a/tests/cynara-tests/common/cynara_test_agent.cpp b/src/cynara-tests/common/cynara_test_agent.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_agent.cpp
rename to src/cynara-tests/common/cynara_test_agent.cpp
diff --git a/tests/cynara-tests/common/cynara_test_agent.h b/src/cynara-tests/common/cynara_test_agent.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_agent.h
rename to src/cynara-tests/common/cynara_test_agent.h
diff --git a/tests/cynara-tests/common/cynara_test_agent_request.cpp b/src/cynara-tests/common/cynara_test_agent_request.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_agent_request.cpp
rename to src/cynara-tests/common/cynara_test_agent_request.cpp
diff --git a/tests/cynara-tests/common/cynara_test_agent_request.h b/src/cynara-tests/common/cynara_test_agent_request.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_agent_request.h
rename to src/cynara-tests/common/cynara_test_agent_request.h
diff --git a/tests/cynara-tests/common/cynara_test_agent_response.cpp b/src/cynara-tests/common/cynara_test_agent_response.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_agent_response.cpp
rename to src/cynara-tests/common/cynara_test_agent_response.cpp
diff --git a/tests/cynara-tests/common/cynara_test_agent_response.h b/src/cynara-tests/common/cynara_test_agent_response.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_agent_response.h
rename to src/cynara-tests/common/cynara_test_agent_response.h
diff --git a/tests/cynara-tests/common/cynara_test_client.cpp b/src/cynara-tests/common/cynara_test_client.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client.cpp
rename to src/cynara-tests/common/cynara_test_client.cpp
diff --git a/tests/cynara-tests/common/cynara_test_client.h b/src/cynara-tests/common/cynara_test_client.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client.h
rename to src/cynara-tests/common/cynara_test_client.h
diff --git a/tests/cynara-tests/common/cynara_test_client_async_client.cpp b/src/cynara-tests/common/cynara_test_client_async_client.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client_async_client.cpp
rename to src/cynara-tests/common/cynara_test_client_async_client.cpp
diff --git a/tests/cynara-tests/common/cynara_test_client_async_client.h b/src/cynara-tests/common/cynara_test_client_async_client.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client_async_client.h
rename to src/cynara-tests/common/cynara_test_client_async_client.h
diff --git a/tests/cynara-tests/common/cynara_test_client_async_request_monitor.cpp b/src/cynara-tests/common/cynara_test_client_async_request_monitor.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client_async_request_monitor.cpp
rename to src/cynara-tests/common/cynara_test_client_async_request_monitor.cpp
diff --git a/tests/cynara-tests/common/cynara_test_client_async_request_monitor.h b/src/cynara-tests/common/cynara_test_client_async_request_monitor.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client_async_request_monitor.h
rename to src/cynara-tests/common/cynara_test_client_async_request_monitor.h
diff --git a/tests/cynara-tests/common/cynara_test_client_async_status_monitor.cpp b/src/cynara-tests/common/cynara_test_client_async_status_monitor.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client_async_status_monitor.cpp
rename to src/cynara-tests/common/cynara_test_client_async_status_monitor.cpp
diff --git a/tests/cynara-tests/common/cynara_test_client_async_status_monitor.h b/src/cynara-tests/common/cynara_test_client_async_status_monitor.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_client_async_status_monitor.h
rename to src/cynara-tests/common/cynara_test_client_async_status_monitor.h
diff --git a/tests/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_commons.cpp
rename to src/cynara-tests/common/cynara_test_commons.cpp
diff --git a/tests/cynara-tests/common/cynara_test_commons.h b/src/cynara-tests/common/cynara_test_commons.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_commons.h
rename to src/cynara-tests/common/cynara_test_commons.h
diff --git a/tests/cynara-tests/common/cynara_test_cynara_mask.cpp b/src/cynara-tests/common/cynara_test_cynara_mask.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_cynara_mask.cpp
rename to src/cynara-tests/common/cynara_test_cynara_mask.cpp
diff --git a/tests/cynara-tests/common/cynara_test_cynara_mask.h b/src/cynara-tests/common/cynara_test_cynara_mask.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_cynara_mask.h
rename to src/cynara-tests/common/cynara_test_cynara_mask.h
diff --git a/tests/cynara-tests/common/cynara_test_env.cpp b/src/cynara-tests/common/cynara_test_env.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_env.cpp
rename to src/cynara-tests/common/cynara_test_env.cpp
diff --git a/tests/cynara-tests/common/cynara_test_env.h b/src/cynara-tests/common/cynara_test_env.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_env.h
rename to src/cynara-tests/common/cynara_test_env.h
diff --git a/tests/cynara-tests/common/cynara_test_file_operations.cpp b/src/cynara-tests/common/cynara_test_file_operations.cpp
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_file_operations.cpp
rename to src/cynara-tests/common/cynara_test_file_operations.cpp
diff --git a/tests/cynara-tests/common/cynara_test_file_operations.h b/src/cynara-tests/common/cynara_test_file_operations.h
similarity index 100%
rename from tests/cynara-tests/common/cynara_test_file_operations.h
rename to src/cynara-tests/common/cynara_test_file_operations.h
diff --git a/tests/cynara-tests/cynara-test.cpp b/src/cynara-tests/cynara-test.cpp
similarity index 100%
rename from tests/cynara-tests/cynara-test.cpp
rename to src/cynara-tests/cynara-test.cpp
diff --git a/tests/cynara-tests/db_patterns/defaultAllowed/_ b/src/cynara-tests/db_patterns/default/_
similarity index 100%
rename from tests/cynara-tests/db_patterns/defaultAllowed/_
rename to src/cynara-tests/db_patterns/default/_
diff --git a/tests/cynara-tests/db_patterns/nonEmptyDatabase/buckets b/src/cynara-tests/db_patterns/default/buckets
similarity index 100%
rename from tests/cynara-tests/db_patterns/nonEmptyDatabase/buckets
rename to src/cynara-tests/db_patterns/default/buckets
diff --git a/tests/cynara-tests/db_patterns/default/_ b/src/cynara-tests/db_patterns/defaultAllowed/_
similarity index 100%
rename from tests/cynara-tests/db_patterns/default/_
rename to src/cynara-tests/db_patterns/defaultAllowed/_
diff --git a/tests/cynara-tests/db_patterns/defaultAllowed/buckets b/src/cynara-tests/db_patterns/defaultAllowed/buckets
similarity index 100%
rename from tests/cynara-tests/db_patterns/defaultAllowed/buckets
rename to src/cynara-tests/db_patterns/defaultAllowed/buckets
diff --git a/tests/cynara-tests/db_patterns/nonEmptyDatabase/_ b/src/cynara-tests/db_patterns/nonEmptyDatabase/_
similarity index 100%
rename from tests/cynara-tests/db_patterns/nonEmptyDatabase/_
rename to src/cynara-tests/db_patterns/nonEmptyDatabase/_
diff --git a/tests/cynara-tests/db_patterns/default/buckets b/src/cynara-tests/db_patterns/nonEmptyDatabase/buckets
similarity index 100%
rename from tests/cynara-tests/db_patterns/default/buckets
rename to src/cynara-tests/db_patterns/nonEmptyDatabase/buckets
diff --git a/tests/cynara-tests/plugins/BaseCynaraTestPlugin.h b/src/cynara-tests/plugins/BaseCynaraTestPlugin.h
similarity index 100%
rename from tests/cynara-tests/plugins/BaseCynaraTestPlugin.h
rename to src/cynara-tests/plugins/BaseCynaraTestPlugin.h
diff --git a/tests/cynara-tests/plugins/CMakeLists.txt b/src/cynara-tests/plugins/CMakeLists.txt
similarity index 100%
rename from tests/cynara-tests/plugins/CMakeLists.txt
rename to src/cynara-tests/plugins/CMakeLists.txt
diff --git a/tests/cynara-tests/plugins/multiple-policy/CMakeLists.txt b/src/cynara-tests/plugins/multiple-policy/CMakeLists.txt
similarity index 88%
rename from tests/cynara-tests/plugins/multiple-policy/CMakeLists.txt
rename to src/cynara-tests/plugins/multiple-policy/CMakeLists.txt
index 48ae2ae..a455a74 100644
--- a/tests/cynara-tests/plugins/multiple-policy/CMakeLists.txt
+++ b/src/cynara-tests/plugins/multiple-policy/CMakeLists.txt
@@ -29,12 +29,12 @@ PKG_CHECK_MODULES(CYNARA_TARGET_TEST_PLUGIN_MULTIPLE_POLICY_DEP
 
 INCLUDE_DIRECTORIES(
     ${CYNARA_TARGET_TEST_PLUGIN_MULTIPLE_POLICY_DEP_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/
     )
 
 SET(CYNARA_TARGET_TEST_PLUGIN_MULTIPLE_POLICY_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/multiple-policy/plugin.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/plugins.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/multiple-policy/plugin.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/plugins.cpp
     )
 
 ADD_DEFINITIONS("-fvisibility=default")
diff --git a/tests/cynara-tests/plugins/multiple-policy/plugin.cpp b/src/cynara-tests/plugins/multiple-policy/plugin.cpp
similarity index 100%
rename from tests/cynara-tests/plugins/multiple-policy/plugin.cpp
rename to src/cynara-tests/plugins/multiple-policy/plugin.cpp
diff --git a/tests/cynara-tests/plugins/plugins.cpp b/src/cynara-tests/plugins/plugins.cpp
similarity index 100%
rename from tests/cynara-tests/plugins/plugins.cpp
rename to src/cynara-tests/plugins/plugins.cpp
diff --git a/tests/cynara-tests/plugins/plugins.h b/src/cynara-tests/plugins/plugins.h
similarity index 100%
rename from tests/cynara-tests/plugins/plugins.h
rename to src/cynara-tests/plugins/plugins.h
diff --git a/tests/cynara-tests/plugins/single-policy/CMakeLists.txt b/src/cynara-tests/plugins/single-policy/CMakeLists.txt
similarity index 88%
rename from tests/cynara-tests/plugins/single-policy/CMakeLists.txt
rename to src/cynara-tests/plugins/single-policy/CMakeLists.txt
index 818f733..d0df3a8 100644
--- a/tests/cynara-tests/plugins/single-policy/CMakeLists.txt
+++ b/src/cynara-tests/plugins/single-policy/CMakeLists.txt
@@ -29,12 +29,12 @@ PKG_CHECK_MODULES(CYNARA_TARGET_TEST_PLUGIN_SINGLE_POLICY_DEP
 
 INCLUDE_DIRECTORIES(
     ${CYNARA_TARGET_TEST_PLUGIN_SINGLE_POLICY_DEP_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/
     )
 
 SET(CYNARA_TARGET_TEST_PLUGIN_SINGLE_POLICY_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/single-policy/plugin.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/plugins.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/single-policy/plugin.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/plugins.cpp
     )
 
 ADD_DEFINITIONS("-fvisibility=default")
diff --git a/tests/cynara-tests/plugins/single-policy/plugin.cpp b/src/cynara-tests/plugins/single-policy/plugin.cpp
similarity index 100%
rename from tests/cynara-tests/plugins/single-policy/plugin.cpp
rename to src/cynara-tests/plugins/single-policy/plugin.cpp
diff --git a/tests/cynara-tests/plugins/test-agent/CMakeLists.txt b/src/cynara-tests/plugins/test-agent/CMakeLists.txt
similarity index 88%
rename from tests/cynara-tests/plugins/test-agent/CMakeLists.txt
rename to src/cynara-tests/plugins/test-agent/CMakeLists.txt
index 6c179a0..799eb43 100644
--- a/tests/cynara-tests/plugins/test-agent/CMakeLists.txt
+++ b/src/cynara-tests/plugins/test-agent/CMakeLists.txt
@@ -29,12 +29,12 @@ PKG_CHECK_MODULES(CYNARA_TARGET_TEST_PLUGIN_TEST_AGENT_DEP
 
 INCLUDE_DIRECTORIES(
     ${CYNARA_TARGET_TEST_PLUGIN_TEST_AGENT_DEP_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/
     )
 
 SET(CYNARA_TARGET_TEST_PLUGIN_TEST_AGENT_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/test-agent/plugin.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/plugins.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/test-agent/plugin.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/plugins.cpp
     )
 
 ADD_DEFINITIONS("-fvisibility=default")
diff --git a/tests/cynara-tests/plugins/test-agent/plugin.cpp b/src/cynara-tests/plugins/test-agent/plugin.cpp
similarity index 100%
rename from tests/cynara-tests/plugins/test-agent/plugin.cpp
rename to src/cynara-tests/plugins/test-agent/plugin.cpp
diff --git a/tests/cynara-tests/test_cases.cpp b/src/cynara-tests/test_cases.cpp
similarity index 100%
rename from tests/cynara-tests/test_cases.cpp
rename to src/cynara-tests/test_cases.cpp
diff --git a/tests/cynara-tests/test_cases_async.cpp b/src/cynara-tests/test_cases_async.cpp
similarity index 100%
rename from tests/cynara-tests/test_cases_async.cpp
rename to src/cynara-tests/test_cases_async.cpp
diff --git a/tests/cynara-tests/test_cases_db.cpp b/src/cynara-tests/test_cases_db.cpp
similarity index 100%
rename from tests/cynara-tests/test_cases_db.cpp
rename to src/cynara-tests/test_cases_db.cpp
diff --git a/src/framework/config.cmake b/src/framework/config.cmake
new file mode 100644
index 0000000..8795839
--- /dev/null
+++ b/src/framework/config.cmake
@@ -0,0 +1,48 @@
+# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#
+# @file        config.cmake
+# @author      Lukasz Marek (l.marek@samsung.com)
+# @version     1.0
+# @brief
+#
+
+SET(DPL_FRAMEWORK_TEST_SOURCES
+    ${PROJECT_SOURCE_DIR}/src/framework/src/assert.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/atomic.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/binary_queue.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/colors.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/exception.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/gdbbacktrace.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/noncopyable.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/singleton.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/abstract_log_provider.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/dlog_log_provider.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/log.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/old_style_log_provider.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_results_collector.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_results_collector_commons.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_results_collector_console.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_results_collector_html.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_results_collector_summary.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_results_collector_xml.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_runner_child.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_runner.cpp
+    ${PROJECT_SOURCE_DIR}/src/framework/src/test_runner_multiprocess.cpp
+)
+
+SET(DPL_FRAMEWORK_TEST_INCLUDE_DIR
+    ${PROJECT_SOURCE_DIR}/src/framework/include
+)
diff --git a/tests/framework/include/dpl/abstract_input.h b/src/framework/include/dpl/abstract_input.h
similarity index 100%
rename from tests/framework/include/dpl/abstract_input.h
rename to src/framework/include/dpl/abstract_input.h
diff --git a/tests/framework/include/dpl/abstract_input_output.h b/src/framework/include/dpl/abstract_input_output.h
similarity index 100%
rename from tests/framework/include/dpl/abstract_input_output.h
rename to src/framework/include/dpl/abstract_input_output.h
diff --git a/tests/framework/include/dpl/abstract_output.h b/src/framework/include/dpl/abstract_output.h
similarity index 100%
rename from tests/framework/include/dpl/abstract_output.h
rename to src/framework/include/dpl/abstract_output.h
diff --git a/tests/framework/include/dpl/assert.h b/src/framework/include/dpl/assert.h
similarity index 100%
rename from tests/framework/include/dpl/assert.h
rename to src/framework/include/dpl/assert.h
diff --git a/tests/framework/include/dpl/atomic.h b/src/framework/include/dpl/atomic.h
similarity index 100%
rename from tests/framework/include/dpl/atomic.h
rename to src/framework/include/dpl/atomic.h
diff --git a/tests/framework/include/dpl/availability.h b/src/framework/include/dpl/availability.h
similarity index 100%
rename from tests/framework/include/dpl/availability.h
rename to src/framework/include/dpl/availability.h
diff --git a/tests/framework/include/dpl/binary_queue.h b/src/framework/include/dpl/binary_queue.h
similarity index 100%
rename from tests/framework/include/dpl/binary_queue.h
rename to src/framework/include/dpl/binary_queue.h
diff --git a/tests/framework/include/dpl/colors.h b/src/framework/include/dpl/colors.h
similarity index 100%
rename from tests/framework/include/dpl/colors.h
rename to src/framework/include/dpl/colors.h
diff --git a/tests/framework/include/dpl/exception.h b/src/framework/include/dpl/exception.h
similarity index 100%
rename from tests/framework/include/dpl/exception.h
rename to src/framework/include/dpl/exception.h
diff --git a/tests/framework/include/dpl/gdbbacktrace.h b/src/framework/include/dpl/gdbbacktrace.h
similarity index 100%
rename from tests/framework/include/dpl/gdbbacktrace.h
rename to src/framework/include/dpl/gdbbacktrace.h
diff --git a/tests/framework/include/dpl/log/abstract_log_provider.h b/src/framework/include/dpl/log/abstract_log_provider.h
similarity index 100%
rename from tests/framework/include/dpl/log/abstract_log_provider.h
rename to src/framework/include/dpl/log/abstract_log_provider.h
diff --git a/tests/framework/include/dpl/log/dlog_log_provider.h b/src/framework/include/dpl/log/dlog_log_provider.h
similarity index 100%
rename from tests/framework/include/dpl/log/dlog_log_provider.h
rename to src/framework/include/dpl/log/dlog_log_provider.h
diff --git a/tests/framework/include/dpl/log/log.h b/src/framework/include/dpl/log/log.h
similarity index 100%
rename from tests/framework/include/dpl/log/log.h
rename to src/framework/include/dpl/log/log.h
diff --git a/tests/framework/include/dpl/log/old_style_log_provider.h b/src/framework/include/dpl/log/old_style_log_provider.h
similarity index 100%
rename from tests/framework/include/dpl/log/old_style_log_provider.h
rename to src/framework/include/dpl/log/old_style_log_provider.h
diff --git a/tests/framework/include/dpl/log/secure_log.h b/src/framework/include/dpl/log/secure_log.h
similarity index 100%
rename from tests/framework/include/dpl/log/secure_log.h
rename to src/framework/include/dpl/log/secure_log.h
diff --git a/tests/framework/include/dpl/noncopyable.h b/src/framework/include/dpl/noncopyable.h
similarity index 100%
rename from tests/framework/include/dpl/noncopyable.h
rename to src/framework/include/dpl/noncopyable.h
diff --git a/tests/framework/include/dpl/noreturn.h b/src/framework/include/dpl/noreturn.h
similarity index 100%
rename from tests/framework/include/dpl/noreturn.h
rename to src/framework/include/dpl/noreturn.h
diff --git a/tests/framework/include/dpl/scoped_fclose.h b/src/framework/include/dpl/scoped_fclose.h
similarity index 100%
rename from tests/framework/include/dpl/scoped_fclose.h
rename to src/framework/include/dpl/scoped_fclose.h
diff --git a/tests/framework/include/dpl/scoped_free.h b/src/framework/include/dpl/scoped_free.h
similarity index 100%
rename from tests/framework/include/dpl/scoped_free.h
rename to src/framework/include/dpl/scoped_free.h
diff --git a/tests/framework/include/dpl/scoped_resource.h b/src/framework/include/dpl/scoped_resource.h
similarity index 100%
rename from tests/framework/include/dpl/scoped_resource.h
rename to src/framework/include/dpl/scoped_resource.h
diff --git a/tests/framework/include/dpl/singleton.h b/src/framework/include/dpl/singleton.h
similarity index 100%
rename from tests/framework/include/dpl/singleton.h
rename to src/framework/include/dpl/singleton.h
diff --git a/tests/framework/include/dpl/singleton_impl.h b/src/framework/include/dpl/singleton_impl.h
similarity index 100%
rename from tests/framework/include/dpl/singleton_impl.h
rename to src/framework/include/dpl/singleton_impl.h
diff --git a/tests/framework/include/dpl/singleton_safe_impl.h b/src/framework/include/dpl/singleton_safe_impl.h
similarity index 100%
rename from tests/framework/include/dpl/singleton_safe_impl.h
rename to src/framework/include/dpl/singleton_safe_impl.h
diff --git a/tests/framework/include/dpl/test/statistic.h b/src/framework/include/dpl/test/statistic.h
similarity index 100%
rename from tests/framework/include/dpl/test/statistic.h
rename to src/framework/include/dpl/test/statistic.h
diff --git a/tests/framework/include/dpl/test/test_results_collector.h b/src/framework/include/dpl/test/test_results_collector.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_results_collector.h
rename to src/framework/include/dpl/test/test_results_collector.h
diff --git a/tests/framework/include/dpl/test/test_results_collector_commons.h b/src/framework/include/dpl/test/test_results_collector_commons.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_results_collector_commons.h
rename to src/framework/include/dpl/test/test_results_collector_commons.h
diff --git a/tests/framework/include/dpl/test/test_results_collector_console.h b/src/framework/include/dpl/test/test_results_collector_console.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_results_collector_console.h
rename to src/framework/include/dpl/test/test_results_collector_console.h
diff --git a/tests/framework/include/dpl/test/test_results_collector_html.h b/src/framework/include/dpl/test/test_results_collector_html.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_results_collector_html.h
rename to src/framework/include/dpl/test/test_results_collector_html.h
diff --git a/tests/framework/include/dpl/test/test_results_collector_summary.h b/src/framework/include/dpl/test/test_results_collector_summary.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_results_collector_summary.h
rename to src/framework/include/dpl/test/test_results_collector_summary.h
diff --git a/tests/framework/include/dpl/test/test_results_collector_xml.h b/src/framework/include/dpl/test/test_results_collector_xml.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_results_collector_xml.h
rename to src/framework/include/dpl/test/test_results_collector_xml.h
diff --git a/tests/framework/include/dpl/test/test_runner.h b/src/framework/include/dpl/test/test_runner.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_runner.h
rename to src/framework/include/dpl/test/test_runner.h
diff --git a/tests/framework/include/dpl/test/test_runner_child.h b/src/framework/include/dpl/test/test_runner_child.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_runner_child.h
rename to src/framework/include/dpl/test/test_runner_child.h
diff --git a/tests/framework/include/dpl/test/test_runner_multiprocess.h b/src/framework/include/dpl/test/test_runner_multiprocess.h
similarity index 100%
rename from tests/framework/include/dpl/test/test_runner_multiprocess.h
rename to src/framework/include/dpl/test/test_runner_multiprocess.h
diff --git a/tests/framework/src/abstract_log_provider.cpp b/src/framework/src/abstract_log_provider.cpp
similarity index 100%
rename from tests/framework/src/abstract_log_provider.cpp
rename to src/framework/src/abstract_log_provider.cpp
diff --git a/tests/framework/src/assert.cpp b/src/framework/src/assert.cpp
similarity index 100%
rename from tests/framework/src/assert.cpp
rename to src/framework/src/assert.cpp
diff --git a/tests/framework/src/atomic.cpp b/src/framework/src/atomic.cpp
similarity index 100%
rename from tests/framework/src/atomic.cpp
rename to src/framework/src/atomic.cpp
diff --git a/tests/framework/src/binary_queue.cpp b/src/framework/src/binary_queue.cpp
similarity index 100%
rename from tests/framework/src/binary_queue.cpp
rename to src/framework/src/binary_queue.cpp
diff --git a/tests/framework/src/colors.cpp b/src/framework/src/colors.cpp
similarity index 100%
rename from tests/framework/src/colors.cpp
rename to src/framework/src/colors.cpp
diff --git a/tests/framework/src/dlog_log_provider.cpp b/src/framework/src/dlog_log_provider.cpp
similarity index 100%
rename from tests/framework/src/dlog_log_provider.cpp
rename to src/framework/src/dlog_log_provider.cpp
diff --git a/tests/framework/src/exception.cpp b/src/framework/src/exception.cpp
similarity index 100%
rename from tests/framework/src/exception.cpp
rename to src/framework/src/exception.cpp
diff --git a/tests/framework/src/gdbbacktrace.cpp b/src/framework/src/gdbbacktrace.cpp
similarity index 100%
rename from tests/framework/src/gdbbacktrace.cpp
rename to src/framework/src/gdbbacktrace.cpp
diff --git a/tests/framework/src/log.cpp b/src/framework/src/log.cpp
similarity index 100%
rename from tests/framework/src/log.cpp
rename to src/framework/src/log.cpp
diff --git a/tests/framework/src/noncopyable.cpp b/src/framework/src/noncopyable.cpp
similarity index 100%
rename from tests/framework/src/noncopyable.cpp
rename to src/framework/src/noncopyable.cpp
diff --git a/tests/framework/src/old_style_log_provider.cpp b/src/framework/src/old_style_log_provider.cpp
similarity index 100%
rename from tests/framework/src/old_style_log_provider.cpp
rename to src/framework/src/old_style_log_provider.cpp
diff --git a/tests/framework/src/singleton.cpp b/src/framework/src/singleton.cpp
similarity index 100%
rename from tests/framework/src/singleton.cpp
rename to src/framework/src/singleton.cpp
diff --git a/tests/framework/src/test_results_collector.cpp b/src/framework/src/test_results_collector.cpp
similarity index 100%
rename from tests/framework/src/test_results_collector.cpp
rename to src/framework/src/test_results_collector.cpp
diff --git a/tests/framework/src/test_results_collector_commons.cpp b/src/framework/src/test_results_collector_commons.cpp
similarity index 100%
rename from tests/framework/src/test_results_collector_commons.cpp
rename to src/framework/src/test_results_collector_commons.cpp
diff --git a/tests/framework/src/test_results_collector_console.cpp b/src/framework/src/test_results_collector_console.cpp
similarity index 100%
rename from tests/framework/src/test_results_collector_console.cpp
rename to src/framework/src/test_results_collector_console.cpp
diff --git a/tests/framework/src/test_results_collector_html.cpp b/src/framework/src/test_results_collector_html.cpp
similarity index 100%
rename from tests/framework/src/test_results_collector_html.cpp
rename to src/framework/src/test_results_collector_html.cpp
diff --git a/tests/framework/src/test_results_collector_summary.cpp b/src/framework/src/test_results_collector_summary.cpp
similarity index 100%
rename from tests/framework/src/test_results_collector_summary.cpp
rename to src/framework/src/test_results_collector_summary.cpp
diff --git a/tests/framework/src/test_results_collector_xml.cpp b/src/framework/src/test_results_collector_xml.cpp
similarity index 100%
rename from tests/framework/src/test_results_collector_xml.cpp
rename to src/framework/src/test_results_collector_xml.cpp
diff --git a/tests/framework/src/test_runner.cpp b/src/framework/src/test_runner.cpp
similarity index 100%
rename from tests/framework/src/test_runner.cpp
rename to src/framework/src/test_runner.cpp
diff --git a/tests/framework/src/test_runner_child.cpp b/src/framework/src/test_runner_child.cpp
similarity index 100%
rename from tests/framework/src/test_runner_child.cpp
rename to src/framework/src/test_runner_child.cpp
diff --git a/tests/framework/src/test_runner_multiprocess.cpp b/src/framework/src/test_runner_multiprocess.cpp
similarity index 100%
rename from tests/framework/src/test_runner_multiprocess.cpp
rename to src/framework/src/test_runner_multiprocess.cpp
diff --git a/tests/libprivilege-control-tests/CMakeLists.txt b/src/libprivilege-control-tests/CMakeLists.txt
similarity index 64%
rename from tests/libprivilege-control-tests/CMakeLists.txt
rename to src/libprivilege-control-tests/CMakeLists.txt
index 7a6e956..436731d 100644
--- a/tests/libprivilege-control-tests/CMakeLists.txt
+++ b/src/libprivilege-control-tests/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(TEST_APP_EFL "test-app-efl")
 SET(TEST_APP_WGT "test-app-wgt")
 SET(TEST_APP_OSP "test-app-osp")
 SET(HELLO_TIZEN_TEST_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/hello-tizen.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/hello-tizen.cpp
     )
 ADD_EXECUTABLE( ${TEST_APP_EFL} ${HELLO_TIZEN_TEST_SOURCES} )
 INSTALL(TARGETS ${TEST_APP_EFL}
@@ -69,14 +69,14 @@ PKG_CHECK_MODULES(LPC_TARGET_DEP
 
 #files to compile
 SET(LPC_TARGET_TEST_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/db.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/duplicates.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/libprivilege-control-test.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/test_cases.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/test_cases_nosmack.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/test_cases_incorrect_params.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/test_cases_stress.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/common/db.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/common/duplicates.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/libprivilege-control-test.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/test_cases.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/test_cases_nosmack.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/test_cases_incorrect_params.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/test_cases_stress.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/libprivilege-control_test_common.cpp
     )
 
 #header directories
@@ -85,8 +85,8 @@ INCLUDE_DIRECTORIES(SYSTEM
     )
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/common/
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/common/
     )
 
 #preprocessor definitions
@@ -117,57 +117,57 @@ INSTALL(TARGETS ${LPC_TARGET_TEST}
 
 # Test SMACK rules
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules1.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/WRT_test_privilege_control_rules1.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules2.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/WRT_test_privilege_control_rules2.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules2_no_r.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/WRT_test_privilege_control_rules2_no_r.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules2_r.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/WRT_test_privilege_control_rules2_r.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/test_privilege_control_DIR
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/test_privilege_control_DIR
     DESTINATION /etc/smack/
 )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.dac
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.dac
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.dac
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.dac
     DESTINATION /usr/share/privilege-control/
   )
 
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.smack
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.smack
     DESTINATION /usr/share/privilege-control/
   )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.dac
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.dac
     DESTINATION /usr/share/privilege-control/
   )
diff --git a/tests/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.dac b/src/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.dac
similarity index 100%
rename from tests/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.dac
rename to src/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.dac
diff --git a/tests/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.smack b/src/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.smack
similarity index 100%
rename from tests/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.smack
rename to src/libprivilege-control-tests/EFL_test_privilege_control_rules_efl.smack
diff --git a/tests/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.dac b/src/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.dac
similarity index 100%
rename from tests/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.dac
rename to src/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.dac
diff --git a/tests/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.smack b/src/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.smack
similarity index 100%
rename from tests/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.smack
rename to src/libprivilege-control-tests/OSP_test_privilege_control_rules_osp.smack
diff --git a/tests/libprivilege-control-tests/WRT_test_privilege_control_rules1.smack b/src/libprivilege-control-tests/WRT_test_privilege_control_rules1.smack
similarity index 100%
rename from tests/libprivilege-control-tests/WRT_test_privilege_control_rules1.smack
rename to src/libprivilege-control-tests/WRT_test_privilege_control_rules1.smack
diff --git a/tests/libprivilege-control-tests/WRT_test_privilege_control_rules2.smack b/src/libprivilege-control-tests/WRT_test_privilege_control_rules2.smack
similarity index 100%
rename from tests/libprivilege-control-tests/WRT_test_privilege_control_rules2.smack
rename to src/libprivilege-control-tests/WRT_test_privilege_control_rules2.smack
diff --git a/tests/libprivilege-control-tests/WRT_test_privilege_control_rules2_no_r.smack b/src/libprivilege-control-tests/WRT_test_privilege_control_rules2_no_r.smack
similarity index 100%
rename from tests/libprivilege-control-tests/WRT_test_privilege_control_rules2_no_r.smack
rename to src/libprivilege-control-tests/WRT_test_privilege_control_rules2_no_r.smack
diff --git a/tests/libprivilege-control-tests/WRT_test_privilege_control_rules2_r.smack b/src/libprivilege-control-tests/WRT_test_privilege_control_rules2_r.smack
similarity index 100%
rename from tests/libprivilege-control-tests/WRT_test_privilege_control_rules2_r.smack
rename to src/libprivilege-control-tests/WRT_test_privilege_control_rules2_r.smack
diff --git a/tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.dac b/src/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.dac
similarity index 100%
rename from tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.dac
rename to src/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.dac
diff --git a/tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack b/src/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack
similarity index 100%
rename from tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack
rename to src/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack
diff --git a/tests/libprivilege-control-tests/common/db.cpp b/src/libprivilege-control-tests/common/db.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/common/db.cpp
rename to src/libprivilege-control-tests/common/db.cpp
diff --git a/tests/libprivilege-control-tests/common/db.h b/src/libprivilege-control-tests/common/db.h
similarity index 100%
rename from tests/libprivilege-control-tests/common/db.h
rename to src/libprivilege-control-tests/common/db.h
diff --git a/tests/libprivilege-control-tests/common/duplicates.cpp b/src/libprivilege-control-tests/common/duplicates.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/common/duplicates.cpp
rename to src/libprivilege-control-tests/common/duplicates.cpp
diff --git a/tests/libprivilege-control-tests/common/duplicates.h b/src/libprivilege-control-tests/common/duplicates.h
similarity index 100%
rename from tests/libprivilege-control-tests/common/duplicates.h
rename to src/libprivilege-control-tests/common/duplicates.h
diff --git a/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h b/src/libprivilege-control-tests/common/libprivilege-control_test_common.h
similarity index 100%
rename from tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
rename to src/libprivilege-control-tests/common/libprivilege-control_test_common.h
diff --git a/tests/libprivilege-control-tests/hello-tizen.cpp b/src/libprivilege-control-tests/hello-tizen.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/hello-tizen.cpp
rename to src/libprivilege-control-tests/hello-tizen.cpp
diff --git a/tests/libprivilege-control-tests/libprivilege-control-test.cpp b/src/libprivilege-control-tests/libprivilege-control-test.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/libprivilege-control-test.cpp
rename to src/libprivilege-control-tests/libprivilege-control-test.cpp
diff --git a/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp b/src/libprivilege-control-tests/libprivilege-control_test_common.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
rename to src/libprivilege-control-tests/libprivilege-control_test_common.cpp
diff --git a/tests/libprivilege-control-tests/test_cases.cpp b/src/libprivilege-control-tests/test_cases.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/test_cases.cpp
rename to src/libprivilege-control-tests/test_cases.cpp
diff --git a/tests/libprivilege-control-tests/test_cases_incorrect_params.cpp b/src/libprivilege-control-tests/test_cases_incorrect_params.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/test_cases_incorrect_params.cpp
rename to src/libprivilege-control-tests/test_cases_incorrect_params.cpp
diff --git a/tests/libprivilege-control-tests/test_cases_nosmack.cpp b/src/libprivilege-control-tests/test_cases_nosmack.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/test_cases_nosmack.cpp
rename to src/libprivilege-control-tests/test_cases_nosmack.cpp
diff --git a/tests/libprivilege-control-tests/test_cases_stress.cpp b/src/libprivilege-control-tests/test_cases_stress.cpp
similarity index 100%
rename from tests/libprivilege-control-tests/test_cases_stress.cpp
rename to src/libprivilege-control-tests/test_cases_stress.cpp
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/cycle b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/cycle
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/cycle
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/cycle
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/cycle b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/cycle
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/cycle
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/cycle
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/cycle b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/cycle
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/cycle
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/cycle
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_dir b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_dir
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_dir
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_dir
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_file b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_file
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_file
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/non_app_file
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_dir b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_dir
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_dir
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_dir
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_file b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_file
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_file
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/non_app_file
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/link_to_exec b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/link_to_exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/link_to_exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/link_to_exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_dir b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_dir
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_dir
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_dir
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_file b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_file
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_file
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/non_app_file
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/app_dir/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec b/src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
rename to src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal b/src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
rename to src/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP b/src/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP
rename to src/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP_REAL b/src/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP_REAL
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP_REAL
rename to src/libprivilege-control-tests/test_privilege_control_DIR/test_set_app_privilege/test_APP_REAL
diff --git a/tests/libsmack-tests/CMakeLists.txt b/src/libsmack-tests/CMakeLists.txt
similarity index 82%
rename from tests/libsmack-tests/CMakeLists.txt
rename to src/libsmack-tests/CMakeLists.txt
index 799d19b..7c5e75e 100644
--- a/tests/libsmack-tests/CMakeLists.txt
+++ b/src/libsmack-tests/CMakeLists.txt
@@ -28,8 +28,8 @@ PKG_CHECK_MODULES(TARGET_DEP
 
 #files to compile
 SET(TARGET_TEST_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/libsmack-test.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/test_cases.cpp
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/libsmack-test.cpp
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/test_cases.cpp
     )
 
 #header directories
@@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES(SYSTEM
     )
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/common/
+    ${PROJECT_SOURCE_DIR}/src/common/
     )
 
 #preprocessor definitions
@@ -68,7 +68,7 @@ INSTALL(TARGETS ${TARGET_TEST}
 
 #place for additional files
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/test_smack_rules
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/test_smack_rules
     DESTINATION /etc/smack
     PERMISSIONS
     OWNER_READ
@@ -81,7 +81,7 @@ INSTALL(FILES
 
 #place for full rules
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/test_smack_rules_full
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/test_smack_rules_full
     DESTINATION /etc/smack
     PERMISSIONS
     OWNER_READ
@@ -91,7 +91,7 @@ INSTALL(FILES
 
 #place for rules2
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/test_smack_rules2
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/test_smack_rules2
     DESTINATION /etc/smack
     PERMISSIONS
     OWNER_READ
@@ -101,7 +101,7 @@ INSTALL(FILES
 
 #place for rules3
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/test_smack_rules3
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/test_smack_rules3
     DESTINATION /etc/smack
     PERMISSIONS
     OWNER_READ
@@ -111,7 +111,7 @@ INSTALL(FILES
 
 #place for rules4
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libsmack-tests/test_smack_rules4
+    ${PROJECT_SOURCE_DIR}/src/libsmack-tests/test_smack_rules4
     DESTINATION /etc/smack
     PERMISSIONS
     OWNER_READ
diff --git a/tests/libsmack-tests/libsmack-test.cpp b/src/libsmack-tests/libsmack-test.cpp
similarity index 100%
rename from tests/libsmack-tests/libsmack-test.cpp
rename to src/libsmack-tests/libsmack-test.cpp
diff --git a/tests/libsmack-tests/test_cases.cpp b/src/libsmack-tests/test_cases.cpp
similarity index 100%
rename from tests/libsmack-tests/test_cases.cpp
rename to src/libsmack-tests/test_cases.cpp
diff --git a/tests/libsmack-tests/test_smack_rules b/src/libsmack-tests/test_smack_rules
similarity index 100%
rename from tests/libsmack-tests/test_smack_rules
rename to src/libsmack-tests/test_smack_rules
diff --git a/tests/libsmack-tests/test_smack_rules2 b/src/libsmack-tests/test_smack_rules2
similarity index 100%
rename from tests/libsmack-tests/test_smack_rules2
rename to src/libsmack-tests/test_smack_rules2
diff --git a/tests/libsmack-tests/test_smack_rules3 b/src/libsmack-tests/test_smack_rules3
similarity index 100%
rename from tests/libsmack-tests/test_smack_rules3
rename to src/libsmack-tests/test_smack_rules3
diff --git a/tests/libsmack-tests/test_smack_rules4 b/src/libsmack-tests/test_smack_rules4
similarity index 100%
rename from tests/libsmack-tests/test_smack_rules4
rename to src/libsmack-tests/test_smack_rules4
diff --git a/tests/libsmack-tests/test_smack_rules_full b/src/libsmack-tests/test_smack_rules_full
similarity index 100%
rename from tests/libsmack-tests/test_smack_rules_full
rename to src/libsmack-tests/test_smack_rules_full
diff --git a/tests/security-manager-tests/CMakeLists.txt b/src/security-manager-tests/CMakeLists.txt
similarity index 69%
rename from tests/security-manager-tests/CMakeLists.txt
rename to src/security-manager-tests/CMakeLists.txt
index 9392c3e..c889e33 100644
--- a/tests/security-manager-tests/CMakeLists.txt
+++ b/src/security-manager-tests/CMakeLists.txt
@@ -35,10 +35,10 @@ PKG_CHECK_MODULES(SEC_MGR_TESTS_DEP
 SET(TARGET_SEC_MGR_TESTS "security-manager-tests")
 
 SET(SEC_MGR_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/security_manager_tests.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/sm_db.cpp
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_client.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/security_manager_tests.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_db.cpp
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_client.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/libprivilege-control_test_common.cpp
    )
 
 INCLUDE_DIRECTORIES(SYSTEM
@@ -50,10 +50,10 @@ INCLUDE_DIRECTORIES(SYSTEM
     )
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/common/
+    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/common/
    )
 
 ADD_EXECUTABLE(${TARGET_SEC_MGR_TESTS} ${SEC_MGR_SOURCES})
@@ -67,11 +67,11 @@ TARGET_LINK_LIBRARIES(${TARGET_SEC_MGR_TESTS}
 INSTALL(TARGETS ${TARGET_SEC_MGR_TESTS} DESTINATION /usr/bin)
 
 INSTALL(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/test_DIR
+    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/test_DIR
     DESTINATION /usr/apps/
 )
 
 INSTALL(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/test_DIR
+    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/test_DIR
     DESTINATION /home/${APP_USER}/
 )
diff --git a/tests/security-manager-tests/common/sm_db.cpp b/src/security-manager-tests/common/sm_db.cpp
similarity index 100%
rename from tests/security-manager-tests/common/sm_db.cpp
rename to src/security-manager-tests/common/sm_db.cpp
diff --git a/tests/security-manager-tests/common/sm_db.h b/src/security-manager-tests/common/sm_db.h
similarity index 100%
rename from tests/security-manager-tests/common/sm_db.h
rename to src/security-manager-tests/common/sm_db.h
diff --git a/tests/security-manager-tests/security_manager_tests.cpp b/src/security-manager-tests/security_manager_tests.cpp
similarity index 100%
rename from tests/security-manager-tests/security_manager_tests.cpp
rename to src/security-manager-tests/security_manager_tests.cpp
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec b/src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal b/src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/exec b/src/security-manager-tests/test_DIR/app_dir/.level_1/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/exec
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec b/src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal b/src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec b/src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal b/src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal b/src/security-manager-tests/test_DIR/app_dir/.level_1/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
rename to src/security-manager-tests/test_DIR/app_dir/.level_1/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec b/src/security-manager-tests/test_DIR/app_dir/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
rename to src/security-manager-tests/test_DIR/app_dir/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec b/src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal b/src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec b/src/security-manager-tests/test_DIR/app_dir/level_1/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/exec b/src/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec b/src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec b/src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal b/src/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec b/src/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec b/src/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
rename to src/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/normal b/src/security-manager-tests/test_DIR/app_dir/level_1/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/normal
rename to src/security-manager-tests/test_DIR/app_dir/level_1/normal
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec b/src/security-manager-tests/test_DIR/app_dir/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
rename to src/security-manager-tests/test_DIR/app_dir/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir b/src/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
rename to src/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec b/src/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
rename to src/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal b/src/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
rename to src/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec b/src/security-manager-tests/test_DIR/app_dir/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
rename to src/security-manager-tests/test_DIR/app_dir/link_to_non_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/normal b/src/security-manager-tests/test_DIR/app_dir/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/normal
rename to src/security-manager-tests/test_DIR/app_dir/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir b/src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec b/src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/normal b/src/security-manager-tests/test_DIR/app_dir_public_ro/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/non_app_dir/non_app_subdir/normal
rename to src/security-manager-tests/test_DIR/app_dir_public_ro/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/exec b/src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/normal b/src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/exec b/src/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/exec b/src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/normal b/src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/normal b/src/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/level_2/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/exec b/src/security-manager-tests/test_DIR/non_app_dir/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/normal b/src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/level_1/.level_2/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/link_to_exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/normal b/src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec b/src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/normal b/src/security-manager-tests/test_DIR/non_app_dir/level_1/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/level_2/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/level_1/normal
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec b/src/security-manager-tests/test_DIR/non_app_dir/link_to_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
rename to src/security-manager-tests/test_DIR/non_app_dir/link_to_exec
diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec b/src/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
similarity index 100%
rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
rename to src/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
diff --git a/tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/normal b/src/security-manager-tests/test_DIR/non_app_dir/normal
similarity index 100%
rename from tests/libprivilege-control-tests/test_privilege_control_DIR/app_dir/.level_1/.level_2/normal
rename to src/security-manager-tests/test_DIR/non_app_dir/normal
diff --git a/tests/security-server-tests/CMakeLists.txt b/src/security-server-tests/CMakeLists.txt
similarity index 72%
rename from tests/security-server-tests/CMakeLists.txt
rename to src/security-server-tests/CMakeLists.txt
index cbf6247..ab4b3ca 100644
--- a/tests/security-server-tests/CMakeLists.txt
+++ b/src/security-server-tests/CMakeLists.txt
@@ -45,42 +45,42 @@ SET(TARGET_SEC_SRV_MEASURER "security-server-tests-api-speed")
 # Sources definition
 
 SET(SEC_SRV_COMMON_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/common/security_server_tests_common.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/common/security_server_tests_common.cpp
    )
 
 SET(SEC_SRV_CLIENT_SMACK_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_tests_client_smack.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_mockup.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_tests_client_smack.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_mockup.cpp
    )
 
 SET(SEC_SRV_TC_SERVER_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/server.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/cookie_api.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/weird_arguments.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_clean_env.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/server.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/cookie_api.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/weird_arguments.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_clean_env.cpp
    )
 
 SET(SEC_SRV_PWD_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_tests_password.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_clean_env.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_tests_password.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_clean_env.cpp
    )
 
 SET(SEC_SRV_PRIVILEGE_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_tests_privilege.cpp
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_tests_privilege.cpp
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/libprivilege-control_test_common.cpp
    )
 
 SET(SEC_SRV_STRESS_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_tests_stress.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_tests_stress.cpp
    )
 
 SET(SEC_SRV_MT_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_tests_mt.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_tests_mt.cpp
    )
 
 SET(SEC_SRV_MEASURER_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_measurer_API_speed.cpp
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/security_server_mockup.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_measurer_API_speed.cpp
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/security_server_mockup.cpp
    )
 
 INCLUDE_DIRECTORIES(SYSTEM
@@ -88,9 +88,9 @@ INCLUDE_DIRECTORIES(SYSTEM
    )
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/common/
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/common/
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/common/
+    ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/common/
    )
 
 #LINK_DIRECTORIES(${SEC_SRV_PKGS_LIBRARY_DIRS})
@@ -161,11 +161,11 @@ INSTALL(TARGETS ${TARGET_SEC_SRV_MT_TESTS} DESTINATION /usr/bin)
 INSTALL(TARGETS ${TARGET_SEC_SRV_MEASURER} DESTINATION /usr/bin)
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/WRT_sstp_test_rules1.smack
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/WRT_sstp_test_rules1.smack
     DESTINATION /usr/share/privilege-control/
 )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/security-server-tests/WRT_sstp_test_rules2.smack
+    ${PROJECT_SOURCE_DIR}/src/security-server-tests/WRT_sstp_test_rules2.smack
     DESTINATION /usr/share/privilege-control/
 )
diff --git a/tests/security-server-tests/WRT_sstp_test_rules1.smack b/src/security-server-tests/WRT_sstp_test_rules1.smack
similarity index 100%
rename from tests/security-server-tests/WRT_sstp_test_rules1.smack
rename to src/security-server-tests/WRT_sstp_test_rules1.smack
diff --git a/tests/security-server-tests/WRT_sstp_test_rules2.smack b/src/security-server-tests/WRT_sstp_test_rules2.smack
similarity index 100%
rename from tests/security-server-tests/WRT_sstp_test_rules2.smack
rename to src/security-server-tests/WRT_sstp_test_rules2.smack
diff --git a/tests/security-server-tests/common/security_server_tests_common.cpp b/src/security-server-tests/common/security_server_tests_common.cpp
similarity index 100%
rename from tests/security-server-tests/common/security_server_tests_common.cpp
rename to src/security-server-tests/common/security_server_tests_common.cpp
diff --git a/tests/security-server-tests/common/security_server_tests_common.h b/src/security-server-tests/common/security_server_tests_common.h
similarity index 100%
rename from tests/security-server-tests/common/security_server_tests_common.h
rename to src/security-server-tests/common/security_server_tests_common.h
diff --git a/tests/security-server-tests/cookie_api.cpp b/src/security-server-tests/cookie_api.cpp
similarity index 100%
rename from tests/security-server-tests/cookie_api.cpp
rename to src/security-server-tests/cookie_api.cpp
diff --git a/tests/security-server-tests/security_server_clean_env.cpp b/src/security-server-tests/security_server_clean_env.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_clean_env.cpp
rename to src/security-server-tests/security_server_clean_env.cpp
diff --git a/tests/security-server-tests/security_server_clean_env.h b/src/security-server-tests/security_server_clean_env.h
similarity index 100%
rename from tests/security-server-tests/security_server_clean_env.h
rename to src/security-server-tests/security_server_clean_env.h
diff --git a/tests/security-server-tests/security_server_measurer_API_speed.cpp b/src/security-server-tests/security_server_measurer_API_speed.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_measurer_API_speed.cpp
rename to src/security-server-tests/security_server_measurer_API_speed.cpp
diff --git a/tests/security-server-tests/security_server_mockup.cpp b/src/security-server-tests/security_server_mockup.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_mockup.cpp
rename to src/security-server-tests/security_server_mockup.cpp
diff --git a/tests/security-server-tests/security_server_mockup.h b/src/security-server-tests/security_server_mockup.h
similarity index 100%
rename from tests/security-server-tests/security_server_mockup.h
rename to src/security-server-tests/security_server_mockup.h
diff --git a/tests/security-server-tests/security_server_tests_client_smack.cpp b/src/security-server-tests/security_server_tests_client_smack.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_tests_client_smack.cpp
rename to src/security-server-tests/security_server_tests_client_smack.cpp
diff --git a/tests/security-server-tests/security_server_tests_mt.cpp b/src/security-server-tests/security_server_tests_mt.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_tests_mt.cpp
rename to src/security-server-tests/security_server_tests_mt.cpp
diff --git a/tests/security-server-tests/security_server_tests_password.cpp b/src/security-server-tests/security_server_tests_password.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_tests_password.cpp
rename to src/security-server-tests/security_server_tests_password.cpp
diff --git a/tests/security-server-tests/security_server_tests_privilege.cpp b/src/security-server-tests/security_server_tests_privilege.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_tests_privilege.cpp
rename to src/security-server-tests/security_server_tests_privilege.cpp
diff --git a/tests/security-server-tests/security_server_tests_stress.cpp b/src/security-server-tests/security_server_tests_stress.cpp
similarity index 100%
rename from tests/security-server-tests/security_server_tests_stress.cpp
rename to src/security-server-tests/security_server_tests_stress.cpp
diff --git a/tests/security-server-tests/server.cpp b/src/security-server-tests/server.cpp
similarity index 100%
rename from tests/security-server-tests/server.cpp
rename to src/security-server-tests/server.cpp
diff --git a/tests/security-server-tests/weird_arguments.cpp b/src/security-server-tests/weird_arguments.cpp
similarity index 100%
rename from tests/security-server-tests/weird_arguments.cpp
rename to src/security-server-tests/weird_arguments.cpp
diff --git a/tests/security-tests-all.sh b/src/security-tests-all.sh
similarity index 100%
rename from tests/security-tests-all.sh
rename to src/security-tests-all.sh
diff --git a/tests/security-tests.sh b/src/security-tests.sh
similarity index 100%
rename from tests/security-tests.sh
rename to src/security-tests.sh
diff --git a/tests/smack-dbus-tests/CMakeLists.txt b/src/smack-dbus-tests/CMakeLists.txt
similarity index 92%
rename from tests/smack-dbus-tests/CMakeLists.txt
rename to src/smack-dbus-tests/CMakeLists.txt
index 6e283c6..22a49cc 100644
--- a/tests/smack-dbus-tests/CMakeLists.txt
+++ b/src/smack-dbus-tests/CMakeLists.txt
@@ -37,11 +37,11 @@ SET(TARGET_SMACK_DBUS_TESTS "smack-dbus-tests")
 # Sources definition
 
 SET(SMACK_DBUS_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/smack-dbus-tests/smack_dbus_tests.cpp
+    ${PROJECT_SOURCE_DIR}/src/smack-dbus-tests/smack_dbus_tests.cpp
    )
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/common/
+    ${PROJECT_SOURCE_DIR}/src/common/
    )
 
 ADD_EXECUTABLE(${TARGET_SMACK_DBUS_TESTS} ${SMACK_DBUS_SOURCES})
diff --git a/tests/smack-dbus-tests/smack_dbus_tests.cpp b/src/smack-dbus-tests/smack_dbus_tests.cpp
similarity index 100%
rename from tests/smack-dbus-tests/smack_dbus_tests.cpp
rename to src/smack-dbus-tests/smack_dbus_tests.cpp
diff --git a/tests/test-performance-check.sh b/src/test-performance-check.sh
similarity index 100%
rename from tests/test-performance-check.sh
rename to src/test-performance-check.sh
diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt
deleted file mode 100644
index 141cbf7..0000000
--- a/tests/common/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-INCLUDE(FindPkgConfig)
-
-#dependencies
-PKG_CHECK_MODULES(COMMON_TARGET_DEP
-    libsmack
-    dbus-1
-    sqlite3
-    REQUIRED
-    )
-
-#files to compile
-SET(COMMON_TARGET_TEST_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/common/tests_common.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/access_provider.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/smack_access.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/dbus_connection.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/dbus_message_in.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/dbus_message_out.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/service_manager.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/memory.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/db_sqlite.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/fs_label_manager.cpp
-    )
-
-#system and local includes
-INCLUDE_DIRECTORIES(SYSTEM ${COMMON_TARGET_DEP_INCLUDE_DIRS})
-
-INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/tests/framework/include
-    ${PROJECT_SOURCE_DIR}/tests/common
-    )
-
-
-#output OBJECT format
-ADD_LIBRARY(${COMMON_TARGET_TEST} ${COMMON_TARGET_TEST_SOURCES})
-
-TARGET_LINK_LIBRARIES(${COMMON_TARGET_TEST} ${COMMON_TARGET_DEP_LIBRARIES}
-    dpl-test-framework)
-
-INSTALL (FILES ${PROJECT_SOURCE_DIR}/tests/common/security-tests.conf DESTINATION /etc/dbus-1/system.d)
diff --git a/tests/framework/config.cmake b/tests/framework/config.cmake
deleted file mode 100644
index a2cb0ff..0000000
--- a/tests/framework/config.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-#
-# @file        config.cmake
-# @author      Lukasz Marek (l.marek@samsung.com)
-# @version     1.0
-# @brief
-#
-
-SET(DPL_FRAMEWORK_TEST_SOURCES
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/assert.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/atomic.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/binary_queue.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/colors.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/exception.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/gdbbacktrace.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/noncopyable.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/singleton.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/abstract_log_provider.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/dlog_log_provider.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/log.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/old_style_log_provider.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_results_collector.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_results_collector_commons.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_results_collector_console.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_results_collector_html.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_results_collector_summary.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_results_collector_xml.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_runner_child.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_runner.cpp
-    ${PROJECT_SOURCE_DIR}/tests/framework/src/test_runner_multiprocess.cpp
-)
-
-SET(DPL_FRAMEWORK_TEST_INCLUDE_DIR
-    ${PROJECT_SOURCE_DIR}/tests/framework/include
-)