From 0367e11eabfd3d8163311ead0e1481e443b51c31 Mon Sep 17 00:00:00 2001
From: Sangwan Kwon <sangwan.kwon@samsung.com>
Date: Thu, 7 Nov 2019 14:16:12 +0900
Subject: [PATCH] Rename file extension from .h to .hpp

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>
---
 AUTHORS                                       | 13 +++++++++++
 plugins/bluetooth/bluetooth.cpp               |  4 ++--
 plugins/wifi/wifi.cpp                         |  4 ++--
 src/osquery/tables/tizen/policy.cpp           |  4 ++--
 src/osquery/tables/tizen/policy_admin.cpp     |  4 ++--
 .../tests/{policy_tests.cpp => policy.cpp}    |  2 +-
 src/vist/CMakeLists.txt                       |  4 +++-
 src/vist/client/query.cpp                     |  6 ++---
 src/vist/client/{query.h => query.hpp}        |  0
 .../client/schema/{policy.h => policy.hpp}    |  7 ------
 .../schema/{processes.h => processes.hpp}     |  7 ------
 src/vist/client/schema/{time.h => time.hpp}   |  7 ------
 .../tests/{client-tests.cpp => client.cpp}    |  6 ++---
 ...tual-table-tests.cpp => virtual-table.cpp} | 18 +++++++--------
 src/vist/client/virtual-table.cpp             | 22 +++++++------------
 .../{virtual-table.h => virtual-table.hpp}    |  0
 src/vist/common/CMakeLists.txt                | 16 --------------
 .../{common/exception.h => exception.hpp}     |  3 ---
 .../{common/ipc/client.h => ipc/client.hpp}   |  0
 .../{common/ipc/server.h => ipc/server.hpp}   |  0
 .../tests/ipc_tests.cpp => ipc/tests/ipc.cpp} |  4 ++--
 .../{common/audit/logger.h => logger.hpp}     |  4 ++--
 src/vist/main/main.cpp                        |  8 +++----
 src/vist/main/tests.cpp                       | 20 +++++++++++++++--
 src/vist/notification/notification.cpp        |  7 +-----
 .../{notification.h => notification.hpp}      |  7 ------
 ...otification-tests.cpp => notification.cpp} | 12 ++++++----
 src/vist/policy/{api.h => api.hpp}            |  2 +-
 src/vist/policy/core/api.cpp                  |  4 ++--
 .../core/{db-schema.h => db-schema.hpp}       |  1 +
 src/vist/policy/core/policy-loader.cpp        |  2 +-
 .../{policy-loader.h => policy-loader.hpp}    |  4 ++--
 src/vist/policy/core/policy-manager.cpp       |  6 ++---
 .../{policy-manager.h => policy-manager.hpp}  |  6 ++---
 src/vist/policy/core/policy-storage.cpp       | 10 ++++-----
 .../{policy-storage.h => policy-storage.hpp}  |  4 ++--
 .../core/tests/{core-tests.cpp => core.cpp}   |  2 +-
 .../tests/{storage-tests.cpp => storage.cpp}  |  2 +-
 .../sdk/{policy-model.h => policy-model.hpp}  |  2 +-
 ...{policy-provider.h => policy-provider.hpp} |  2 +-
 .../sdk/{policy-value.h => policy-value.hpp}  |  0
 .../sdk/tests/{sdk-tests.cpp => sdk.cpp}      |  4 ++--
 src/vist/{tsqb/tsqb.hxx => query-builder.hpp} | 16 ++++++--------
 .../{tsqb => query-builder}/CMakeLists.txt    |  1 +
 .../column-pack.hpp}                          |  9 +++-----
 .../column.hxx => query-builder/column.hpp}   |  7 ++----
 .../condition.hpp}                            |  9 +++-----
 .../crud.hxx => query-builder/crud.hpp}       | 11 ++++------
 .../database.hpp}                             | 19 +++++++---------
 .../expression.hpp}                           | 13 +++++------
 .../table-pack.hpp}                           |  7 ++----
 .../table.hxx => query-builder/table.hpp}     | 17 ++++++--------
 .../tests/query-builder.cpp}                  |  9 ++------
 .../tuple-helper.hpp}                         |  7 ++----
 .../type.hxx => query-builder/type.hpp}       |  7 ++----
 .../util.hxx => query-builder/util.hpp}       |  6 ++---
 .../tests/{core-tests.cpp => core.cpp}        | 11 +++++-----
 src/vist/service/vist.cpp                     |  6 ++---
 src/vist/service/{vist.h => vist.hpp}         |  0
 src/vist/{common => }/tests/exception.cpp     |  4 ++--
 60 files changed, 169 insertions(+), 230 deletions(-)
 create mode 100644 AUTHORS
 rename src/osquery/tables/tizen/tests/{policy_tests.cpp => policy.cpp} (97%)
 rename src/vist/client/{query.h => query.hpp} (100%)
 rename src/vist/client/schema/{policy.h => policy.hpp} (92%)
 rename src/vist/client/schema/{processes.h => processes.hpp} (89%)
 rename src/vist/client/schema/{time.h => time.hpp} (88%)
 rename src/vist/client/tests/{client-tests.cpp => client.cpp} (94%)
 rename src/vist/client/tests/{virtual-table-tests.cpp => virtual-table.cpp} (90%)
 rename src/vist/client/{virtual-table.h => virtual-table.hpp} (100%)
 delete mode 100644 src/vist/common/CMakeLists.txt
 rename src/vist/{common/exception.h => exception.hpp} (95%)
 rename src/vist/{common/ipc/client.h => ipc/client.hpp} (100%)
 rename src/vist/{common/ipc/server.h => ipc/server.hpp} (100%)
 rename src/vist/{common/ipc/tests/ipc_tests.cpp => ipc/tests/ipc.cpp} (96%)
 rename src/vist/{common/audit/logger.h => logger.hpp} (95%)
 rename src/vist/notification/{notification.h => notification.hpp} (93%)
 rename src/vist/notification/tests/{notification-tests.cpp => notification.cpp} (90%)
 rename src/vist/policy/{api.h => api.hpp} (96%)
 rename src/vist/policy/core/{db-schema.h => db-schema.hpp} (99%)
 rename src/vist/policy/core/{policy-loader.h => policy-loader.hpp} (96%)
 rename src/vist/policy/core/{policy-manager.h => policy-manager.hpp} (93%)
 rename src/vist/policy/core/{policy-storage.h => policy-storage.hpp} (96%)
 rename src/vist/policy/core/tests/{core-tests.cpp => core.cpp} (96%)
 rename src/vist/policy/core/tests/{storage-tests.cpp => storage.cpp} (98%)
 rename src/vist/policy/sdk/{policy-model.h => policy-model.hpp} (97%)
 rename src/vist/policy/sdk/{policy-provider.h => policy-provider.hpp} (97%)
 rename src/vist/policy/sdk/{policy-value.h => policy-value.hpp} (100%)
 rename src/vist/policy/sdk/tests/{sdk-tests.cpp => sdk.cpp} (96%)
 rename src/vist/{tsqb/tsqb.hxx => query-builder.hpp} (69%)
 rename src/vist/{tsqb => query-builder}/CMakeLists.txt (95%)
 rename src/vist/{tsqb/include/column-pack.hxx => query-builder/column-pack.hpp} (94%)
 rename src/vist/{tsqb/include/column.hxx => query-builder/column.hpp} (88%)
 rename src/vist/{tsqb/include/condition.hxx => query-builder/condition.hpp} (92%)
 rename src/vist/{tsqb/include/crud.hxx => query-builder/crud.hpp} (97%)
 rename src/vist/{tsqb/include/database.hxx => query-builder/database.hpp} (95%)
 rename src/vist/{tsqb/include/expression.hxx => query-builder/expression.hpp} (93%)
 rename src/vist/{tsqb/include/table-pack.hxx => query-builder/table-pack.hpp} (95%)
 rename src/vist/{tsqb/include/table.hxx => query-builder/table.hpp} (94%)
 rename src/vist/{tsqb/tests/tsqb-tests.cpp => query-builder/tests/query-builder.cpp} (97%)
 rename src/vist/{tsqb/include/tuple-helper.hxx => query-builder/tuple-helper.hpp} (91%)
 rename src/vist/{tsqb/include/type.hxx => query-builder/type.hpp} (89%)
 rename src/vist/{tsqb/include/util.hxx => query-builder/util.hpp} (93%)
 rename src/vist/service/tests/{core-tests.cpp => core.cpp} (91%)
 rename src/vist/service/{vist.h => vist.hpp} (100%)
 rename src/vist/{common => }/tests/exception.cpp (96%)

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..166e74e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,13 @@
+# This is the official list of ViST authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS files.
+# See the latter for an explanation.
+#
+# Names should be added to this file as:
+#	Name or Organization <email address>
+# The email address is not required for organizations.
+#
+# Please keep the list sorted.
+
+Jaemin Ryu <jm77.ryu@samsung.com>
+Samsung Electronics Co.
+Sangwan Kwon <sangwan.kwon@samsung.com>
diff --git a/plugins/bluetooth/bluetooth.cpp b/plugins/bluetooth/bluetooth.cpp
index eafbc65..0caa39e 100644
--- a/plugins/bluetooth/bluetooth.cpp
+++ b/plugins/bluetooth/bluetooth.cpp
@@ -18,8 +18,8 @@
 #include <bluetooth-api.h>
 #include <bluetooth_internal.h>
 
-#include <vist/policy/sdk/policy-model.h>
-#include <vist/policy/sdk/policy-provider.h>
+#include <vist/policy/sdk/policy-model.hpp>
+#include <vist/policy/sdk/policy-provider.hpp>
 
 #include <memory>
 
diff --git a/plugins/wifi/wifi.cpp b/plugins/wifi/wifi.cpp
index b8d8aa5..95ca32e 100644
--- a/plugins/wifi/wifi.cpp
+++ b/plugins/wifi/wifi.cpp
@@ -17,8 +17,8 @@
 #include <arpa/inet.h>
 #include <wifi-manager.h>
 
-#include <vist/policy/sdk/policy-model.h>
-#include <vist/policy/sdk/policy-provider.h>
+#include <vist/policy/sdk/policy-model.hpp>
+#include <vist/policy/sdk/policy-provider.hpp>
 
 #include <klay/dbus/connection.h>
 
diff --git a/src/osquery/tables/tizen/policy.cpp b/src/osquery/tables/tizen/policy.cpp
index 5301071..313ac14 100644
--- a/src/osquery/tables/tizen/policy.cpp
+++ b/src/osquery/tables/tizen/policy.cpp
@@ -21,8 +21,8 @@
 #include <osquery/sql.h>
 #include <osquery/tables.h>
 
-#include <vist/policy/api.h>
-#include <vist/common/audit/logger.h>
+#include <vist/policy/api.hpp>
+#include <vist/logger.hpp>
 
 namespace osquery {
 namespace tables {
diff --git a/src/osquery/tables/tizen/policy_admin.cpp b/src/osquery/tables/tizen/policy_admin.cpp
index a831701..00d7a35 100644
--- a/src/osquery/tables/tizen/policy_admin.cpp
+++ b/src/osquery/tables/tizen/policy_admin.cpp
@@ -21,8 +21,8 @@
 #include <osquery/sql.h>
 #include <osquery/tables.h>
 
-#include <vist/policy/api.h>
-#include <vist/common/audit/logger.h>
+#include <vist/policy/api.hpp>
+#include <vist/logger.hpp>
 
 namespace {
 
diff --git a/src/osquery/tables/tizen/tests/policy_tests.cpp b/src/osquery/tables/tizen/tests/policy.cpp
similarity index 97%
rename from src/osquery/tables/tizen/tests/policy_tests.cpp
rename to src/osquery/tables/tizen/tests/policy.cpp
index e7cb5b2..983b693 100644
--- a/src/osquery/tables/tizen/tests/policy_tests.cpp
+++ b/src/osquery/tables/tizen/tests/policy.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <vist/policy/api.h>
+#include <vist/policy/api.hpp>
 
 using namespace vist;
 
diff --git a/src/vist/CMakeLists.txt b/src/vist/CMakeLists.txt
index 73f9be1..4d7cf18 100644
--- a/src/vist/CMakeLists.txt
+++ b/src/vist/CMakeLists.txt
@@ -29,7 +29,6 @@ ADD_DEFINITIONS(-DDB_PATH="${DB_INSTALL_DIR}/.vist.db"
 				-DSCRIPT_INSTALL_DIR="${SCRIPT_INSTALL_DIR}")
 
 ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(notification)
 ADD_SUBDIRECTORY(policy)
 ADD_SUBDIRECTORY(service)
@@ -54,6 +53,9 @@ INSTALL(TARGETS ${TARGET_VIST_DAEMON}
 					WORLD_READ
 					WORLD_EXECUTE)
 
+FILE(GLOB COMMON_TESTS "tests/*.cpp")
+ADD_VIST_TEST(${COMMON_TESTS})
+
 ADD_EXECUTABLE(${TARGET_VIST_TEST} main/tests.cpp
 								   ${${TARGET_VIST_LIB}_TESTS})
 TARGET_LINK_LIBRARIES(${TARGET_VIST_TEST} ${TARGET_VIST_LIB}
diff --git a/src/vist/client/query.cpp b/src/vist/client/query.cpp
index 81124a1..29fb8fd 100644
--- a/src/vist/client/query.cpp
+++ b/src/vist/client/query.cpp
@@ -14,10 +14,10 @@
  *  limitations under the License
  */
 
-#include "query.h"
+#include "query.hpp"
 
-#include <vist/common/ipc/client.h>
-#include <vist/common/audit/logger.h>
+#include <vist/logger.hpp>
+#include <vist/ipc/client.hpp>
 
 namespace {
 	const std::string SOCK_ADDR = "/tmp/.vist";
diff --git a/src/vist/client/query.h b/src/vist/client/query.hpp
similarity index 100%
rename from src/vist/client/query.h
rename to src/vist/client/query.hpp
diff --git a/src/vist/client/schema/policy.h b/src/vist/client/schema/policy.hpp
similarity index 92%
rename from src/vist/client/schema/policy.h
rename to src/vist/client/schema/policy.hpp
index 17d4a3e..2d33fc4 100644
--- a/src/vist/client/schema/policy.h
+++ b/src/vist/client/schema/policy.hpp
@@ -14,13 +14,6 @@
  *  limitations under the License
  */
 
-
-/**
- * @file processes.h
- * @brief The scheme of policy
- */
-
-
 #pragma once
 
 #include <string>
diff --git a/src/vist/client/schema/processes.h b/src/vist/client/schema/processes.hpp
similarity index 89%
rename from src/vist/client/schema/processes.h
rename to src/vist/client/schema/processes.hpp
index 9e9325c..764cd2d 100644
--- a/src/vist/client/schema/processes.h
+++ b/src/vist/client/schema/processes.hpp
@@ -14,13 +14,6 @@
  *  limitations under the License
  */
 
-
-/**
- * @file processes.h
- * @brief The scheme of processes (sync with osquery/tables/spec/x/processes.table)
- */
-
-
 #pragma once
 
 #include <string>
diff --git a/src/vist/client/schema/time.h b/src/vist/client/schema/time.hpp
similarity index 88%
rename from src/vist/client/schema/time.h
rename to src/vist/client/schema/time.hpp
index 02258df..18a655d 100644
--- a/src/vist/client/schema/time.h
+++ b/src/vist/client/schema/time.hpp
@@ -14,13 +14,6 @@
  *  limitations under the License
  */
 
-
-/**
- * @file time.h
- * @brief The scheme of time (sync with osquery/tables/spec/time.table)
- */
-
-
 #pragma once
 
 namespace vist {
diff --git a/src/vist/client/tests/client-tests.cpp b/src/vist/client/tests/client.cpp
similarity index 94%
rename from src/vist/client/tests/client-tests.cpp
rename to src/vist/client/tests/client.cpp
index f7bc148..e45c60b 100644
--- a/src/vist/client/tests/client-tests.cpp
+++ b/src/vist/client/tests/client.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../query.h" 
+#include <vist/client/query.hpp>
 
 #include <chrono>
 #include <thread>
@@ -25,13 +25,13 @@ using namespace vist;
 
 class ClientTests : public testing::Test {};
 
-TEST_F(ClientTests, query) {
+TEST(ClientTests, query) {
 	auto rows = Query::Execute("SELECT * FROM policy");
 
 	EXPECT_TRUE(rows.size() > 0);
 }
 
-TEST_F(ClientTests, admin_enrollment) {
+TEST(ClientTests, admin_enrollment) {
 	auto rows = Query::Execute("INSERT INTO policy_admin (name) VALUES ('testAdmin')");
 	EXPECT_EQ(rows.size(), 0);
 
diff --git a/src/vist/client/tests/virtual-table-tests.cpp b/src/vist/client/tests/virtual-table.cpp
similarity index 90%
rename from src/vist/client/tests/virtual-table-tests.cpp
rename to src/vist/client/tests/virtual-table.cpp
index c3aaaec..3d3133f 100644
--- a/src/vist/client/tests/virtual-table-tests.cpp
+++ b/src/vist/client/tests/virtual-table.cpp
@@ -16,20 +16,20 @@
 
 #include <gtest/gtest.h>
 
-#include "../virtual-table.h"
+#include <vist/client/virtual-table.hpp>
 
-#include "../schema/time.h"
-#include "../schema/policy.h"
-#include "../schema/processes.h"
+#include <vist/client/schema/policy.hpp>
+#include <vist/client/schema/processes.hpp>
+#include <vist/client/schema/time.hpp>
 
-#include <vist/common/audit/logger.h>
+#include <vist/logger.hpp>
 
 using namespace vist;
 using namespace vist::schema;
 
 class VirtualTableTests : public testing::Test {};
 
-TEST_F(VirtualTableTests, time_row_at) {
+TEST(VirtualTableTests, time_row_at) {
 	Time result = { -1, -1, -1 };
 
 	VirtualRow<Time> time;
@@ -54,7 +54,7 @@ TEST_F(VirtualTableTests, time_row_at) {
 	EXPECT_NE(result.seconds, -1);
 }
 
-TEST_F(VirtualTableTests, time_row_arry_op) {
+TEST(VirtualTableTests, time_row_arry_op) {
 	Time result = { -1, -1, -1 };
 
 	VirtualRow<Time> time;
@@ -73,7 +73,7 @@ TEST_F(VirtualTableTests, time_row_arry_op) {
 	EXPECT_NE(result.seconds, -1);
 }
 
-TEST_F(VirtualTableTests, processes_table) {
+TEST(VirtualTableTests, processes_table) {
 	Processes result;
 	VirtualTable<Processes> processes;
 	EXPECT_TRUE(processes.size() > 0);
@@ -105,7 +105,7 @@ TEST_F(VirtualTableTests, processes_table) {
 	}
 }
 
-TEST_F(VirtualTableTests, policy_table) {
+TEST(VirtualTableTests, policy_table) {
 	VirtualTable<Policy> table;
 	EXPECT_TRUE(table.size() > 0);
 
diff --git a/src/vist/client/virtual-table.cpp b/src/vist/client/virtual-table.cpp
index 2e6f372..2b359e5 100644
--- a/src/vist/client/virtual-table.cpp
+++ b/src/vist/client/virtual-table.cpp
@@ -13,28 +13,22 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file virtual-table.cpp
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Implementation of virtual object
- */
-
-#include "virtual-table.h"
-#include "query.h" 
 
-#include "schema/time.h"
-#include "schema/policy.h"
-#include "schema/processes.h"
+#include "virtual-table.hpp"
 
-#include <vist/common/audit/logger.h>
+#include <vist/client/query.hpp>
+#include <vist/client/schema/policy.hpp>
+#include <vist/client/schema/processes.hpp>
+#include <vist/client/schema/time.hpp>
 
-#include <tsqb.hxx>
+#include <vist/logger.hpp>
+#include <vist/query-builder.hpp>
 
 #include <boost/lexical_cast.hpp>
 
 namespace {
 
-using namespace tsqb;
+using namespace vist::tsqb;
 using namespace vist::schema;
 
 auto time = make_table("time",
diff --git a/src/vist/client/virtual-table.h b/src/vist/client/virtual-table.hpp
similarity index 100%
rename from src/vist/client/virtual-table.h
rename to src/vist/client/virtual-table.hpp
diff --git a/src/vist/common/CMakeLists.txt b/src/vist/common/CMakeLists.txt
deleted file mode 100644
index 04eeb46..0000000
--- a/src/vist/common/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#  Copyright (c) 2019 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(GLOB COMMON_TESTS "tests/*.cpp")
-ADD_VIST_TEST(${COMMON_TESTS})
diff --git a/src/vist/common/exception.h b/src/vist/exception.hpp
similarity index 95%
rename from src/vist/common/exception.h
rename to src/vist/exception.hpp
index 8236026..ba848fe 100644
--- a/src/vist/common/exception.h
+++ b/src/vist/exception.hpp
@@ -14,9 +14,6 @@
  *  limitations under the License
  */
 /*
- * @file   exception.h
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief  Enum based exception handling
  * @usage
  *  enum class ErrCode {
  *    LogicError = 1,
diff --git a/src/vist/common/ipc/client.h b/src/vist/ipc/client.hpp
similarity index 100%
rename from src/vist/common/ipc/client.h
rename to src/vist/ipc/client.hpp
diff --git a/src/vist/common/ipc/server.h b/src/vist/ipc/server.hpp
similarity index 100%
rename from src/vist/common/ipc/server.h
rename to src/vist/ipc/server.hpp
diff --git a/src/vist/common/ipc/tests/ipc_tests.cpp b/src/vist/ipc/tests/ipc.cpp
similarity index 96%
rename from src/vist/common/ipc/tests/ipc_tests.cpp
rename to src/vist/ipc/tests/ipc.cpp
index 94c082a..1e8c0d2 100644
--- a/src/vist/common/ipc/tests/ipc_tests.cpp
+++ b/src/vist/ipc/tests/ipc.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "ipc/server.h"
-#include "ipc/client.h"
+#include <vist/ipc/client.hpp>
+#include <vist/ipc/server.hpp>
 
 #include <chrono>
 #include <thread>
diff --git a/src/vist/common/audit/logger.h b/src/vist/logger.hpp
similarity index 95%
rename from src/vist/common/audit/logger.h
rename to src/vist/logger.hpp
index a4bf3ed..592a0ea 100644
--- a/src/vist/common/audit/logger.h
+++ b/src/vist/logger.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2019 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.
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <klay/audit/logger.h>
 #include <klay/audit/dlog-sink.h>
+#include <klay/audit/logger.h>
 
 #include <memory>
 
diff --git a/src/vist/main/main.cpp b/src/vist/main/main.cpp
index 64e1c0e..eec9680 100644
--- a/src/vist/main/main.cpp
+++ b/src/vist/main/main.cpp
@@ -14,18 +14,16 @@
  *  limitations under the License
  */
 
-#include "service/vist.h"
+#include <vist/service/vist.hpp>
 
 #include <cstdlib>
 #include <stdexcept>
 
 using namespace vist;
 
-int main() try
-{
+int main() try {
 	Vist::Instance().start();
 	return EXIT_SUCCESS;
-} catch(const std::exception&)
-{
+} catch(const std::exception&) {
 	return EXIT_FAILURE;
 }
diff --git a/src/vist/main/tests.cpp b/src/vist/main/tests.cpp
index e249cbe..0fcfc89 100644
--- a/src/vist/main/tests.cpp
+++ b/src/vist/main/tests.cpp
@@ -1,6 +1,22 @@
+/*
+ *  Copyright (c) 2019 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
+ */
+
 #include <gtest/gtest.h>
 
 int main(int argc, char* argv[]) {
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+	testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
 }
diff --git a/src/vist/notification/notification.cpp b/src/vist/notification/notification.cpp
index f30285d..06e945e 100644
--- a/src/vist/notification/notification.cpp
+++ b/src/vist/notification/notification.cpp
@@ -13,13 +13,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file notification.cpp
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Implementation of notification
- */
 
-#include "notification.h"
+#include "notification.hpp"
 
 #include <mutex>
 
diff --git a/src/vist/notification/notification.h b/src/vist/notification/notification.hpp
similarity index 93%
rename from src/vist/notification/notification.h
rename to src/vist/notification/notification.hpp
index 56a5962..5d47321 100644
--- a/src/vist/notification/notification.h
+++ b/src/vist/notification/notification.hpp
@@ -14,13 +14,6 @@
  *  limitations under the License
  */
 
-
-/**
- * @file notification.h
- * @brief Notify to registered stuffs when event-callback called
- */
-
-
 #pragma once
 
 #include <map>
diff --git a/src/vist/notification/tests/notification-tests.cpp b/src/vist/notification/tests/notification.cpp
similarity index 90%
rename from src/vist/notification/tests/notification-tests.cpp
rename to src/vist/notification/tests/notification.cpp
index d01af91..e376b74 100644
--- a/src/vist/notification/tests/notification-tests.cpp
+++ b/src/vist/notification/tests/notification.cpp
@@ -16,14 +16,16 @@
 
 #include <gtest/gtest.h>
 
-#include "../notification.h"
+#include <vist/notification/notification.hpp>
+
 #include <osquery/logger.h>
 
 using namespace vist;
 
 class NotificationTests : public testing::Test {};
 
-TEST_F(NotificationTests, test_add_positive) {
+TEST_F(NotificationTests, test_add_positive)
+{
 	auto& notifier = Notification::instance();
 
 	auto callback = [](const Row& row) {
@@ -36,7 +38,8 @@ TEST_F(NotificationTests, test_add_positive) {
 	EXPECT_TRUE(s.ok());
 }
 
-TEST_F(NotificationTests, test_add_negative) {
+TEST_F(NotificationTests, test_add_negative)
+{
 	auto& notifier = Notification::instance();
 
 	auto callback = [](const Row& row) {
@@ -49,7 +52,8 @@ TEST_F(NotificationTests, test_add_negative) {
 	EXPECT_FALSE(s.ok());
 }
 
-TEST_F(NotificationTests, test_emit_positive) {
+TEST_F(NotificationTests, test_emit_positive)
+{
 	auto& notifier = Notification::instance();
 
 	int called = 0;
diff --git a/src/vist/policy/api.h b/src/vist/policy/api.hpp
similarity index 96%
rename from src/vist/policy/api.h
rename to src/vist/policy/api.hpp
index 6fd3d06..bd8aa91 100644
--- a/src/vist/policy/api.h
+++ b/src/vist/policy/api.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-value.h>
+#include <vist/policy/sdk/policy-value.hpp>
 
 #include <string>
 #include <unordered_map>
diff --git a/src/vist/policy/core/api.cpp b/src/vist/policy/core/api.cpp
index 2277cb4..0a38eb5 100644
--- a/src/vist/policy/core/api.cpp
+++ b/src/vist/policy/core/api.cpp
@@ -14,9 +14,9 @@
  *  limitations under the License
  */
 
-#include <vist/policy/api.h>
+#include <vist/policy/api.hpp>
 
-#include "policy-manager.h"
+#include "policy-manager.hpp"
 
 namespace vist {
 namespace policy {
diff --git a/src/vist/policy/core/db-schema.h b/src/vist/policy/core/db-schema.hpp
similarity index 99%
rename from src/vist/policy/core/db-schema.h
rename to src/vist/policy/core/db-schema.hpp
index 159dc56..2bdf75b 100644
--- a/src/vist/policy/core/db-schema.h
+++ b/src/vist/policy/core/db-schema.hpp
@@ -13,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
+
 #pragma once
 
 #include <string>
diff --git a/src/vist/policy/core/policy-loader.cpp b/src/vist/policy/core/policy-loader.cpp
index b9350fb..28c3b41 100644
--- a/src/vist/policy/core/policy-loader.cpp
+++ b/src/vist/policy/core/policy-loader.cpp
@@ -14,7 +14,7 @@
  *  limitations under the License
  */
 
-#include "policy-loader.h"
+#include "policy-loader.hpp"
 
 namespace vist {
 namespace policy {
diff --git a/src/vist/policy/core/policy-loader.h b/src/vist/policy/core/policy-loader.hpp
similarity index 96%
rename from src/vist/policy/core/policy-loader.h
rename to src/vist/policy/core/policy-loader.hpp
index 73dab2d..b463fd6 100644
--- a/src/vist/policy/core/policy-loader.h
+++ b/src/vist/policy/core/policy-loader.hpp
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-provider.h>
+#include <vist/policy/sdk/policy-provider.hpp>
 
+#include <memory>
 #include <stdexcept>
 #include <string>
-#include <memory>
 
 #include <dlfcn.h>
 
diff --git a/src/vist/policy/core/policy-manager.cpp b/src/vist/policy/core/policy-manager.cpp
index 2ec9ab6..d335ab0 100644
--- a/src/vist/policy/core/policy-manager.cpp
+++ b/src/vist/policy/core/policy-manager.cpp
@@ -14,10 +14,10 @@
  *  limitations under the License
  */
 
-#include "policy-manager.h"
-#include "policy-loader.h"
+#include "policy-manager.hpp"
+#include "policy-loader.hpp"
 
-#include <vist/common/audit/logger.h>
+#include <vist/logger.hpp>
 
 #include <klay/filesystem.h>
 
diff --git a/src/vist/policy/core/policy-manager.h b/src/vist/policy/core/policy-manager.hpp
similarity index 93%
rename from src/vist/policy/core/policy-manager.h
rename to src/vist/policy/core/policy-manager.hpp
index 7e81c18..bdc364b 100644
--- a/src/vist/policy/core/policy-manager.h
+++ b/src/vist/policy/core/policy-manager.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-provider.h>
-#include <vist/policy/sdk/policy-value.h>
+#include <vist/policy/sdk/policy-provider.hpp>
+#include <vist/policy/sdk/policy-value.hpp>
 
-#include "policy-storage.h"
+#include "policy-storage.hpp"
 
 #include <exception>
 #include <memory>
diff --git a/src/vist/policy/core/policy-storage.cpp b/src/vist/policy/core/policy-storage.cpp
index 4a1e341..9ef1f0a 100644
--- a/src/vist/policy/core/policy-storage.cpp
+++ b/src/vist/policy/core/policy-storage.cpp
@@ -14,19 +14,19 @@
  *  limitations under the License
  */
 
-#include "policy-storage.h"
+#include "policy-storage.hpp"
 
-#include <vist/common/audit/logger.h>
+#include <vist/logger.hpp>
+#include <vist/query-builder.hpp>
 
 #include <klay/db/column.h>
-#include <klay/db/query-builder.h>
 #include <klay/db/statement.h>
 #include <klay/exception.h>
 
-#include <fstream>
 #include <algorithm>
+#include <fstream>
 
-using namespace query_builder;
+using namespace vist::tsqb;
 using namespace vist::policy::schema;
 
 namespace {
diff --git a/src/vist/policy/core/policy-storage.h b/src/vist/policy/core/policy-storage.hpp
similarity index 96%
rename from src/vist/policy/core/policy-storage.h
rename to src/vist/policy/core/policy-storage.hpp
index b26df61..cec538d 100644
--- a/src/vist/policy/core/policy-storage.h
+++ b/src/vist/policy/core/policy-storage.hpp
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-value.h>
+#include <vist/policy/sdk/policy-value.hpp>
 
-#include "db-schema.h"
+#include "db-schema.hpp"
 
 #include <memory>
 #include <unordered_map>
diff --git a/src/vist/policy/core/tests/core-tests.cpp b/src/vist/policy/core/tests/core.cpp
similarity index 96%
rename from src/vist/policy/core/tests/core-tests.cpp
rename to src/vist/policy/core/tests/core.cpp
index 4a30c19..2cf5bb8 100644
--- a/src/vist/policy/core/tests/core-tests.cpp
+++ b/src/vist/policy/core/tests/core.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../policy-manager.h"
+#include <vist/policy/core/policy-manager.hpp>
 
 namespace vist {
 namespace policy {
diff --git a/src/vist/policy/core/tests/storage-tests.cpp b/src/vist/policy/core/tests/storage.cpp
similarity index 98%
rename from src/vist/policy/core/tests/storage-tests.cpp
rename to src/vist/policy/core/tests/storage.cpp
index 1fd0579..369fb00 100644
--- a/src/vist/policy/core/tests/storage-tests.cpp
+++ b/src/vist/policy/core/tests/storage.cpp
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "../policy-storage.h"
+#include <vist/policy/core/policy-storage.hpp>
 
 using namespace vist::policy;
 
diff --git a/src/vist/policy/sdk/policy-model.h b/src/vist/policy/sdk/policy-model.hpp
similarity index 97%
rename from src/vist/policy/sdk/policy-model.h
rename to src/vist/policy/sdk/policy-model.hpp
index 8dd0392..64580fc 100644
--- a/src/vist/policy/sdk/policy-model.h
+++ b/src/vist/policy/sdk/policy-model.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-value.h>
+#include <vist/policy/sdk/policy-value.hpp>
 
 #include <string>
 #include <stdexcept>
diff --git a/src/vist/policy/sdk/policy-provider.h b/src/vist/policy/sdk/policy-provider.hpp
similarity index 97%
rename from src/vist/policy/sdk/policy-provider.h
rename to src/vist/policy/sdk/policy-provider.hpp
index ff79099..c55ff26 100644
--- a/src/vist/policy/sdk/policy-provider.h
+++ b/src/vist/policy/sdk/policy-provider.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-model.h>
+#include <vist/policy/sdk/policy-model.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/src/vist/policy/sdk/policy-value.h b/src/vist/policy/sdk/policy-value.hpp
similarity index 100%
rename from src/vist/policy/sdk/policy-value.h
rename to src/vist/policy/sdk/policy-value.hpp
diff --git a/src/vist/policy/sdk/tests/sdk-tests.cpp b/src/vist/policy/sdk/tests/sdk.cpp
similarity index 96%
rename from src/vist/policy/sdk/tests/sdk-tests.cpp
rename to src/vist/policy/sdk/tests/sdk.cpp
index 656e29d..4be5d8d 100644
--- a/src/vist/policy/sdk/tests/sdk-tests.cpp
+++ b/src/vist/policy/sdk/tests/sdk.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "../policy-model.h"
-#include "../policy-provider.h"
+#include <vist/policy/sdk/policy-model.hpp>
+#include <vist/policy/sdk/policy-provider.hpp>
 
 #include <exception>
 
diff --git a/src/vist/tsqb/tsqb.hxx b/src/vist/query-builder.hpp
similarity index 69%
rename from src/vist/tsqb/tsqb.hxx
rename to src/vist/query-builder.hpp
index c3791f0..35a918e 100644
--- a/src/vist/tsqb/tsqb.hxx
+++ b/src/vist/query-builder.hpp
@@ -14,16 +14,14 @@
  *  limitations under the License
  */
 /*
- * @file tsqb.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief TSQB is type-safe query builder
+ * @brief namespace TSQB means type-safe query builder
  */
 
 #pragma once
 
-#include "include/database.hxx"
-#include "include/table.hxx"
-#include "include/column.hxx"
-#include "include/expression.hxx"
-#include "include/condition.hxx"
-#include "include/util.hxx"
+#include "query-builder/column.hpp"
+#include "query-builder/condition.hpp"
+#include "query-builder/database.hpp"
+#include "query-builder/expression.hpp"
+#include "query-builder/table.hpp"
+#include "query-builder/util.hpp"
diff --git a/src/vist/tsqb/CMakeLists.txt b/src/vist/query-builder/CMakeLists.txt
similarity index 95%
rename from src/vist/tsqb/CMakeLists.txt
rename to src/vist/query-builder/CMakeLists.txt
index d6bf3fe..5f41c24 100644
--- a/src/vist/tsqb/CMakeLists.txt
+++ b/src/vist/query-builder/CMakeLists.txt
@@ -12,5 +12,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License
 
+/// TSQB: Type Safe Query Builder
 FILE(GLOB TSQB_TESTS "tests/*.cpp")
 ADD_VIST_TEST(${TSQB_TESTS})
diff --git a/src/vist/tsqb/include/column-pack.hxx b/src/vist/query-builder/column-pack.hpp
similarity index 94%
rename from src/vist/tsqb/include/column-pack.hxx
rename to src/vist/query-builder/column-pack.hpp
index 9688e8e..6f4e66f 100644
--- a/src/vist/tsqb/include/column-pack.hxx
+++ b/src/vist/query-builder/column-pack.hpp
@@ -13,19 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file column-pack.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Tie different types of columns
- */
 
 #pragma once
 
-#include "type.hxx"
+#include "type.hpp"
 
 #include <string>
 #include <vector>
 
+namespace vist {
 namespace tsqb {
 namespace internal {
 
@@ -95,3 +91,4 @@ std::string ColumnPack<Front, Rest...>::getName(ColumnType&& type) const noexcep
 
 } // namespace internal
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/column.hxx b/src/vist/query-builder/column.hpp
similarity index 88%
rename from src/vist/tsqb/include/column.hxx
rename to src/vist/query-builder/column.hpp
index ca17415..5ec7aba 100644
--- a/src/vist/tsqb/include/column.hxx
+++ b/src/vist/query-builder/column.hpp
@@ -13,17 +13,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file culumn.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Capture member pointer of struct and use it for matching with column
- */
 
 #pragma once
 
 #include <string>
 #include <tuple>
 
+namespace vist {
 namespace tsqb {
 
 template<typename Object, typename Field>
@@ -54,3 +50,4 @@ auto distinct(Args&&... args) -> decltype(Distinct<std::tuple<Args...>>())
 }
 
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/condition.hxx b/src/vist/query-builder/condition.hpp
similarity index 92%
rename from src/vist/tsqb/include/condition.hxx
rename to src/vist/query-builder/condition.hpp
index 7ec13da..54fdcce 100644
--- a/src/vist/tsqb/include/condition.hxx
+++ b/src/vist/query-builder/condition.hpp
@@ -13,16 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file condition.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Represent the condition statement of SQL
- */
 
 #pragma once
 
-#include "type.hxx"
+#include "type.hpp"
 
+namespace vist {
 namespace tsqb {
 namespace condition {
 
@@ -99,3 +95,4 @@ inline std::string to_string(Join type)
 
 } // namespace condition
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/crud.hxx b/src/vist/query-builder/crud.hpp
similarity index 97%
rename from src/vist/tsqb/include/crud.hxx
rename to src/vist/query-builder/crud.hpp
index be48c86..2ef2a14 100644
--- a/src/vist/tsqb/include/crud.hxx
+++ b/src/vist/query-builder/crud.hpp
@@ -13,20 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file crud.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Represent four basic functions of CRUD
- */
 
 #pragma once
 
-#include "column.hxx"
-#include "expression.hxx"
+#include "column.hpp"
+#include "expression.hpp"
 
 #include <string>
 #include <sstream>
 
+namespace vist {
 namespace tsqb {
 
 template<typename T>
@@ -276,3 +272,4 @@ std::string Crud<T>::processWhere(Expr expr)
 }
 
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/database.hxx b/src/vist/query-builder/database.hpp
similarity index 95%
rename from src/vist/tsqb/include/database.hxx
rename to src/vist/query-builder/database.hpp
index 0c8bf54..ef6189b 100644
--- a/src/vist/tsqb/include/database.hxx
+++ b/src/vist/query-builder/database.hpp
@@ -13,20 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file database.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Represent the database scheme of SQL
- */
 
 #pragma once
 
-#include "crud.hxx"
-#include "condition.hxx"
-#include "expression.hxx"
-#include "table-pack.hxx"
-#include "tuple-helper.hxx"
-#include "util.hxx"
+#include "crud.hpp"
+#include "condition.hpp"
+#include "expression.hpp"
+#include "table-pack.hpp"
+#include "tuple-helper.hpp"
+#include "util.hpp"
 
 #include <vector>
 #include <set>
@@ -34,6 +29,7 @@
 #include <sstream>
 #include <algorithm>
 
+namespace vist {
 namespace tsqb {
 
 template<typename... Tables>
@@ -205,3 +201,4 @@ std::string Database<Tables...>::getColumnName(ColumnType&& type) const noexcept
 }
 
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/expression.hxx b/src/vist/query-builder/expression.hpp
similarity index 93%
rename from src/vist/tsqb/include/expression.hxx
rename to src/vist/query-builder/expression.hpp
index c901ab0..a1525f5 100644
--- a/src/vist/tsqb/include/expression.hxx
+++ b/src/vist/query-builder/expression.hpp
@@ -13,20 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file expression.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Represent the expression of SQL
- */
 
 #pragma once
 
-#include "column.hxx"
-#include "type.hxx"
-#include "condition.hxx"
+#include "column.hpp"
+#include "type.hpp"
+#include "condition.hpp"
 
 #include <type_traits>
 
+namespace vist {
 namespace tsqb {
 
 template<typename Type>
@@ -138,3 +134,4 @@ condition::Or<L, R> operator||(const L& l, const R& r)
 }
 
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/table-pack.hxx b/src/vist/query-builder/table-pack.hpp
similarity index 95%
rename from src/vist/tsqb/include/table-pack.hxx
rename to src/vist/query-builder/table-pack.hpp
index d192886..eeda955 100644
--- a/src/vist/tsqb/include/table-pack.hxx
+++ b/src/vist/query-builder/table-pack.hpp
@@ -13,11 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file table-pack.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Tie diffirent types of tables
- */
 
 #pragma once
 
@@ -25,6 +20,7 @@
 #include <set>
 #include <string>
 
+namespace vist {
 namespace tsqb {
 namespace internal {
 
@@ -98,3 +94,4 @@ std::string TablePack<Front, Rest...>::getColumnName(ColumnType&& column) const
 
 } // namespace internal
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/table.hxx b/src/vist/query-builder/table.hpp
similarity index 94%
rename from src/vist/tsqb/include/table.hxx
rename to src/vist/query-builder/table.hpp
index e1ac527..9bdafad 100644
--- a/src/vist/tsqb/include/table.hxx
+++ b/src/vist/query-builder/table.hpp
@@ -13,24 +13,20 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file table.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Represent the table of SQL
- */
 
 #pragma once
 
-#include "crud.hxx"
-#include "column.hxx"
-#include "column-pack.hxx"
-#include "tuple-helper.hxx"
-#include "util.hxx"
+#include "crud.hpp"
+#include "column.hpp"
+#include "column-pack.hpp"
+#include "tuple-helper.hpp"
+#include "util.hpp"
 
 #include <vector>
 #include <string>
 #include <sstream>
 
+namespace vist {
 namespace tsqb {
 
 template<typename... Columns>
@@ -167,3 +163,4 @@ int Table<Columns...>::size() const noexcept
 }
 
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/tests/tsqb-tests.cpp b/src/vist/query-builder/tests/query-builder.cpp
similarity index 97%
rename from src/vist/tsqb/tests/tsqb-tests.cpp
rename to src/vist/query-builder/tests/query-builder.cpp
index 7770140..ae6f75e 100644
--- a/src/vist/tsqb/tests/tsqb-tests.cpp
+++ b/src/vist/query-builder/tests/query-builder.cpp
@@ -13,17 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file tsqb-tests.cpp
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Testcases of tsqb
- */
 
-#include "tsqb.hxx"
+#include <vist/query-builder.hpp>
 
 #include <gtest/gtest.h>
 
-using namespace tsqb;
+using namespace vist::tsqb;
 
 struct Admin {
 	int id;
diff --git a/src/vist/tsqb/include/tuple-helper.hxx b/src/vist/query-builder/tuple-helper.hpp
similarity index 91%
rename from src/vist/tsqb/include/tuple-helper.hxx
rename to src/vist/query-builder/tuple-helper.hpp
index 495946e..23e2558 100644
--- a/src/vist/tsqb/include/tuple-helper.hxx
+++ b/src/vist/query-builder/tuple-helper.hpp
@@ -13,16 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file tuple-helper.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Iterator method for tuple
- */
 
 #pragma once
 
 #include <tuple>
 
+namespace vist {
 namespace tsqb {
 namespace tuple_helper {
 namespace internal {
@@ -53,3 +49,4 @@ void for_each(const T& tuple, C&& closure)
 
 } // namspace tuple-hepler
 } // namspace tsqb
+} // namspace vist
diff --git a/src/vist/tsqb/include/type.hxx b/src/vist/query-builder/type.hpp
similarity index 89%
rename from src/vist/tsqb/include/type.hxx
rename to src/vist/query-builder/type.hpp
index 939b3da..17882a5 100644
--- a/src/vist/tsqb/include/type.hxx
+++ b/src/vist/query-builder/type.hpp
@@ -13,16 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file type.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- * @brief Make type safety with compile time checking
- */
 
 #pragma once
 
 #include <type_traits>
 
+namespace vist {
 namespace tsqb {
 namespace type {
 
@@ -46,3 +42,4 @@ void assert_compare(L l, R r)
 
 } // namespace type
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/tsqb/include/util.hxx b/src/vist/query-builder/util.hpp
similarity index 93%
rename from src/vist/tsqb/include/util.hxx
rename to src/vist/query-builder/util.hpp
index e65583d..6156a17 100644
--- a/src/vist/tsqb/include/util.hxx
+++ b/src/vist/query-builder/util.hpp
@@ -13,10 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-/*
- * @file util.hxx
- * @author Sangwan Kwon (sangwan.kwon@samsung.com)
- */
 
 #pragma once
 
@@ -24,6 +20,7 @@
 #include <algorithm>
 #include <cctype>
 
+namespace vist {
 namespace tsqb {
 namespace util {
 
@@ -37,3 +34,4 @@ inline std::string rtrim(std::string&& s)
 
 } // namespace util
 } // namespace tsqb
+} // namespace vist
diff --git a/src/vist/service/tests/core-tests.cpp b/src/vist/service/tests/core.cpp
similarity index 91%
rename from src/vist/service/tests/core-tests.cpp
rename to src/vist/service/tests/core.cpp
index f60e602..4153827 100644
--- a/src/vist/service/tests/core-tests.cpp
+++ b/src/vist/service/tests/core.cpp
@@ -16,19 +16,19 @@
 
 #include <gtest/gtest.h>
 
-#include "../vist.h" 
+#include <vist/service/vist.hpp>
+#include <vist/policy/core/policy-manager.hpp>
 
 #include <iostream>
 #include <chrono>
 #include <thread>
 
-#include <vist/policy/core/policy-manager.h>
-
 using namespace vist;
 
 class CoreTests : public testing::Test {};
 
-TEST_F(CoreTests, query_select) {
+TEST_F(CoreTests, query_select)
+{
 	auto rows = Vist::Query("SELECT * FROM policy");
 
 	EXPECT_TRUE(rows.size() > 0);
@@ -40,7 +40,8 @@ TEST_F(CoreTests, query_select) {
 	EXPECT_EQ(rows[0]["name"], "bluetooth");
 }
 
-TEST_F(CoreTests, query_update) {
+TEST_F(CoreTests, query_update)
+{
 	auto& manager = policy::PolicyManager::Instance();
 	manager.enroll("admin");
 
diff --git a/src/vist/service/vist.cpp b/src/vist/service/vist.cpp
index cb0ec41..88bc8ed 100644
--- a/src/vist/service/vist.cpp
+++ b/src/vist/service/vist.cpp
@@ -14,10 +14,10 @@
  *  limitations under the License
  */
 
-#include "vist.h"
+#include "vist.hpp"
 
-#include <vist/common/ipc/server.h>
-#include <vist/common/audit/logger.h>
+#include <vist/ipc/server.hpp>
+#include <vist/logger.hpp>
 
 #include <stdexcept>
 
diff --git a/src/vist/service/vist.h b/src/vist/service/vist.hpp
similarity index 100%
rename from src/vist/service/vist.h
rename to src/vist/service/vist.hpp
diff --git a/src/vist/common/tests/exception.cpp b/src/vist/tests/exception.cpp
similarity index 96%
rename from src/vist/common/tests/exception.cpp
rename to src/vist/tests/exception.cpp
index 9dd4f5e..16bd539 100644
--- a/src/vist/common/tests/exception.cpp
+++ b/src/vist/tests/exception.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../exception.h"
+#include <vist/exception.hpp>
 
 enum class ErrCode {
 	InvalidArgument = 1,
@@ -61,7 +61,7 @@ TEST_F(ExceptionTests, exception_msg)
 		msg = e.what();
 	}
 
-	EXPECT_TRUE(!raised) << msg;
+	EXPECT_TRUE(raised);
 	EXPECT_EQ(ec, ErrCode::RuntimeError);
 	EXPECT_NE(std::string::npos, msg.find("Additional"));
 }
-- 
2.34.1