diff --git a/README.md b/README.md
index a77a4b0c..32fd5e89 100644
--- a/README.md
+++ b/README.md
@@ -105,13 +105,14 @@
 
 ## studying
 
+ * RFC 2068 Hypertext Transfer Protocol -- HTTP/1.1
  * RFC 2817 Upgrading to TLS Within HTTP/1.1
  * RFC 7540 Hypertext Transfer Protocol Version 2 (HTTP/2)
+ * RFC 7541 HPACK: Header Compression for HTTP/2
  * RFC 9114 HTTP/3
 
 ## next time
 
- * RFC 2068 Hypertext Transfer Protocol -- HTTP/1.1
  * RFC 8778 Use of the HSS/LMS Hash-Based Signature Algorithm with CBOR Object Signing and Encryption (COSE)
  * RFC 9021 Use of the Walnut Digital Signature Algorithm with CBOR Object Signing and Encryption (COSE)
  * RFC 9054 CBOR Object Signing and Encryption (COSE): Hash Algorithms
diff --git a/sdk/base.hpp b/sdk/base.hpp
index 056ad14f..0675c6fc 100644
--- a/sdk/base.hpp
+++ b/sdk/base.hpp
@@ -27,15 +27,22 @@
 #include <sdk/base/basic/base64.hpp>
 #include <sdk/base/basic/cmdline.hpp>
 #include <sdk/base/basic/console_color.hpp>
+#include <sdk/base/basic/constexpr_obfuscate.hpp>
 #include <sdk/base/basic/dump_memory.hpp>
 #include <sdk/base/basic/ieee754.hpp>
 #include <sdk/base/basic/obfuscate_string.hpp>
 #include <sdk/base/basic/valist.hpp>
 #include <sdk/base/basic/variant.hpp>
+
+/* stream */
 #include <sdk/base/stream/basic_stream.hpp>
 #include <sdk/base/stream/bufferio.hpp>
 #include <sdk/base/stream/printf.hpp>
+
+/* string */
 #include <sdk/base/string/string.hpp>
+
+/* system */
 #include <sdk/base/system/atomic.hpp>
 #include <sdk/base/system/critical_section.hpp>
 #include <sdk/base/system/datetime.hpp>
@@ -52,11 +59,12 @@
 #include <sdk/base/system/thread.hpp>
 #include <sdk/base/system/trace.hpp>
 #include <sdk/base/system/types.hpp>
-
 #if defined _WIN32 || defined _WIN64
 #include <sdk/base/system/windows/sdk.hpp>
 #include <sdk/base/system/windows/windows_version.hpp>
 #endif
+
+/* unittest */
 #include <sdk/base/unittest/testcase.hpp>
 
 #endif
diff --git a/sdk/crypto.hpp b/sdk/crypto.hpp
index 720e0c6d..8bcbf030 100644
--- a/sdk/crypto.hpp
+++ b/sdk/crypto.hpp
@@ -11,11 +11,20 @@
 #ifndef __HOTPLACE_SDK_CRYPTO__
 #define __HOTPLACE_SDK_CRYPTO__
 
+/* top-most */
 #include <sdk/base.hpp>
+#include <sdk/crypto/crypto.hpp>
+#include <sdk/crypto/types.hpp>
+#include <sdk/io.hpp>
+
+/* authenticode */
 #include <sdk/crypto/authenticode/authenticode.hpp>
 #include <sdk/crypto/authenticode/authenticode_plugin.hpp>
 #include <sdk/crypto/authenticode/authenticode_plugin_pe.hpp>
 #include <sdk/crypto/authenticode/authenticode_verifier.hpp>
+#include <sdk/crypto/authenticode/sdk.hpp>
+
+/* basic */
 #include <sdk/crypto/basic/crypto_advisor.hpp>
 #include <sdk/crypto/basic/crypto_key.hpp>
 #include <sdk/crypto/basic/crypto_keychain.hpp>
@@ -30,16 +39,21 @@
 #include <sdk/crypto/basic/openssl_sign.hpp>
 #include <sdk/crypto/basic/time_otp.hpp>
 #include <sdk/crypto/basic/types.hpp>
+
+/* COSE */
 #include <sdk/crypto/cose/cbor_object_encryption.hpp>
 #include <sdk/crypto/cose/cbor_object_signing.hpp>
 #include <sdk/crypto/cose/cbor_object_signing_encryption.hpp>
 #include <sdk/crypto/cose/cbor_web_key.hpp>
 #include <sdk/crypto/cose/cose_composer.hpp>
 #include <sdk/crypto/cose/types.hpp>
+
+/* JOSE */
+#include <sdk/crypto/jose/json_object_encryption.hpp>
+#include <sdk/crypto/jose/json_object_signing.hpp>
 #include <sdk/crypto/jose/json_object_signing_encryption.hpp>
 #include <sdk/crypto/jose/json_web_key.hpp>
 #include <sdk/crypto/jose/json_web_signature.hpp>
-#include <sdk/crypto/types.hpp>
-#include <sdk/io.hpp>
+#include <sdk/crypto/jose/types.hpp>
 
 #endif
diff --git a/sdk/crypto/authenticode/authenticode_plugin.hpp b/sdk/crypto/authenticode/authenticode_plugin.hpp
index 2c505c83..d9daef13 100644
--- a/sdk/crypto/authenticode/authenticode_plugin.hpp
+++ b/sdk/crypto/authenticode/authenticode_plugin.hpp
@@ -17,7 +17,8 @@
 #define __HOTPLACE_SDK_CRYPTO_AUTHENTICODE_PLUGIN__
 
 #include <list>
-#include <sdk/io/stream/file_stream.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <string>
 
 namespace hotplace {
diff --git a/sdk/crypto/authenticode/authenticode_verifier.cpp b/sdk/crypto/authenticode/authenticode_verifier.cpp
index 2feb734d..43941aea 100644
--- a/sdk/crypto/authenticode/authenticode_verifier.cpp
+++ b/sdk/crypto/authenticode/authenticode_verifier.cpp
@@ -10,22 +10,17 @@
  */
 
 #include <map>
-#include <sdk/base/stl.hpp>
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/base/system/thread.hpp>
-#include <sdk/base/system/trace.hpp>
+#include <sdk/base.hpp>
 #include <sdk/crypto/authenticode/authenticode_plugin_pe.hpp>
 #include <sdk/crypto/authenticode/authenticode_verifier.hpp>
 #include <sdk/crypto/authenticode/sdk.hpp>
 #include <sdk/crypto/basic/openssl_sdk.hpp>
 #include <sdk/io/string/string.hpp>
 #include <sdk/io/system/sdk.hpp>
-#include <sdk/net/basic/sdk.hpp>
 #include <set>
 
 namespace hotplace {
 using namespace io;
-using namespace net;
 namespace crypto {
 
 #define AUTHENTICODE_CONTEXT_SIGNATURE 0x20170710
diff --git a/sdk/crypto/authenticode/authenticode_verifier.hpp b/sdk/crypto/authenticode/authenticode_verifier.hpp
index e391bd39..55d523cc 100644
--- a/sdk/crypto/authenticode/authenticode_verifier.hpp
+++ b/sdk/crypto/authenticode/authenticode_verifier.hpp
@@ -26,10 +26,8 @@
 #include <sdk/base.hpp>
 #include <sdk/crypto/authenticode/authenticode_plugin.hpp>
 #include <sdk/crypto/basic/openssl_hash.hpp>
-//#include <sdk/io/stream/file_stream.hpp>
 
 namespace hotplace {
-// using namespace io;
 namespace crypto {
 
 class authenticode_plugin;
diff --git a/sdk/crypto/authenticode/sdk.hpp b/sdk/crypto/authenticode/sdk.hpp
index 5ee16d11..052bad20 100644
--- a/sdk/crypto/authenticode/sdk.hpp
+++ b/sdk/crypto/authenticode/sdk.hpp
@@ -11,6 +11,7 @@
 #ifndef __HOTPLACE_SDK_CRYPTO_AUTHENTICODE_SDK__
 #define __HOTPLACE_SDK_CRYPTO_AUTHENTICODE_SDK__
 
+#include <sdk/base.hpp>
 #include <sdk/crypto/basic/types.hpp>
 #include <set>
 #include <string>
diff --git a/sdk/crypto/cose/cbor_object_signing_encryption.cpp b/sdk/crypto/cose/cbor_object_signing_encryption.cpp
index b3557fdd..eff7df44 100644
--- a/sdk/crypto/cose/cbor_object_signing_encryption.cpp
+++ b/sdk/crypto/cose/cbor_object_signing_encryption.cpp
@@ -180,7 +180,7 @@ return_t cbor_object_signing_encryption::encrypt(cose_context_t* handle, crypto_
     return ret;
 }
 
-return_t cbor_object_signing_encryption::encrypt2(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output) {
+return_t cbor_object_signing_encryption::encrypt(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output) {
     return_t ret = errorcode_t::success;
 
     __try2 {
@@ -259,7 +259,7 @@ return_t cbor_object_signing_encryption::sign(cose_context_t* handle, crypto_key
     return ret;
 }
 
-return_t cbor_object_signing_encryption::sign2(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output) {
+return_t cbor_object_signing_encryption::sign(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output) {
     return_t ret = errorcode_t::success;
 
     __try2 {
@@ -323,7 +323,7 @@ return_t cbor_object_signing_encryption::mac(cose_context_t* handle, crypto_key*
     return ret;
 }
 
-return_t cbor_object_signing_encryption::mac2(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output) {
+return_t cbor_object_signing_encryption::mac(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output) {
     return_t ret = errorcode_t::success;
 
     __try2 {
diff --git a/sdk/crypto/cose/cbor_object_signing_encryption.hpp b/sdk/crypto/cose/cbor_object_signing_encryption.hpp
index a5a900a7..d4c25747 100644
--- a/sdk/crypto/cose/cbor_object_signing_encryption.hpp
+++ b/sdk/crypto/cose/cbor_object_signing_encryption.hpp
@@ -125,11 +125,11 @@ class cbor_object_signing_encryption {
      *              recipient.get_protected().add(cose_key_t::cose_alg, keyalg);
      *
      *              // fill others and compose
-     *              ret = cose.encrypt2(handle, key, input, cbor);
+     *              ret = cose.encrypt(handle, key, input, cbor);
      *          }
      *          cose.close(handle);
      */
-    return_t encrypt2(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output);
+    return_t encrypt(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output);
     /**
      * @brief   decrypt
      * @param   cose_context_t* handle [in]
@@ -190,11 +190,11 @@ class cbor_object_signing_encryption {
      *          body.get_protected().add(cose_key_t::cose_alg, alg);
      *
      *          // fill others and compose
-     *          ret = cose.sign2(handle, key, input, cbor);
+     *          ret = cose.sign(handle, key, input, cbor);
      *
      *          cose.close(handle);
      */
-    return_t sign2(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output);
+    return_t sign(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output);
     /**
      * @brief   mac
      * @param   cose_context_t* handle [in]
@@ -249,11 +249,11 @@ class cbor_object_signing_encryption {
      *              recipient.get_protected().add(cose_key_t::cose_alg, keyalg);
      *
      *              // fill others and compose
-     *              ret = cose.mac2(handle, key, input, cbor);
+     *              ret = cose.mac(handle, key, input, cbor);
      *          }
      *          cose.close(handle);
      */
-    return_t mac2(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output);
+    return_t mac(cose_context_t* handle, crypto_key* key, binary_t const& input, binary_t& output);
     /**
      * @brief   verify with kid
      * @param   cose_context_t* handle [in]
diff --git a/sdk/crypto/jose/json_object_encryption.cpp b/sdk/crypto/jose/json_object_encryption.cpp
index 9fb1b793..deeaea71 100644
--- a/sdk/crypto/jose/json_object_encryption.cpp
+++ b/sdk/crypto/jose/json_object_encryption.cpp
@@ -12,8 +12,6 @@
 
 #include <iostream>
 #include <sdk/base.hpp>
-#include <sdk/base/basic/base64.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
 #include <sdk/crypto/basic/crypto_advisor.hpp>
 #include <sdk/crypto/basic/crypto_keychain.hpp>
 #include <sdk/crypto/basic/evp_key.hpp>
diff --git a/sdk/crypto/jose/json_object_signing_encryption.cpp b/sdk/crypto/jose/json_object_signing_encryption.cpp
index 35e62d0a..0d088327 100644
--- a/sdk/crypto/jose/json_object_signing_encryption.cpp
+++ b/sdk/crypto/jose/json_object_signing_encryption.cpp
@@ -16,8 +16,6 @@
 
 #include <iostream>
 #include <sdk/base.hpp>
-#include <sdk/base/basic/base64.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
 #include <sdk/crypto/basic/crypto_advisor.hpp>
 #include <sdk/crypto/basic/crypto_keychain.hpp>
 #include <sdk/crypto/basic/openssl_prng.hpp>
diff --git a/sdk/io.hpp b/sdk/io.hpp
index e0d35111..9206230a 100644
--- a/sdk/io.hpp
+++ b/sdk/io.hpp
@@ -11,12 +11,18 @@
 #ifndef __HOTPLACE_SDK_IO__
 #define __HOTPLACE_SDK_IO__
 
+/* top-most */
 #include <sdk/base.hpp>
+#include <sdk/io/types.hpp>
+
+/* basic */
 #include <sdk/io/basic/json.hpp>
 #include <sdk/io/basic/keyvalue.hpp>
 #include <sdk/io/basic/mlfq.hpp>
 #include <sdk/io/basic/payload.hpp>
 #include <sdk/io/basic/zlib.hpp>
+
+/* CBOR */
 #include <sdk/io/cbor/cbor_array.hpp>
 #include <sdk/io/cbor/cbor_data.hpp>
 #include <sdk/io/cbor/cbor_encode.hpp>
@@ -25,14 +31,21 @@
 #include <sdk/io/cbor/cbor_publisher.hpp>
 #include <sdk/io/cbor/cbor_reader.hpp>
 #include <sdk/io/cbor/cbor_visitor.hpp>
+#include <sdk/io/cbor/concise_binary_object_representation.hpp>
+
+/* stream */
 #include <sdk/io/stream/file_stream.hpp>
 #include <sdk/io/stream/stream.hpp>
 #include <sdk/io/stream/string.hpp>
+
+/* string */
 #include <sdk/io/string/string.hpp>
+
+/* system */
 #include <sdk/io/system/multiplexer.hpp>
 #include <sdk/io/system/sdk.hpp>
 #include <sdk/io/system/types.hpp>
-#include <sdk/io/types.hpp>
+#include <sdk/io/system/windows_pe.hpp>
 #if defined __linux__
 #elif defined _WIN32 || defined _WIN64
 #include <sdk/io/system/windows/windows_registry.hpp>
diff --git a/sdk/io/basic/json.hpp b/sdk/io/basic/json.hpp
index e372e014..1a307ec6 100644
--- a/sdk/io/basic/json.hpp
+++ b/sdk/io/basic/json.hpp
@@ -13,7 +13,7 @@
 
 #include <jansson.h>
 
-#include <sdk/base/system/trace.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/system/sdk.hpp>
 
 namespace hotplace {
diff --git a/sdk/io/basic/keyvalue.cpp b/sdk/io/basic/keyvalue.cpp
index 8e74452e..ddd1ec78 100644
--- a/sdk/io/basic/keyvalue.cpp
+++ b/sdk/io/basic/keyvalue.cpp
@@ -8,7 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/basic/keyvalue.hpp>
 
 namespace hotplace {
diff --git a/sdk/io/basic/keyvalue.hpp b/sdk/io/basic/keyvalue.hpp
index 013014aa..d73ef15b 100644
--- a/sdk/io/basic/keyvalue.hpp
+++ b/sdk/io/basic/keyvalue.hpp
@@ -13,8 +13,6 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/system/critical_section.hpp>
-#include <unordered_map>
 
 namespace hotplace {
 namespace io {
diff --git a/sdk/io/basic/zlib.hpp b/sdk/io/basic/zlib.hpp
index 50c55abc..7a7c6379 100644
--- a/sdk/io/basic/zlib.hpp
+++ b/sdk/io/basic/zlib.hpp
@@ -13,7 +13,6 @@
 #define __HOTPLACE_SDK_IO_BASIC_ZLIB__
 
 #include <sdk/base.hpp>
-#include <sdk/io/stream/stream.hpp>
 
 namespace hotplace {
 namespace io {
diff --git a/sdk/io/cbor/cbor_encode.cpp b/sdk/io/cbor/cbor_encode.cpp
index 9f1a6cc8..24815485 100644
--- a/sdk/io/cbor/cbor_encode.cpp
+++ b/sdk/io/cbor/cbor_encode.cpp
@@ -11,8 +11,7 @@
  * 2023.09.01   Soo Han, Kim        refactor
  */
 
-#include <sdk/base/basic/ieee754.hpp>
-#include <sdk/base/basic/variant.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/cbor/cbor_encode.hpp>
 #include <sdk/io/system/types.hpp>
 
diff --git a/sdk/io/cbor/cbor_object.hpp b/sdk/io/cbor/cbor_object.hpp
index eb663de6..d352edb0 100644
--- a/sdk/io/cbor/cbor_object.hpp
+++ b/sdk/io/cbor/cbor_object.hpp
@@ -17,7 +17,6 @@
 #include <deque>
 #include <sdk/base.hpp>
 #include <sdk/io/cbor/concise_binary_object_representation.hpp>
-#include <sdk/io/stream/stream.hpp>
 
 namespace hotplace {
 namespace io {
diff --git a/sdk/io/cbor/concise_binary_object_representation.hpp b/sdk/io/cbor/concise_binary_object_representation.hpp
index 7d5d2ea9..44328d18 100644
--- a/sdk/io/cbor/concise_binary_object_representation.hpp
+++ b/sdk/io/cbor/concise_binary_object_representation.hpp
@@ -44,7 +44,6 @@
 
 #include <deque>
 #include <sdk/base.hpp>
-#include <sdk/io/stream/stream.hpp>
 
 namespace hotplace {
 namespace io {
diff --git a/sdk/io/stream/ansi_string.cpp b/sdk/io/stream/ansi_string.cpp
index 29921a10..f1475c0f 100644
--- a/sdk/io/stream/ansi_string.cpp
+++ b/sdk/io/stream/ansi_string.cpp
@@ -8,7 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/stream/basic_stream.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/stream/string.hpp>
 #include <sdk/io/string/string.hpp>
 
diff --git a/sdk/io/stream/dump_memory.cpp b/sdk/io/stream/dump_memory.cpp
index 251bb9ec..0cd74558 100644
--- a/sdk/io/stream/dump_memory.cpp
+++ b/sdk/io/stream/dump_memory.cpp
@@ -8,8 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/basic/dump_memory.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/stream/stream.hpp>
 
 namespace hotplace {
diff --git a/sdk/io/stream/printf.cpp b/sdk/io/stream/printf.cpp
index 51e3905c..2d59a575 100644
--- a/sdk/io/stream/printf.cpp
+++ b/sdk/io/stream/printf.cpp
@@ -9,10 +9,7 @@
  */
 
 #include <map>
-#include <sdk/base/basic/base16.hpp>
-#include <sdk/base/basic/ieee754.hpp>
-#include <sdk/base/basic/valist.hpp>
-#include <sdk/base/stl.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/stream/stream.hpp>
 #include <sdk/io/stream/string.hpp>
 #include <sdk/io/string/string.hpp>
diff --git a/sdk/io/stream/stream.hpp b/sdk/io/stream/stream.hpp
index 28184f59..edefb805 100644
--- a/sdk/io/stream/stream.hpp
+++ b/sdk/io/stream/stream.hpp
@@ -11,10 +11,7 @@
 #ifndef __HOTPLACE_SDK_STREAM_STREAM__
 #define __HOTPLACE_SDK_STREAM_STREAM__
 
-#include <sdk/base/basic/valist.hpp>
-#include <sdk/base/stream.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/base/stream/bufferio.hpp>
+#include <sdk/base.hpp>
 
 namespace hotplace {
 namespace io {
diff --git a/sdk/io/stream/string.hpp b/sdk/io/stream/string.hpp
index 69f6f813..ee50c4e5 100644
--- a/sdk/io/stream/string.hpp
+++ b/sdk/io/stream/string.hpp
@@ -11,7 +11,7 @@
 #ifndef __HOTPLACE_SDK_IO_STREAM_STRING__
 #define __HOTPLACE_SDK_IO_STREAM_STRING__
 
-#include <sdk/base/stream/bufferio.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/stream/stream.hpp>
 
 namespace hotplace {
diff --git a/sdk/io/string/regex.cpp b/sdk/io/string/regex.cpp
index 7130d7a1..770ba56e 100644
--- a/sdk/io/string/regex.cpp
+++ b/sdk/io/string/regex.cpp
@@ -9,7 +9,7 @@
  */
 
 #include <regex>
-#include <sdk/base/basic/base16.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/string/string.hpp>
 #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4))
 #else
diff --git a/sdk/io/string/url.cpp b/sdk/io/string/url.cpp
index 3b162e14..66e96fd6 100644
--- a/sdk/io/string/url.cpp
+++ b/sdk/io/string/url.cpp
@@ -9,7 +9,7 @@
  */
 
 #include <regex>
-#include <sdk/base/basic/base16.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/string/string.hpp>
 #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4))
 #else
diff --git a/sdk/io/system/multiplexer.cpp b/sdk/io/system/multiplexer.cpp
index 87a0c780..113855f7 100644
--- a/sdk/io/system/multiplexer.cpp
+++ b/sdk/io/system/multiplexer.cpp
@@ -9,8 +9,7 @@
  */
 
 #include <map>
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/base/system/thread.hpp>
+#include <sdk/base.hpp>
 #include <sdk/io/system/multiplexer.hpp>
 
 namespace hotplace {
diff --git a/sdk/io/system/sdk.hpp b/sdk/io/system/sdk.hpp
index 1015d809..40ce9915 100644
--- a/sdk/io/system/sdk.hpp
+++ b/sdk/io/system/sdk.hpp
@@ -12,10 +12,14 @@
 #define __HOTPLACE_SDK_IO_SYSTEM_SDK__
 
 #include <sdk/base.hpp>
-#include <sdk/io/stream/stream.hpp>
+#include <sdk/io/system/types.hpp>
 
 namespace hotplace {
-namespace io {}
+namespace io {
+
+// reserved
+
+}
 }  // namespace hotplace
 
 #endif
diff --git a/sdk/net.hpp b/sdk/net.hpp
index a893e593..bcac30fc 100644
--- a/sdk/net.hpp
+++ b/sdk/net.hpp
@@ -11,23 +11,20 @@
 #ifndef __HOTPLACE_SDK_NET__
 #define __HOTPLACE_SDK_NET__
 
+/* top-most */
 #include <sdk/base.hpp>
 #include <sdk/crypto.hpp>
 #include <sdk/io.hpp>
+#include <sdk/net/types.hpp>
+
+/* basic */
 #include <sdk/net/basic/client_socket.hpp>
 #include <sdk/net/basic/ipaddr_acl.hpp>
 #include <sdk/net/basic/sdk.hpp>
 #include <sdk/net/basic/server_socket.hpp>
-#include <sdk/net/http/basic_authentication_provider.hpp>
-#include <sdk/net/http/basic_credentials.hpp>
-#include <sdk/net/http/bearer_authentication_provider.hpp>
-#include <sdk/net/http/bearer_credentials.hpp>
-#include <sdk/net/http/custom_credentials.hpp>
-#include <sdk/net/http/digest_access_authentication_provider.hpp>
-#include <sdk/net/http/digest_credentials.hpp>
+
+/* http */
 #include <sdk/net/http/html_documents.hpp>
-#include <sdk/net/http/http2_frame.hpp>
-#include <sdk/net/http/http2_protocol.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
 #include <sdk/net/http/http_authentication_resolver.hpp>
 #include <sdk/net/http/http_client.hpp>
@@ -39,17 +36,36 @@
 #include <sdk/net/http/http_router.hpp>
 #include <sdk/net/http/http_server.hpp>
 #include <sdk/net/http/http_uri.hpp>
-#include <sdk/net/http/oauth2.hpp>
-#include <sdk/net/http/oauth2_credentials.hpp>
-#include <sdk/net/http/rfc2617_digest.hpp>
 #include <sdk/net/http/types.hpp>
+
+/* http/auth */
+#include <sdk/net/http/auth/basic_authentication_provider.hpp>
+#include <sdk/net/http/auth/basic_credentials.hpp>
+#include <sdk/net/http/auth/bearer_authentication_provider.hpp>
+#include <sdk/net/http/auth/bearer_credentials.hpp>
+#include <sdk/net/http/auth/custom_credentials.hpp>
+#include <sdk/net/http/auth/digest_access_authentication_provider.hpp>
+#include <sdk/net/http/auth/digest_credentials.hpp>
+#include <sdk/net/http/auth/oauth2.hpp>
+#include <sdk/net/http/auth/oauth2_credentials.hpp>
+#include <sdk/net/http/auth/rfc2617_digest.hpp>
+
+/* http/http2 */
+#include <sdk/net/http/http2/hpack.hpp>
+#include <sdk/net/http/http2/http2_frame.hpp>
+#include <sdk/net/http/http2/http2_protocol.hpp>
+
+/* server */
 #include <sdk/net/server/network_protocol.hpp>
 #include <sdk/net/server/network_server.hpp>
 #include <sdk/net/server/network_session.hpp>
+#include <sdk/net/server/network_stream.hpp>
+
+/* TLS */
 #include <sdk/net/tls/sdk.hpp>
+#include <sdk/net/tls/tls.hpp>
 #include <sdk/net/tls/tls_client.hpp>
 #include <sdk/net/tls/tls_server.hpp>
 #include <sdk/net/tls/x509.hpp>
-#include <sdk/net/types.hpp>
 
 #endif
diff --git a/sdk/net/CMakeLists.txt b/sdk/net/CMakeLists.txt
index 599eab0f..457a9959 100644
--- a/sdk/net/CMakeLists.txt
+++ b/sdk/net/CMakeLists.txt
@@ -8,7 +8,8 @@ file (GLOB FILEGROUP_SDK_HEADER_NET
     ${PROJECT_SOURCE_DIR}/sdk/net/*.hpp
     ${PROJECT_SOURCE_DIR}/sdk/net/basic/*.hpp
     ${PROJECT_SOURCE_DIR}/sdk/net/http/*.hpp
-    ${PROJECT_SOURCE_DIR}/sdk/net/protocol/*.hpp
+    ${PROJECT_SOURCE_DIR}/sdk/net/http/auth/*.hpp
+    ${PROJECT_SOURCE_DIR}/sdk/net/http/http2/*.hpp
     ${PROJECT_SOURCE_DIR}/sdk/net/server/*.hpp
     ${PROJECT_SOURCE_DIR}/sdk/net/tls/*.hpp
 )
@@ -17,7 +18,8 @@ file (GLOB FILEGROUP_SDK_SOURCE_NET
     ${PROJECT_SOURCE_DIR}/sdk/net/*.cpp
     ${PROJECT_SOURCE_DIR}/sdk/net/basic/*.cpp
     ${PROJECT_SOURCE_DIR}/sdk/net/http/*.cpp
-    ${PROJECT_SOURCE_DIR}/sdk/net/protocol/*.cpp
+    ${PROJECT_SOURCE_DIR}/sdk/net/http/auth/*.cpp
+    ${PROJECT_SOURCE_DIR}/sdk/net/http/http2/*.cpp
     ${PROJECT_SOURCE_DIR}/sdk/net/server/*.cpp
     ${PROJECT_SOURCE_DIR}/sdk/net/tls/*.cpp
 )
diff --git a/sdk/net/basic/ipaddr_acl.cpp b/sdk/net/basic/ipaddr_acl.cpp
index 1bcf4590..b6fe0546 100644
--- a/sdk/net/basic/ipaddr_acl.cpp
+++ b/sdk/net/basic/ipaddr_acl.cpp
@@ -8,8 +8,8 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/system/types.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/ipaddr_acl.hpp>
 #include <sdk/net/types.hpp>  // ws2tcpip.h first
 
diff --git a/sdk/net/http/basic_authentication_provider.cpp b/sdk/net/http/auth/basic_authentication_provider.cpp
similarity index 82%
rename from sdk/net/http/basic_authentication_provider.cpp
rename to sdk/net/http/auth/basic_authentication_provider.cpp
index 81c5a400..e84fd4f0 100644
--- a/sdk/net/http/basic_authentication_provider.cpp
+++ b/sdk/net/http/auth/basic_authentication_provider.cpp
@@ -8,18 +8,11 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/basic_authentication_provider.hpp>
-#include <sdk/net/http/http_authentication_resolver.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/basic_authentication_provider.hpp>
 #include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/basic_authentication_provider.hpp b/sdk/net/http/auth/basic_authentication_provider.hpp
similarity index 87%
rename from sdk/net/http/basic_authentication_provider.hpp
rename to sdk/net/http/auth/basic_authentication_provider.hpp
index dc1441a6..8b224c3b 100644
--- a/sdk/net/http/basic_authentication_provider.hpp
+++ b/sdk/net/http/auth/basic_authentication_provider.hpp
@@ -14,11 +14,13 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/net/http/basic_credentials.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/basic_credentials.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/server/network_protocol.hpp>
+#include <sdk/net/http/http_authentication_resolver.hpp>
+#include <sdk/net/http/http_request.hpp>
+#include <sdk/net/http/http_response.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/basic_credentials.cpp b/sdk/net/http/auth/basic_credentials.cpp
similarity index 73%
rename from sdk/net/http/basic_credentials.cpp
rename to sdk/net/http/auth/basic_credentials.cpp
index e0379d15..ccdfe448 100644
--- a/sdk/net/http/basic_credentials.cpp
+++ b/sdk/net/http/auth/basic_credentials.cpp
@@ -8,17 +8,12 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/basic_authentication_provider.hpp>
-#include <sdk/net/http/basic_credentials.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/net/http/auth/basic_authentication_provider.hpp>
+#include <sdk/net/http/auth/basic_credentials.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/basic_credentials.hpp b/sdk/net/http/auth/basic_credentials.hpp
similarity index 94%
rename from sdk/net/http/basic_credentials.hpp
rename to sdk/net/http/auth/basic_credentials.hpp
index b3d9d398..693429b9 100644
--- a/sdk/net/http/basic_credentials.hpp
+++ b/sdk/net/http/auth/basic_credentials.hpp
@@ -14,7 +14,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/net/http/http_authentication_provider.hpp>
 #include <string>
 
 namespace hotplace {
diff --git a/sdk/net/http/bearer_authentication_provider.cpp b/sdk/net/http/auth/bearer_authentication_provider.cpp
similarity index 84%
rename from sdk/net/http/bearer_authentication_provider.cpp
rename to sdk/net/http/auth/bearer_authentication_provider.cpp
index 553c9196..dd0f5288 100644
--- a/sdk/net/http/bearer_authentication_provider.cpp
+++ b/sdk/net/http/auth/bearer_authentication_provider.cpp
@@ -8,18 +8,11 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/bearer_authentication_provider.hpp>
-#include <sdk/net/http/http_authentication_resolver.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/bearer_authentication_provider.hpp>
 #include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/bearer_authentication_provider.hpp b/sdk/net/http/auth/bearer_authentication_provider.hpp
similarity index 90%
rename from sdk/net/http/bearer_authentication_provider.hpp
rename to sdk/net/http/auth/bearer_authentication_provider.hpp
index e504b3fd..6f6bea3c 100644
--- a/sdk/net/http/bearer_authentication_provider.hpp
+++ b/sdk/net/http/auth/bearer_authentication_provider.hpp
@@ -14,13 +14,13 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/net/http/bearer_credentials.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/bearer_credentials.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
+#include <sdk/net/http/http_authentication_resolver.hpp>
 #include <sdk/net/http/http_request.hpp>
 #include <sdk/net/http/http_response.hpp>
-#include <sdk/net/server/network_protocol.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/bearer_credentials.cpp b/sdk/net/http/auth/bearer_credentials.cpp
similarity index 67%
rename from sdk/net/http/bearer_credentials.cpp
rename to sdk/net/http/auth/bearer_credentials.cpp
index 2b5a5e49..30b167db 100644
--- a/sdk/net/http/bearer_credentials.cpp
+++ b/sdk/net/http/auth/bearer_credentials.cpp
@@ -8,17 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/basic_authentication_provider.hpp>
-#include <sdk/net/http/bearer_credentials.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/bearer_credentials.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/bearer_credentials.hpp b/sdk/net/http/auth/bearer_credentials.hpp
similarity index 96%
rename from sdk/net/http/bearer_credentials.hpp
rename to sdk/net/http/auth/bearer_credentials.hpp
index 6d6e8b7d..ea84a636 100644
--- a/sdk/net/http/bearer_credentials.hpp
+++ b/sdk/net/http/auth/bearer_credentials.hpp
@@ -14,7 +14,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/io.hpp>
 #include <string>
 
 namespace hotplace {
diff --git a/sdk/net/http/custom_credentials.cpp b/sdk/net/http/auth/custom_credentials.cpp
similarity index 74%
rename from sdk/net/http/custom_credentials.cpp
rename to sdk/net/http/auth/custom_credentials.cpp
index 1c03d2be..fdd8766d 100644
--- a/sdk/net/http/custom_credentials.cpp
+++ b/sdk/net/http/auth/custom_credentials.cpp
@@ -8,17 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/basic_authentication_provider.hpp>
-#include <sdk/net/http/custom_credentials.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/custom_credentials.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/custom_credentials.hpp b/sdk/net/http/auth/custom_credentials.hpp
similarity index 92%
rename from sdk/net/http/custom_credentials.hpp
rename to sdk/net/http/auth/custom_credentials.hpp
index 2de1de1c..6d32eaae 100644
--- a/sdk/net/http/custom_credentials.hpp
+++ b/sdk/net/http/auth/custom_credentials.hpp
@@ -14,13 +14,12 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/net/http/http_authentication_provider.hpp>
 #include <string>
 
 namespace hotplace {
 namespace net {
 
-class http_authenticate_provider;
 class custom_credentials {
    public:
     custom_credentials();
diff --git a/sdk/net/http/digest_access_authentication_provider.cpp b/sdk/net/http/auth/digest_access_authentication_provider.cpp
similarity index 95%
rename from sdk/net/http/digest_access_authentication_provider.cpp
rename to sdk/net/http/auth/digest_access_authentication_provider.cpp
index fbe37dc4..2ca3906c 100644
--- a/sdk/net/http/digest_access_authentication_provider.cpp
+++ b/sdk/net/http/auth/digest_access_authentication_provider.cpp
@@ -8,19 +8,11 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/digest_access_authentication_provider.hpp>
-#include <sdk/net/http/http_authentication_resolver.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/digest_access_authentication_provider.hpp>
+#include <sdk/net/http/auth/rfc2617_digest.hpp>
 #include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/http/rfc2617_digest.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/digest_access_authentication_provider.hpp b/sdk/net/http/auth/digest_access_authentication_provider.hpp
similarity index 95%
rename from sdk/net/http/digest_access_authentication_provider.hpp
rename to sdk/net/http/auth/digest_access_authentication_provider.hpp
index 09f82839..2b1e82bf 100644
--- a/sdk/net/http/digest_access_authentication_provider.hpp
+++ b/sdk/net/http/auth/digest_access_authentication_provider.hpp
@@ -21,12 +21,11 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/net/http/digest_credentials.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/http/rfc2617_digest.hpp>
-#include <sdk/net/server/network_protocol.hpp>
+#include <sdk/net/http/http_authentication_resolver.hpp>
+#include <sdk/net/http/http_request.hpp>
+#include <sdk/net/http/http_response.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/digest_credentials.cpp b/sdk/net/http/auth/digest_credentials.cpp
similarity index 82%
rename from sdk/net/http/digest_credentials.cpp
rename to sdk/net/http/auth/digest_credentials.cpp
index af29bb80..98bd1e44 100644
--- a/sdk/net/http/digest_credentials.cpp
+++ b/sdk/net/http/auth/digest_credentials.cpp
@@ -8,18 +8,12 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/digest_access_authentication_provider.hpp>
-#include <sdk/net/http/digest_credentials.hpp>
-#include <sdk/net/http/rfc2617_digest.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/digest_access_authentication_provider.hpp>
+#include <sdk/net/http/auth/digest_credentials.hpp>
+#include <sdk/net/http/auth/rfc2617_digest.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/digest_credentials.hpp b/sdk/net/http/auth/digest_credentials.hpp
similarity index 96%
rename from sdk/net/http/digest_credentials.hpp
rename to sdk/net/http/auth/digest_credentials.hpp
index e8450724..5d6d99f6 100644
--- a/sdk/net/http/digest_credentials.hpp
+++ b/sdk/net/http/auth/digest_credentials.hpp
@@ -14,7 +14,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/io.hpp>
 #include <string>
 
 namespace hotplace {
diff --git a/sdk/net/http/oauth2.cpp b/sdk/net/http/auth/oauth2.cpp
similarity index 97%
rename from sdk/net/http/oauth2.cpp
rename to sdk/net/http/auth/oauth2.cpp
index a711f41c..55d7d590 100644
--- a/sdk/net/http/oauth2.cpp
+++ b/sdk/net/http/auth/oauth2.cpp
@@ -9,21 +9,9 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/json.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/http/http_authentication_resolver.hpp>
-#include <sdk/net/http/http_resource.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/net/http/auth/oauth2.hpp>
 #include <sdk/net/http/http_router.hpp>
-#include <sdk/net/http/oauth2.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/oauth2.hpp b/sdk/net/http/auth/oauth2.hpp
similarity index 96%
rename from sdk/net/http/oauth2.hpp
rename to sdk/net/http/auth/oauth2.hpp
index 5384b0f1..0f07b37a 100644
--- a/sdk/net/http/oauth2.hpp
+++ b/sdk/net/http/auth/oauth2.hpp
@@ -11,13 +11,13 @@
 #ifndef __HOTPLACE_SDK_NET_HTTP_OAUTH2__
 #define __HOTPLACE_SDK_NET_HTTP_OAUTH2__
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/oauth2_credentials.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/http/oauth2_credentials.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/net/http/http_request.hpp>
+#include <sdk/net/http/http_response.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/oauth2_credentials.cpp b/sdk/net/http/auth/oauth2_credentials.cpp
similarity index 95%
rename from sdk/net/http/oauth2_credentials.cpp
rename to sdk/net/http/auth/oauth2_credentials.cpp
index 8863ad4b..6506e529 100644
--- a/sdk/net/http/oauth2_credentials.cpp
+++ b/sdk/net/http/auth/oauth2_credentials.cpp
@@ -9,19 +9,11 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/http/http_authentication_resolver.hpp>
-#include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/http/oauth2.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/net/http/auth/oauth2.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/oauth2_credentials.hpp b/sdk/net/http/auth/oauth2_credentials.hpp
similarity index 97%
rename from sdk/net/http/oauth2_credentials.hpp
rename to sdk/net/http/auth/oauth2_credentials.hpp
index 2fbec3b3..50e7de17 100644
--- a/sdk/net/http/oauth2_credentials.hpp
+++ b/sdk/net/http/auth/oauth2_credentials.hpp
@@ -11,13 +11,8 @@
 #ifndef __HOTPLACE_SDK_NET_HTTP_OAUTH2_CREDENTIALS__
 #define __HOTPLACE_SDK_NET_HTTP_OAUTH2_CREDENTIALS__
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/base/system/datetime.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/tls/tls.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/rfc2617_digest.cpp b/sdk/net/http/auth/rfc2617_digest.cpp
similarity index 90%
rename from sdk/net/http/rfc2617_digest.cpp
rename to sdk/net/http/auth/rfc2617_digest.cpp
index 6ae4e427..58e14fe1 100644
--- a/sdk/net/http/rfc2617_digest.cpp
+++ b/sdk/net/http/auth/rfc2617_digest.cpp
@@ -8,13 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/http/rfc2617_digest.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/rfc2617_digest.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/rfc2617_digest.hpp b/sdk/net/http/auth/rfc2617_digest.hpp
similarity index 96%
rename from sdk/net/http/rfc2617_digest.hpp
rename to sdk/net/http/auth/rfc2617_digest.hpp
index df47650b..80246a7c 100644
--- a/sdk/net/http/rfc2617_digest.hpp
+++ b/sdk/net/http/auth/rfc2617_digest.hpp
@@ -14,7 +14,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/io.hpp>
 #include <string>
 
 namespace hotplace {
diff --git a/sdk/net/http/html_documents.cpp b/sdk/net/http/html_documents.cpp
index 28509061..1c76687c 100644
--- a/sdk/net/http/html_documents.cpp
+++ b/sdk/net/http/html_documents.cpp
@@ -9,16 +9,8 @@
  */
 
 #include <sdk/base.hpp>
-#include <sdk/base/inline.hpp>
-#include <sdk/base/string/string.hpp>
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/stream/file_stream.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/html_documents.hpp>
-#include <sdk/net/http/http_router.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/html_documents.hpp b/sdk/net/http/html_documents.hpp
index ae0a2285..049967ea 100644
--- a/sdk/net/http/html_documents.hpp
+++ b/sdk/net/http/html_documents.hpp
@@ -21,10 +21,10 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/server/network_protocol.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/http_request.hpp>
+#include <sdk/net/http/http_response.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http2/hpack.cpp b/sdk/net/http/http2/hpack.cpp
new file mode 100644
index 00000000..6763c8b8
--- /dev/null
+++ b/sdk/net/http/http2/hpack.cpp
@@ -0,0 +1,21 @@
+/* vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab smarttab : */
+/**
+ * @file {file}
+ * @author Soo Han, Kim (princeb612.kr@gmail.com)
+ * @desc
+ *
+ * Revision History
+ * Date         Name                Description
+ */
+
+#include <sdk/net/basic/sdk.hpp>
+#include <sdk/net/http/http2/hpack.hpp>
+
+namespace hotplace {
+using namespace io;
+namespace net {
+
+// study
+
+}  // namespace net
+}  // namespace hotplace
diff --git a/sdk/net/http/http2/hpack.hpp b/sdk/net/http/http2/hpack.hpp
new file mode 100644
index 00000000..fbd0a598
--- /dev/null
+++ b/sdk/net/http/http2/hpack.hpp
@@ -0,0 +1,27 @@
+/* vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab smarttab : */
+/**
+ * @file {file}
+ * @author Soo Han, Kim (princeb612.kr@gmail.com)
+ * @desc
+ *
+ * Revision History
+ * Date         Name                Description
+ */
+
+#ifndef __HOTPLACE_SDK_NET_HTTP_HTTP2_HPACK__
+#define __HOTPLACE_SDK_NET_HTTP_HTTP2_HPACK__
+
+#include <sdk/base.hpp>
+#include <sdk/base/stream/basic_stream.hpp>
+#include <sdk/net/http/http2/http2_frame.hpp>
+#include <sdk/net/server/network_protocol.hpp>
+
+namespace hotplace {
+namespace net {
+
+// study
+
+}  // namespace net
+}  // namespace hotplace
+
+#endif
diff --git a/sdk/net/http/http2_frame.cpp b/sdk/net/http/http2/http2_frame.cpp
similarity index 97%
rename from sdk/net/http/http2_frame.cpp
rename to sdk/net/http/http2/http2_frame.cpp
index b4ce3379..d8744ee7 100644
--- a/sdk/net/http/http2_frame.cpp
+++ b/sdk/net/http/http2/http2_frame.cpp
@@ -13,8 +13,8 @@
 #include <sdk/io/string/string.hpp>
 #include <sdk/io/system/types.hpp>
 #include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http2_frame.hpp>
-#include <sdk/net/http/http2_protocol.hpp>
+#include <sdk/net/http/http2/http2_frame.hpp>
+#include <sdk/net/http/http2/http2_protocol.hpp>
 #include <sdk/net/http/http_resource.hpp>
 #include <sdk/net/tls/tls.hpp>
 
@@ -157,10 +157,10 @@ void http2_frame_header::dump(stream_t* s) {
 
         s->printf("- http/2 frame type %d %s\n", get_type(), frame_name.c_str());
         s->printf("> ");
-        s->printf("%s %u", constexpr_frame_length, get_payload_size());
-        s->printf("%s %u", constexpr_frame_type, get_type());
-        s->printf("%s %02x", constexpr_frame_flags, get_flags());
-        s->printf("%s %u", constexpr_frame_stream_identifier, get_stream_id());
+        s->printf("%s %u ", constexpr_frame_length, get_payload_size());
+        s->printf("%s %u ", constexpr_frame_type, get_type());
+        s->printf("%s %02x ", constexpr_frame_flags, get_flags());
+        s->printf("%s %u ", constexpr_frame_stream_identifier, get_stream_id());
         s->printf("\n");
         s->printf("> %s [ ", constexpr_frame_flags);
 
@@ -560,8 +560,10 @@ void http2_settings_frame::dump(stream_t* s) {
 
         h2_setting_map_t::iterator iter;
         for (iter = _settings.begin(); iter != _settings.end(); iter++) {
-            s->printf("> %s %u\n", constexpr_frame_identifier, iter->first);
-            s->printf("> %s %u (0x%08x)\n", constexpr_frame_value, iter->second, iter->second);
+            s->printf("> ");
+            s->printf("%s %u ", constexpr_frame_identifier, iter->first);
+            s->printf("%s %u (0x%08x) ", constexpr_frame_value, iter->second, iter->second);
+            s->printf("\n");
         }
     }
 }
diff --git a/sdk/net/http/http2_frame.hpp b/sdk/net/http/http2/http2_frame.hpp
similarity index 100%
rename from sdk/net/http/http2_frame.hpp
rename to sdk/net/http/http2/http2_frame.hpp
diff --git a/sdk/net/http/http2_protocol.cpp b/sdk/net/http/http2/http2_protocol.cpp
similarity index 99%
rename from sdk/net/http/http2_protocol.cpp
rename to sdk/net/http/http2/http2_protocol.cpp
index 4c7ea759..6ccbd113 100644
--- a/sdk/net/http/http2_protocol.cpp
+++ b/sdk/net/http/http2/http2_protocol.cpp
@@ -12,7 +12,7 @@
 #include <sdk/io/basic/zlib.hpp>
 #include <sdk/io/string/string.hpp>
 #include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http2_protocol.hpp>
+#include <sdk/net/http/http2/http2_protocol.hpp>
 #include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/http/http2_protocol.hpp b/sdk/net/http/http2/http2_protocol.hpp
similarity index 97%
rename from sdk/net/http/http2_protocol.hpp
rename to sdk/net/http/http2/http2_protocol.hpp
index a39bd8ae..23c10b09 100644
--- a/sdk/net/http/http2_protocol.hpp
+++ b/sdk/net/http/http2/http2_protocol.hpp
@@ -13,7 +13,7 @@
 
 #include <sdk/base.hpp>
 #include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/net/http/http2_frame.hpp>
+#include <sdk/net/http/http2/http2_frame.hpp>
 #include <sdk/net/server/network_protocol.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/http/http_authentication_provider.cpp b/sdk/net/http/http_authentication_provider.cpp
index 484daace..d4b36b4e 100644
--- a/sdk/net/http/http_authentication_provider.cpp
+++ b/sdk/net/http/http_authentication_provider.cpp
@@ -8,18 +8,11 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/sdk.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/http/http_authentication_resolver.hpp>
-#include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/http_authentication_provider.hpp b/sdk/net/http/http_authentication_provider.hpp
index 2a7db2b9..9f743c82 100644
--- a/sdk/net/http/http_authentication_provider.hpp
+++ b/sdk/net/http/http_authentication_provider.hpp
@@ -21,11 +21,10 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_request.hpp>
 #include <sdk/net/http/http_response.hpp>
-#include <sdk/net/server/network_protocol.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_authentication_resolver.cpp b/sdk/net/http/http_authentication_resolver.cpp
index 5f412122..e77e1d2b 100644
--- a/sdk/net/http/http_authentication_resolver.cpp
+++ b/sdk/net/http/http_authentication_resolver.cpp
@@ -8,16 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/crypto/basic/crypto_advisor.hpp>
-#include <sdk/crypto/basic/openssl_hash.hpp>
-#include <sdk/crypto/basic/openssl_prng.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_authentication_resolver.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace crypto;
diff --git a/sdk/net/http/http_authentication_resolver.hpp b/sdk/net/http/http_authentication_resolver.hpp
index 56612486..52b32dfe 100644
--- a/sdk/net/http/http_authentication_resolver.hpp
+++ b/sdk/net/http/http_authentication_resolver.hpp
@@ -21,17 +21,17 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/net/http/basic_authentication_provider.hpp>
-#include <sdk/net/http/basic_credentials.hpp>
-#include <sdk/net/http/bearer_authentication_provider.hpp>
-#include <sdk/net/http/bearer_credentials.hpp>
-#include <sdk/net/http/custom_credentials.hpp>
-#include <sdk/net/http/digest_access_authentication_provider.hpp>
-#include <sdk/net/http/digest_credentials.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/basic_authentication_provider.hpp>
+#include <sdk/net/http/auth/basic_credentials.hpp>
+#include <sdk/net/http/auth/bearer_authentication_provider.hpp>
+#include <sdk/net/http/auth/bearer_credentials.hpp>
+#include <sdk/net/http/auth/custom_credentials.hpp>
+#include <sdk/net/http/auth/digest_access_authentication_provider.hpp>
+#include <sdk/net/http/auth/digest_credentials.hpp>
+#include <sdk/net/http/auth/oauth2.hpp>
+#include <sdk/net/http/auth/oauth2_credentials.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
-#include <sdk/net/http/oauth2.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_client.cpp b/sdk/net/http/http_client.cpp
index ca0a886f..a09a0d15 100644
--- a/sdk/net/http/http_client.cpp
+++ b/sdk/net/http/http_client.cpp
@@ -8,14 +8,11 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/sdk.hpp>
 #include <sdk/net/http/http_client.hpp>
 #include <sdk/net/http/http_protocol.hpp>
-#include <sdk/net/server/network_stream.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_client.hpp b/sdk/net/http/http_client.hpp
index d6782062..f1e6c794 100644
--- a/sdk/net/http/http_client.hpp
+++ b/sdk/net/http/http_client.hpp
@@ -21,9 +21,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/client_socket.hpp>
 #include <sdk/net/http/http_request.hpp>
 #include <sdk/net/http/http_response.hpp>
diff --git a/sdk/net/http/http_header.cpp b/sdk/net/http/http_header.cpp
index 07d1e86e..1c7c1c7d 100644
--- a/sdk/net/http/http_header.cpp
+++ b/sdk/net/http/http_header.cpp
@@ -8,12 +8,9 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_header.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_header.hpp b/sdk/net/http/http_header.hpp
index fd287c9d..5ffe1659 100644
--- a/sdk/net/http/http_header.hpp
+++ b/sdk/net/http/http_header.hpp
@@ -21,13 +21,8 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/client_socket.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/types.hpp>
-#include <sdk/net/server/network_protocol.hpp>
-#include <sdk/net/tls/tls_client.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_protocol.cpp b/sdk/net/http/http_protocol.cpp
index 40ac3ddf..28670462 100644
--- a/sdk/net/http/http_protocol.cpp
+++ b/sdk/net/http/http_protocol.cpp
@@ -10,7 +10,6 @@
 
 #include <sdk/net/basic/sdk.hpp>
 #include <sdk/net/http/http_protocol.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 namespace net {
diff --git a/sdk/net/http/http_protocol.hpp b/sdk/net/http/http_protocol.hpp
index fac12a49..15add0f8 100644
--- a/sdk/net/http/http_protocol.hpp
+++ b/sdk/net/http/http_protocol.hpp
@@ -12,7 +12,6 @@
 #define __HOTPLACE_SDK_NET_HTTP_PROTOCOL__
 
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
 #include <sdk/net/server/network_protocol.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/http/http_request.cpp b/sdk/net/http/http_request.cpp
index 8a446550..00f4648e 100644
--- a/sdk/net/http/http_request.cpp
+++ b/sdk/net/http/http_request.cpp
@@ -8,13 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_request.hpp>
 #include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_request.hpp b/sdk/net/http/http_request.hpp
index f57328ae..61424595 100644
--- a/sdk/net/http/http_request.hpp
+++ b/sdk/net/http/http_request.hpp
@@ -21,15 +21,10 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/client_socket.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_header.hpp>
 #include <sdk/net/http/http_uri.hpp>
 #include <sdk/net/http/types.hpp>
-#include <sdk/net/server/network_protocol.hpp>
-#include <sdk/net/tls/tls_client.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_resource.cpp b/sdk/net/http/http_resource.cpp
index cc2ae1c9..422d930a 100644
--- a/sdk/net/http/http_resource.cpp
+++ b/sdk/net/http/http_resource.cpp
@@ -8,13 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http2_protocol.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/http2/http2_protocol.hpp>
 #include <sdk/net/http/http_resource.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_resource.hpp b/sdk/net/http/http_resource.hpp
index f1e6993a..250a59d8 100644
--- a/sdk/net/http/http_resource.hpp
+++ b/sdk/net/http/http_resource.hpp
@@ -21,13 +21,8 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/client_socket.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/types.hpp>
-#include <sdk/net/server/network_protocol.hpp>
-#include <sdk/net/tls/tls_client.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_response.cpp b/sdk/net/http/http_response.cpp
index 51ecb3ef..bb403c95 100644
--- a/sdk/net/http/http_response.cpp
+++ b/sdk/net/http/http_response.cpp
@@ -8,14 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_resource.hpp>
 #include <sdk/net/http/http_response.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_response.hpp b/sdk/net/http/http_response.hpp
index 7142deb7..6715695f 100644
--- a/sdk/net/http/http_response.hpp
+++ b/sdk/net/http/http_response.hpp
@@ -21,15 +21,11 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/client_socket.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_header.hpp>
 #include <sdk/net/http/http_request.hpp>
 #include <sdk/net/http/http_uri.hpp>
-#include <sdk/net/server/network_protocol.hpp>
-#include <sdk/net/tls/tls_client.hpp>
+#include <sdk/net/server/network_session.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_router.cpp b/sdk/net/http/http_router.cpp
index 771d2f6d..f9428ff2 100644
--- a/sdk/net/http/http_router.cpp
+++ b/sdk/net/http/http_router.cpp
@@ -8,17 +8,10 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/inline.hpp>
-#include <sdk/base/string/string.hpp>
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/stream/file_stream.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http_authentication_provider.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_resource.hpp>
 #include <sdk/net/http/http_router.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_router.hpp b/sdk/net/http/http_router.hpp
index 26d7a005..eb283252 100644
--- a/sdk/net/http/http_router.hpp
+++ b/sdk/net/http/http_router.hpp
@@ -21,13 +21,11 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/http/auth/oauth2.hpp>
 #include <sdk/net/http/html_documents.hpp>
 #include <sdk/net/http/http_authentication_provider.hpp>
 #include <sdk/net/http/http_authentication_resolver.hpp>
-#include <sdk/net/http/oauth2.hpp>
-#include <sdk/net/server/network_protocol.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_server.cpp b/sdk/net/http/http_server.cpp
index 1527a765..6c4643f3 100644
--- a/sdk/net/http/http_server.cpp
+++ b/sdk/net/http/http_server.cpp
@@ -8,14 +8,9 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/ipaddr_acl.hpp>
-#include <sdk/net/basic/sdk.hpp>
-#include <sdk/net/http/http_protocol.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_server.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_server.hpp b/sdk/net/http/http_server.hpp
index 825d85ea..1f4c40db 100644
--- a/sdk/net/http/http_server.hpp
+++ b/sdk/net/http/http_server.hpp
@@ -19,9 +19,13 @@
 #ifndef __HOTPLACE_SDK_NET_HTTP_HTTPSERVER__
 #define __HOTPLACE_SDK_NET_HTTP_HTTPSERVER__
 
+#include <sdk/net/basic/ipaddr_acl.hpp>
+#include <sdk/net/http/http_protocol.hpp>
 #include <sdk/net/http/http_router.hpp>
 #include <sdk/net/server/network_server.hpp>
+#include <sdk/net/tls/tls.hpp>
 #include <sdk/net/tls/tls_server.hpp>
+#include <sdk/net/types.hpp>  // ws2tcpip.h first
 
 namespace hotplace {
 namespace net {
diff --git a/sdk/net/http/http_uri.cpp b/sdk/net/http/http_uri.cpp
index df5d05b4..a4d650d1 100644
--- a/sdk/net/http/http_uri.cpp
+++ b/sdk/net/http/http_uri.cpp
@@ -8,12 +8,9 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/io/basic/zlib.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/sdk.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/http/http_uri.hpp>
-#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/http_uri.hpp b/sdk/net/http/http_uri.hpp
index b33d0dab..96a0e5b8 100644
--- a/sdk/net/http/http_uri.hpp
+++ b/sdk/net/http/http_uri.hpp
@@ -21,13 +21,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/client_socket.hpp>
-#include <sdk/net/http/types.hpp>
-#include <sdk/net/server/network_protocol.hpp>
-#include <sdk/net/tls/tls_client.hpp>
+#include <sdk/io.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/http/types.hpp b/sdk/net/http/types.hpp
index 216da8e9..61416d71 100644
--- a/sdk/net/http/types.hpp
+++ b/sdk/net/http/types.hpp
@@ -21,12 +21,7 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/string/string.hpp>
-#include <sdk/net/basic/client_socket.hpp>
-#include <sdk/net/server/network_protocol.hpp>
-#include <sdk/net/tls/tls_client.hpp>
+#include <sdk/io.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/server/network_protocol.cpp b/sdk/net/server/network_protocol.cpp
index 368a448d..8227b7b8 100644
--- a/sdk/net/server/network_protocol.cpp
+++ b/sdk/net/server/network_protocol.cpp
@@ -8,7 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
+#include <sdk/base.hpp>
 #include <sdk/net/server/network_protocol.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/server/network_protocol.hpp b/sdk/net/server/network_protocol.hpp
index fc9f800b..d2315bae 100644
--- a/sdk/net/server/network_protocol.hpp
+++ b/sdk/net/server/network_protocol.hpp
@@ -13,7 +13,6 @@
 
 #include <map>
 #include <sdk/base.hpp>
-#include <sdk/base/stream/basic_stream.hpp>
 #include <sdk/net/types.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/server/network_server.cpp b/sdk/net/server/network_server.cpp
index 57458643..528de96b 100644
--- a/sdk/net/server/network_server.cpp
+++ b/sdk/net/server/network_server.cpp
@@ -9,13 +9,9 @@
  */
 
 #include <queue>
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/base/system/datetime.hpp>
-#include <sdk/base/system/signalwait_threads.hpp>
-#include <sdk/io/system/multiplexer.hpp>
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/server/network_server.hpp>
-#include <sdk/net/server/network_session.hpp>
-#include <sdk/net/server/network_stream.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/sdk/net/server/network_server.hpp b/sdk/net/server/network_server.hpp
index 2cf9df8f..96372a5e 100644
--- a/sdk/net/server/network_server.hpp
+++ b/sdk/net/server/network_server.hpp
@@ -11,9 +11,13 @@
 #ifndef __HOTPLACE_SDK_NET_SERVER_NETWORKSERVER__
 #define __HOTPLACE_SDK_NET_SERVER_NETWORKSERVER__
 
+#include <sdk/base.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/basic/sdk.hpp>
 #include <sdk/net/basic/server_socket.hpp>
 #include <sdk/net/server/network_protocol.hpp>
+#include <sdk/net/server/network_session.hpp>
+#include <sdk/net/tls/tls.hpp>
 #include <sdk/net/types.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/server/network_session.cpp b/sdk/net/server/network_session.cpp
index c4fbcbe3..5706eff4 100644
--- a/sdk/net/server/network_session.cpp
+++ b/sdk/net/server/network_session.cpp
@@ -8,10 +8,8 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
-#include <sdk/net/basic/server_socket.hpp>
+#include <sdk/base.hpp>
 #include <sdk/net/server/network_session.hpp>
-#include <sdk/net/server/network_stream.hpp>
 
 namespace hotplace {
 namespace net {
diff --git a/sdk/net/server/network_session.hpp b/sdk/net/server/network_session.hpp
index 5ebf217d..f8d06c7b 100644
--- a/sdk/net/server/network_session.hpp
+++ b/sdk/net/server/network_session.hpp
@@ -11,17 +11,16 @@
 #ifndef __HOTPLACE_SDK_NET_SERVER_NETWORKSESSION__
 #define __HOTPLACE_SDK_NET_SERVER_NETWORKSESSION__
 
-#include <sdk/io/basic/keyvalue.hpp>
-#include <sdk/io/basic/mlfq.hpp>
+#include <sdk/io.hpp>
+#include <sdk/net/basic/server_socket.hpp>
+#include <sdk/net/server/network_protocol.hpp>
 #include <sdk/net/server/network_stream.hpp>
+#include <sdk/net/tls/tls.hpp>
 
 namespace hotplace {
 using namespace io;
 namespace net {
 
-class network_priority_queue;
-class tcp_server_socket;
-
 /**
  * @brief session data
  */
@@ -100,9 +99,9 @@ class network_session {
     virtual int release();
     /**
      * @brief produce, push into stream
-     * @param   network_priority_queue* q               [IN]
-     * @param   byte_t*                 buf_read        [IN]
-     * @param   size_t                  size_buf_read   [IN]
+     * @param   t_mlfq<network_session>*    q               [IN]
+     * @param   byte_t*                     buf_read        [IN]
+     * @param   size_t                      size_buf_read   [IN]
      * @remarks
      */
     return_t produce(t_mlfq<network_session>* q, byte_t* buf_read, size_t size_buf_read);
diff --git a/sdk/net/server/network_stream.cpp b/sdk/net/server/network_stream.cpp
index d28de831..b6c7439d 100644
--- a/sdk/net/server/network_stream.cpp
+++ b/sdk/net/server/network_stream.cpp
@@ -8,7 +8,8 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/system/critical_section.hpp>
+#include <sdk/base.hpp>
+#include <sdk/net/server/network_protocol.hpp>
 #include <sdk/net/server/network_stream.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/server/network_stream.hpp b/sdk/net/server/network_stream.hpp
index 61e8eaae..2336a69f 100644
--- a/sdk/net/server/network_stream.hpp
+++ b/sdk/net/server/network_stream.hpp
@@ -11,7 +11,7 @@
 #ifndef __HOTPLACE_SDK_NET_SERVER_NETWORKSTREAM__
 #define __HOTPLACE_SDK_NET_SERVER_NETWORKSTREAM__
 
-#include <sdk/net/server/network_protocol.hpp>
+#include <sdk/base.hpp>
 
 namespace hotplace {
 namespace net {
diff --git a/sdk/net/tls/sdk.cpp b/sdk/net/tls/sdk.cpp
index 345ae2a7..45551a8a 100644
--- a/sdk/net/tls/sdk.cpp
+++ b/sdk/net/tls/sdk.cpp
@@ -8,7 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/crypto/basic/openssl_sdk.hpp>
+#include <sdk/crypto.hpp>
 #include <sdk/net/basic/sdk.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/tls/sdk.hpp b/sdk/net/tls/sdk.hpp
index 67139f14..c48b8388 100644
--- a/sdk/net/tls/sdk.hpp
+++ b/sdk/net/tls/sdk.hpp
@@ -11,7 +11,7 @@
 #ifndef __HOTPLACE_SDK_NET_TLS_SDK__
 #define __HOTPLACE_SDK_NET_TLS_SDK__
 
-#include <sdk/crypto/basic/openssl_sdk.hpp>
+#include <sdk/crypto.hpp>
 #include <sdk/net/types.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/tls/tls.cpp b/sdk/net/tls/tls.cpp
index f92d3baa..ecb928f0 100644
--- a/sdk/net/tls/tls.cpp
+++ b/sdk/net/tls/tls.cpp
@@ -8,7 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/crypto/basic/openssl_sdk.hpp>
+#include <sdk/crypto.hpp>
 #include <sdk/net/basic/sdk.hpp>
 #include <sdk/net/tls/sdk.hpp>
 #include <sdk/net/tls/tls.hpp>
diff --git a/sdk/net/tls/tls.hpp b/sdk/net/tls/tls.hpp
index 9f43c1a8..1687c95e 100644
--- a/sdk/net/tls/tls.hpp
+++ b/sdk/net/tls/tls.hpp
@@ -11,7 +11,7 @@
 #ifndef __HOTPLACE_SDK_NET_TLS_TLS__
 #define __HOTPLACE_SDK_NET_TLS_TLS__
 
-#include <sdk/crypto/basic/types.hpp>
+#include <sdk/crypto.hpp>
 #include <sdk/net/tls/x509.hpp>
 #include <sdk/net/types.hpp>
 
diff --git a/sdk/net/tls/tls_server.cpp b/sdk/net/tls/tls_server.cpp
index ead5fa77..f293c439 100644
--- a/sdk/net/tls/tls_server.cpp
+++ b/sdk/net/tls/tls_server.cpp
@@ -8,7 +8,7 @@
  * Date         Name                Description
  */
 
-#include <sdk/crypto/basic/openssl_sdk.hpp>
+#include <sdk/crypto.hpp>
 #include <sdk/net/tls/tls_server.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/tls/x509.cpp b/sdk/net/tls/x509.cpp
index 083c3d0f..435afb1d 100644
--- a/sdk/net/tls/x509.cpp
+++ b/sdk/net/tls/x509.cpp
@@ -8,10 +8,9 @@
  * Date         Name                Description
  */
 
-#include <sdk/base/stream/basic_stream.hpp>
-#include <sdk/base/system/datetime.hpp>
-#include <sdk/crypto/basic/types.hpp>
-#include <sdk/io/stream/file_stream.hpp>
+#include <sdk/base.hpp>
+#include <sdk/crypto.hpp>
+#include <sdk/io.hpp>
 #include <sdk/net/tls/x509.hpp>
 
 namespace hotplace {
diff --git a/sdk/net/tls/x509.hpp b/sdk/net/tls/x509.hpp
index f47f7d8c..1cc823cd 100644
--- a/sdk/net/tls/x509.hpp
+++ b/sdk/net/tls/x509.hpp
@@ -11,7 +11,7 @@
 #ifndef __HOTPLACE_SDK_NET_TLS_X509__
 #define __HOTPLACE_SDK_NET_TLS_X509__
 
-#include <sdk/io/stream/stream.hpp>
+#include <sdk/io.hpp>
 
 namespace hotplace {
 using namespace io;
diff --git a/test/cose/sample.cpp b/test/cose/sample.cpp
index 5934dc63..98338017 100644
--- a/test/cose/sample.cpp
+++ b/test/cose/sample.cpp
@@ -22,13 +22,13 @@ using namespace hotplace::crypto;
 
 test_case _test_case;
 typedef struct _OPTION {
-    bool debug;
+    bool verbose;
     bool dump_keys;
     bool skip_cbor_basic;
     bool skip_validate;
     bool skip_gen;
 
-    _OPTION() : debug(false), dump_keys(false), skip_cbor_basic(false), skip_validate(false), skip_gen(false) {
+    _OPTION() : verbose(false), dump_keys(false), skip_cbor_basic(false), skip_validate(false), skip_gen(false) {
         // do nothing
     }
 } OPTION;
@@ -56,7 +56,7 @@ return_t dump_test_data(const char* text, binary_t const& cbor) {
     basic_stream bs;
 
     OPTION& option = _cmdline->value();
-    if (option.debug) {
+    if (option.verbose) {
         dump_memory(cbor, &bs, 32, 4);
 
         if (text) {
@@ -101,7 +101,7 @@ return_t test_cose_example(cose_context_t* cose_handle, crypto_key* cose_keys, c
         binary_t bin;
         publisher.publish(root, &bin);
 
-        if (option.debug) {
+        if (option.verbose) {
             // cbor_object* to diagnostic
             basic_stream diagnostic;
             // publisher.publish(root, &diagnostic);
@@ -214,7 +214,7 @@ return_t test_cose_example(cose_context_t* cose_handle, crypto_key* cose_keys, c
         binary_t decrypted;
         bool result = false;
 
-        if (option.debug) {
+        if (option.verbose) {
             cose.set(cose_handle, cose_flag_t::cose_flag_allow_debug);
         }
 
@@ -229,7 +229,7 @@ return_t test_cose_example(cose_context_t* cose_handle, crypto_key* cose_keys, c
                 case cbor_tag_t::cose_tag_encrypt0:
                     ret = cose.decrypt(cose_handle, cose_keys, bin, decrypted, result);
                     if (errorcode_t::success == ret) {
-                        if (option.debug) {
+                        if (option.verbose) {
                             basic_stream bs;
                             dump_memory(decrypted, &bs, 16, 4);
                             printf("%s\n", bs.c_str());
@@ -292,7 +292,7 @@ void test_cbor_file(const char* expect_file, const char* text) {
         reader.publish(handle, &root);
         reader.close(handle);
 
-        if (option.debug) {
+        if (option.verbose) {
             dump_test_data("diagnostic", bs_diagnostic);
             dump_test_data("cbor", bin_cbor);
         }
@@ -958,7 +958,7 @@ void test_cbor_key(const char* file, const char* text) {
         ret = cwk.write(&key, cbor_written);
         _test_case.test(ret, __FUNCTION__, "step.write %s", text ? text : "");
 
-        if (option.debug) {
+        if (option.verbose) {
             test_case_notimecheck notimecheck(_test_case);
 
             basic_stream bs;
@@ -1036,16 +1036,16 @@ void test_jose_from_cwk() {
     size_t size = 0;
     basic_stream json;
     jwk.write(&privkey, &json, 1);
-    if (option.debug) {
+    if (option.verbose) {
         printf("JWK from CBOR key\n%s\n", json.c_str());
     }
     basic_stream pem;
     jwk.write_pem(&pubkey, &pem);
-    if (option.debug) {
+    if (option.verbose) {
         printf("PEM (public)\n%s\n", pem.c_str());
     }
     jwk.write_pem(&privkey, &pem);
-    if (option.debug) {
+    if (option.verbose) {
         printf("PEM (private)\n%s\n", pem.c_str());
     }
 
@@ -1073,7 +1073,7 @@ void test_jose_from_cwk() {
     algs.push_back(cose_alg_t::cose_es512);
     ret = cose.sign(handle, &privkey, algs, convert(input), signature);
     _test_case.test(ret, __FUNCTION__, "sign");
-    if (option.debug) {
+    if (option.verbose) {
         test_case_notimecheck notimecheck(_test_case);
 
         dump_memory(signature, &bs);
@@ -1252,7 +1252,7 @@ void test_github_example() {
         reader.publish(reader_handle, &diagnostic);
         reader.publish(reader_handle, &bin_cbor);
         reader.close(reader_handle);
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(bin_cbor, &bs, 16, 2);
             printf("cbor\n%s\n", bs.c_str());
             printf("diagnostic\n  %s\n", diagnostic.c_str());
@@ -1285,7 +1285,7 @@ void test_github_example() {
         printf("\e[35m>%s %s\n%s\n\e[0m", b, f, bs.c_str()); \
     }
 
-        if (option.debug) {
+        if (option.verbose) {
             cose.set(handle, cose_flag_t::cose_flag_allow_debug);
 
             dumps("AAD", vector->enc.aad_hex);
@@ -1346,7 +1346,7 @@ void test_github_example() {
         binary_t output;
         ret = cose.process(handle, mapped_key, cbor, output);
 
-        if (option.debug) {
+        if (option.verbose) {
             uint32 flags = 0;
             uint32 debug_flags = 0;
             cose.get(handle, flags, debug_flags);
@@ -1405,18 +1405,18 @@ void test_sign(crypto_key* key, std::list<cose_alg_t>& algs, binary_t const& inp
     binary_t cbor;
     binary_t dummy;
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.sign(handle, key, algs, input, cbor);
-    if (option.debug) {
+    if (option.verbose) {
         printf("%s\n", base16_encode(cbor).c_str());
     }
     cose.close(handle);
     _test_case.test(ret, __FUNCTION__, "sign %s", text);
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.process(handle, key, cbor, dummy);
@@ -1434,18 +1434,18 @@ void test_encrypt(crypto_key* key, std::list<cose_alg_t>& algs, binary_t const&
     binary_t cbor;
     binary_t dummy;
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.encrypt(handle, key, algs, input, cbor);
-    if (option.debug) {
+    if (option.verbose) {
         printf("%s\n", base16_encode(cbor).c_str());
     }
     cose.close(handle);
     _test_case.test(ret, __FUNCTION__, "encrypt %s", text);
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.process(handle, key, cbor, dummy);
@@ -1463,18 +1463,18 @@ void test_mac(crypto_key* key, std::list<cose_alg_t>& algs, binary_t const& inpu
     binary_t cbor;
     binary_t dummy;
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.mac(handle, key, algs, input, cbor);
-    if (option.debug) {
+    if (option.verbose) {
         printf("%s\n", base16_encode(cbor).c_str());
     }
     cose.close(handle);
     _test_case.test(ret, __FUNCTION__, "mac %s", text);
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.process(handle, key, cbor, dummy);
@@ -1565,7 +1565,7 @@ void test_cose_encrypt(crypto_key* key, cose_alg_t alg, cose_alg_t keyalg, binar
     OPTION& option = _cmdline->value();
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
 
@@ -1577,7 +1577,7 @@ void test_cose_encrypt(crypto_key* key, cose_alg_t alg, cose_alg_t keyalg, binar
         recipient.get_protected().add(cose_key_t::cose_alg, keyalg);
 
         // fill others and compose
-        ret = cose.encrypt2(handle, key, input, cbor);
+        ret = cose.encrypt(handle, key, input, cbor);
     }
 
     cose.close(handle);
@@ -1594,7 +1594,7 @@ void test_cose_sign(crypto_key* key, cose_alg_t alg, cose_alg_t keyalg, binary_t
     OPTION& option = _cmdline->value();
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
 
@@ -1603,7 +1603,7 @@ void test_cose_sign(crypto_key* key, cose_alg_t alg, cose_alg_t keyalg, binary_t
     body.get_protected().add(cose_key_t::cose_alg, alg);
 
     // fill others and compose
-    ret = cose.encrypt2(handle, key, input, cbor);
+    ret = cose.encrypt(handle, key, input, cbor);
 
     cose.close(handle);
 
@@ -1619,7 +1619,7 @@ void test_cose_mac(crypto_key* key, cose_alg_t alg, cose_alg_t keyalg, binary_t
     OPTION& option = _cmdline->value();
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
 
@@ -1631,7 +1631,7 @@ void test_cose_mac(crypto_key* key, cose_alg_t alg, cose_alg_t keyalg, binary_t
         recipient.get_protected().add(cose_key_t::cose_alg, keyalg);
 
         // fill others and compose
-        ret = cose.encrypt2(handle, key, input, cbor);
+        ret = cose.encrypt(handle, key, input, cbor);
     }
 
     cose.close(handle);
@@ -1727,7 +1727,7 @@ void test_cwt_rfc8392() {
     binary_t output;
 
     cose.open(&handle);
-    if (option.debug) {
+    if (option.verbose) {
         cose.set(handle, cose_flag_t::cose_flag_allow_debug);
     }
     ret = cose.verify(handle, &key, base16_decode(cwt_signed), result);
@@ -1749,7 +1749,7 @@ int main(int argc, char** argv) {
 #endif
 
     _cmdline.make_share(new cmdline_t<OPTION>);
-    *_cmdline << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = true; }).optional();
+    *_cmdline << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = true; }).optional();
     *_cmdline << cmdarg_t<OPTION>("-k", "dump keys", [&](OPTION& o, char* param) -> void { o.dump_keys = true; }).optional();
     *_cmdline << cmdarg_t<OPTION>("-b", "skip basic encoding", [&](OPTION& o, char* param) -> void { o.skip_cbor_basic = true; }).optional();
     *_cmdline << cmdarg_t<OPTION>("-s", "skip validation w/ test vector", [&](OPTION& o, char* param) -> void { o.skip_validate = true; }).optional();
@@ -1757,12 +1757,12 @@ int main(int argc, char** argv) {
     (*_cmdline).parse(argc, argv);
 
     OPTION& option = _cmdline->value();
-    std::cout << "option.debug " << (option.debug ? 1 : 0) << std::endl;
+    std::cout << "option.verbose " << (option.verbose ? 1 : 0) << std::endl;
     std::cout << "option.dump_keys " << (option.dump_keys ? 1 : 0) << std::endl;
     std::cout << "option.skip_validate " << (option.skip_validate ? 1 : 0) << std::endl;
     std::cout << "option.skip_gen " << (option.skip_gen ? 1 : 0) << std::endl;
 
-    if (option.debug) {
+    if (option.verbose) {
         set_trace_option(trace_option_t::trace_bt | trace_option_t::trace_except);
     }
 
diff --git a/test/crypto/sample.cpp b/test/crypto/sample.cpp
index 42ea4a3a..a6ffdf3b 100644
--- a/test/crypto/sample.cpp
+++ b/test/crypto/sample.cpp
@@ -22,9 +22,9 @@ using namespace hotplace::crypto;
 test_case _test_case;
 
 typedef struct _OPTION {
-    int debug;
+    int verbose;
 
-    _OPTION() : debug(0) {}
+    _OPTION() : verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -47,7 +47,7 @@ void validate_openssl_crypt() {
         crypt.decrypt(handle, base16_decode(vector->ciphertext), plaintext);
         crypt.close(handle);
 
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(ciphertext, &bs);
             printf("Ciphertext\n%s\n", bs.c_str());
             dump_memory(plaintext, &bs);
@@ -101,7 +101,7 @@ void test_crypt_routine(crypt_t* crypt_object, crypt_algorithm_t algorithm, cryp
                 } else {
                     aad.insert(aad.end(), aad_source, aad_source + aad_size);
 
-                    if (option.debug) {
+                    if (option.verbose) {
                         std::cout << "aad" << std::endl;
                         dump_memory(&aad[0], aad.size(), &bs);
                         std::cout << bs.c_str() << std::endl;
@@ -112,7 +112,7 @@ void test_crypt_routine(crypt_t* crypt_object, crypt_algorithm_t algorithm, cryp
                 if (errorcode_t::success == ret) {
                     ret = crypt_object->decrypt2(crypt_handle, &encrypted[0], encrypted.size(), decrypted, &aad, &tag);
                     if (errorcode_t::success == ret) {
-                        if (option.debug) {
+                        if (option.verbose) {
                             test_case_notimecheck notimecheck(_test_case);
 
                             std::cout << "encrypted" << std::endl;
@@ -235,7 +235,7 @@ void test_random() {
 
     for (i = 0; i < times; i++) {
         value = random.rand32();
-        if (option.debug) {
+        if (option.verbose) {
             printf("rand %08x\n", (int)value);
         }
     }
@@ -255,13 +255,13 @@ void test_nonce() {
 
     for (i = 0; i < times; i++) {
         nonce = random.nonce(16);
-        if (option.debug) {
+        if (option.verbose) {
             printf("nonce.1 %s\n", nonce.c_str());
         }
     }
     for (i = 0; i < times; i++) {
         nonce = random.rand(16, encoding_t::encoding_base16, true);
-        if (option.debug) {
+        if (option.verbose) {
             printf("nonce.2 %s\n", nonce.c_str());
         }
     }
@@ -281,13 +281,13 @@ void test_token() {
 
     for (i = 0; i < times; i++) {
         token = random.token(16);
-        if (option.debug) {
+        if (option.verbose) {
             printf("token.1 %s\n", token.c_str());
         }
     }
     for (i = 0; i < times; i++) {
         token = random.rand(16, encoding_t::encoding_base64url, true);
-        if (option.debug) {
+        if (option.verbose) {
             printf("token.2 %s\n", token.c_str());
         }
     }
@@ -322,7 +322,7 @@ void test_keywrap_rfc3394_testvector(const test_vector_rfc3394_t* vector) {
     if (errorcode_t::success == ret) {
         crypt.encrypt(handle, &key[0], key.size(), out_kw);
 
-        if (option.debug) {
+        if (option.verbose) {
             test_case_notimecheck notimecheck(_test_case);
 
             crypto_advisor* advisor = crypto_advisor::get_instance();
@@ -339,7 +339,7 @@ void test_keywrap_rfc3394_testvector(const test_vector_rfc3394_t* vector) {
 
         crypt.decrypt(handle, &out_kw[0], out_kw.size(), out_kuw);
 
-        if (option.debug) {
+        if (option.verbose) {
             test_case_notimecheck notimecheck(_test_case);
 
             dump_memory(&out_kuw[0], out_kuw.size(), &bs);
@@ -392,7 +392,7 @@ void test_chacha20_rfc7539_testvector(const test_vector_rfc7539_t* vector) {
         }
     }
 
-    if (option.debug) {
+    if (option.verbose) {
         test_case_notimecheck notimecheck(_test_case);
 
         dump_memory(key, &bs, 16, 2);
@@ -530,7 +530,7 @@ return_t test_aead_aes_cbc_hmac_sha2_testvector1(const test_vector_aead_aes_cbc_
         /* S = IV || Q */
         s.insert(s.end(), iv.begin(), iv.end());
         s.insert(s.end(), q.begin(), q.end());
-        if (option.debug) {
+        if (option.verbose) {
             dump(s);
         }
 
@@ -554,7 +554,7 @@ return_t test_aead_aes_cbc_hmac_sha2_testvector1(const test_vector_aead_aes_cbc_
         c.insert(c.end(), s.begin(), s.end());
         c.insert(c.end(), t.begin(), t.end());
 
-        if (option.debug) {
+        if (option.verbose) {
             test_case_notimecheck notimecheck(_test_case);
 
             dump(k);
@@ -588,7 +588,7 @@ void test_aead_aes_cbc_hmac_sha2_testvector2(const test_vector_aead_aes_cbc_hmac
     binary_t t;
     ret = aead.aes_cbc_hmac_sha2_encrypt(vector->enc_alg, vector->mac_alg, base16_decode(vector->k), base16_decode(vector->iv), base16_decode(vector->a),
                                          base16_decode(vector->p), q, t);
-    if (option.debug) {
+    if (option.verbose) {
         test_case_notimecheck notimecheck(_test_case);
         dump_memory(q, &bs);
         printf("%s\n", bs.c_str());
@@ -597,7 +597,7 @@ void test_aead_aes_cbc_hmac_sha2_testvector2(const test_vector_aead_aes_cbc_hmac
     binary_t p;
     ret = aead.aes_cbc_hmac_sha2_decrypt(vector->enc_alg, vector->mac_alg, base16_decode(vector->k), base16_decode(vector->iv), base16_decode(vector->a), q, p,
                                          t);
-    if (option.debug) {
+    if (option.verbose) {
         test_case_notimecheck notimecheck(_test_case);
         dump_memory(p, &bs);
         printf("%s\n", bs.c_str());
@@ -622,7 +622,7 @@ int main(int argc, char** argv) {
 #endif
 
     cmdline.make_share(new cmdline_t<OPTION>);
-    *cmdline << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional();
+    *cmdline << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional();
 
     cmdline->parse(argc, argv);
 
diff --git a/test/hash/sample.cpp b/test/hash/sample.cpp
index e2395f8d..1828e671 100644
--- a/test/hash/sample.cpp
+++ b/test/hash/sample.cpp
@@ -21,10 +21,10 @@ using namespace hotplace::crypto;
 
 test_case _test_case;
 typedef struct _OPTION {
-    bool debug;
+    bool verbose;
     bool dump_keys;
 
-    _OPTION() : debug(false), dump_keys(false) {
+    _OPTION() : verbose(false), dump_keys(false) {
         // do nothing
     }
 } OPTION;
@@ -60,7 +60,7 @@ void test_hash_routine(hash_t* hash_object, hash_algorithm_t algorithm, const by
                     ret = hash_object->finalize(hash_handle, hashed);
                     digest_size = hashed.size();
                     if (errorcode_t::success == ret) {
-                        if (option.debug) {
+                        if (option.verbose) {
                             test_case_notimecheck notimecheck(_test_case);
 
                             basic_stream dump;
@@ -112,7 +112,7 @@ return_t test_hash_routine(hash_t* hash_object, hash_algorithm_t algorithm, bina
                     ret = hash_object->finalize(hash_handle, hashed);
                     digest_size = hashed.size();
                     if (errorcode_t::success == ret) {
-                        if (option.debug) {
+                        if (option.verbose) {
                             test_case_notimecheck notimecheck(_test_case);
 
                             basic_stream dump;
@@ -240,7 +240,7 @@ void test_hmacsha_rfc4231() {
         base16_decode(item.expect_sha384, strlen(item.expect_sha384), bin_expect_sha384);
         base16_decode(item.expect_sha512, strlen(item.expect_sha512), bin_expect_sha512);
 
-        if (option.debug) {
+        if (option.verbose) {
             test_case_notimecheck notimecheck(_test_case);
 
             basic_stream dump;
@@ -316,7 +316,7 @@ void test_aes128cbc_mac_routine(binary_t const& key, binary_t const& message, bi
         hash.finalize(handle, result);
         hash.close(handle);
 
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             dump_memory(result, &bs);
             std::cout << "result" << std::endl << bs.c_str() << std::endl;
@@ -368,7 +368,7 @@ uint32 test_hotp_rfc4226() {
             hotp.get(handle, code);
             output.push_back(code);
 
-            if (option.debug) {
+            if (option.verbose) {
                 test_case_notimecheck notimecheck(_test_case);
                 std::cout << "counter " << i << " code " << code << std::endl;
             }
@@ -462,7 +462,7 @@ uint32 test_totp_rfc6238(hash_algorithm_t algorithm) {
                 totp.get(handle, counter[i], code);
                 output.push_back(code);
 
-                if (option.debug) {
+                if (option.verbose) {
                     test_case_notimecheck notimecheck(_test_case);
                     std::cout << "counter " << counter[i] << " code " << code << std::endl;
                 }
@@ -500,7 +500,7 @@ void test_hash_hmac_sign() {
     openssl_hash hash;
     openssl_sign sign;
 
-    if (option.debug) {
+    if (option.verbose) {
         // source
         dump_memory(bin_in, &bs);
         std::cout << "source" << std::endl << bs.c_str() << std::endl;
@@ -512,7 +512,7 @@ void test_hash_hmac_sign() {
     hash.hash(hash_context, &bin_in[0], bin_in.size(), result);
     hash.close(hash_context);
 
-    if (option.debug) {
+    if (option.verbose) {
         dump_memory(result, &bs);
         std::cout << "hash" << std::endl << bs.c_str() << std::endl;
     }
@@ -524,7 +524,7 @@ void test_hash_hmac_sign() {
     result.resize(size);
     EVP_Digest(&bin_in[0], bin_in.size(), &result[0], &size, EVP_sha256(), nullptr);
 
-    if (option.debug) {
+    if (option.verbose) {
         dump_memory(result, &bs);
         std::cout << "Digest" << std::endl << bs.c_str() << std::endl;
     }
@@ -535,7 +535,7 @@ void test_hash_hmac_sign() {
     hash.hash(hmac_context, &bin_in[0], bin_in.size(), result);
     hash.close(hmac_context);
 
-    if (option.debug) {
+    if (option.verbose) {
         dump_memory(result, &bs);
         std::cout << "HMAC" << std::endl << bs.c_str() << std::endl;
     }
@@ -543,7 +543,7 @@ void test_hash_hmac_sign() {
     // openssl_sign
     sign.sign_digest(key.any(), hash_algorithm_t::sha2_256, bin_key, result);
 
-    if (option.debug) {
+    if (option.verbose) {
         dump_memory(result, &bs);
         std::cout << "Sign" << std::endl << bs.c_str() << std::endl;
     }
@@ -638,15 +638,15 @@ int main(int argc, char** argv) {
 #endif
 
     _cmdline.make_share(new cmdline_t<OPTION>);
-    *_cmdline << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.dump_keys = true; }).optional()
+    *_cmdline << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = true; }).optional()
               << cmdarg_t<OPTION>("-k", "dump keys", [&](OPTION& o, char* param) -> void { o.dump_keys = true; }).optional();
     (*_cmdline).parse(argc, argv);
 
     OPTION& option = _cmdline->value();
-    std::cout << "option.debug " << (option.debug ? 1 : 0) << std::endl;
+    std::cout << "option.verbose " << (option.verbose ? 1 : 0) << std::endl;
     std::cout << "option.dump_keys " << (option.dump_keys ? 1 : 0) << std::endl;
 
-    if (option.debug) {
+    if (option.verbose) {
         set_trace_option(trace_option_t::trace_bt | trace_option_t::trace_except);
     }
 
diff --git a/test/httpauth/sample.cpp b/test/httpauth/sample.cpp
index 860da328..15d7b822 100644
--- a/test/httpauth/sample.cpp
+++ b/test/httpauth/sample.cpp
@@ -29,9 +29,9 @@ test_case _test_case;
 typedef struct _OPTION {
     int port;
     int port_tls;
-    int debug;
+    int verbose;
 
-    _OPTION() : port(8080), port_tls(9000), debug(0) {}
+    _OPTION() : port(8080), port_tls(9000), verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -76,7 +76,7 @@ return_t network_routine(uint32 type, uint32 data_count, void* data_array[], CAL
             break;
         case mux_read:
             cprint("read %i", session_socket->cli_socket);
-            if (option.debug) {
+            if (option.verbose) {
                 printf("%.*s\n", (unsigned)bufsize, buf);
             }
 
@@ -118,7 +118,7 @@ return_t network_routine(uint32 type, uint32 data_count, void* data_array[], CAL
                                      request.get_http_uri().get_uri(), status_code, http_resource::get_instance()->load(status_code).c_str());
                 }
 
-                if (option.debug) {
+                if (option.verbose) {
                     cprint("send %i", session_socket->cli_socket);
                     basic_stream resp;
                     response.get_response(resp);
@@ -325,7 +325,7 @@ int main(int argc, char** argv) {
     cmdline.make_share(new cmdline_t<OPTION>);
     *cmdline << cmdarg_t<OPTION>("-h", "http  port (default 8080)", [&](OPTION& o, char* param) -> void { o.port = atoi(param); }).preced().optional()
              << cmdarg_t<OPTION>("-s", "https port (default 9000)", [&](OPTION& o, char* param) -> void { o.port_tls = atoi(param); }).preced().optional()
-             << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional();
+             << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional();
 
     cmdline->parse(argc, argv);
 
diff --git a/test/httpserver/sample.cpp b/test/httpserver/sample.cpp
index adbbbef2..e847728b 100644
--- a/test/httpserver/sample.cpp
+++ b/test/httpserver/sample.cpp
@@ -29,9 +29,9 @@ test_case _test_case;
 typedef struct _OPTION {
     int port;
     int port_tls;
-    int debug;
+    int verbose;
 
-    _OPTION() : port(8080), port_tls(9000), debug(0) {}
+    _OPTION() : port(8080), port_tls(9000), verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -78,7 +78,7 @@ return_t network_routine(uint32 type, uint32 data_count, void* data_array[], CAL
             break;
         case mux_read:
             cprint("read %i", session_socket->cli_socket);
-            if (option.debug) {
+            if (option.verbose) {
                 printf("%.*s\n", (unsigned)bufsize, buf);
             }
 
@@ -120,7 +120,7 @@ return_t network_routine(uint32 type, uint32 data_count, void* data_array[], CAL
                                      request.get_http_uri().get_uri(), status_code, http_resource::get_instance()->load(status_code).c_str());
                 }
 
-                if (option.debug) {
+                if (option.verbose) {
                     cprint("send %i", session_socket->cli_socket);
                     basic_stream resp;
                     response.get_response(resp);
@@ -281,7 +281,7 @@ int main(int argc, char** argv) {
     cmdline.make_share(new cmdline_t<OPTION>);
     *cmdline << cmdarg_t<OPTION>("-h", "http  port (default 8080)", [&](OPTION& o, char* param) -> void { o.port = atoi(param); }).preced().optional()
              << cmdarg_t<OPTION>("-s", "https port (default 9000)", [&](OPTION& o, char* param) -> void { o.port_tls = atoi(param); }).preced().optional()
-             << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional();
+             << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional();
 
     cmdline->parse(argc, argv);
 
diff --git a/test/httpserver2/sample.cpp b/test/httpserver2/sample.cpp
index ff723cae..47e23a34 100644
--- a/test/httpserver2/sample.cpp
+++ b/test/httpserver2/sample.cpp
@@ -32,9 +32,9 @@ test_case _test_case;
 typedef struct _OPTION {
     int port;
     int port_tls;
-    int debug;
+    int verbose;
 
-    _OPTION() : port(8080), port_tls(9000), debug(0) {}
+    _OPTION() : port(8080), port_tls(9000), verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -94,7 +94,7 @@ return_t consume_routine(uint32 type, uint32 data_count, void* data_array[], CAL
             break;
         case mux_read:
             cprint("read %i", session_socket->cli_socket);
-            if (option.debug) {
+            if (option.verbose) {
                 dump_memory((byte_t*)buf, bufsize, &bs, 16, 2);
                 print("consume\n%s", bs.c_str());
                 bs.clear();
@@ -145,7 +145,7 @@ return_t consume_routine(uint32 type, uint32 data_count, void* data_array[], CAL
                     //     }
                     //
                     //     settings.write(bin);
-                    //     if (option.debug) {
+                    //     if (option.verbose) {
                     //         dump_memory(bin, &bs);
                     //         print("dump\n%s\n", bs.c_str());
                     //     }
@@ -294,7 +294,7 @@ int main(int argc, char** argv) {
     cmdline.make_share(new cmdline_t<OPTION>);
     *cmdline << cmdarg_t<OPTION>("-h", "http  port (default 8080)", [&](OPTION& o, char* param) -> void { o.port = atoi(param); }).preced().optional()
              << cmdarg_t<OPTION>("-s", "https port (default 9000)", [&](OPTION& o, char* param) -> void { o.port_tls = atoi(param); }).preced().optional()
-             << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional();
+             << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional();
 
     cmdline->parse(argc, argv);
 
diff --git a/test/httptest/sample.cpp b/test/httptest/sample.cpp
index 14c1fa46..68157d0f 100644
--- a/test/httptest/sample.cpp
+++ b/test/httptest/sample.cpp
@@ -27,9 +27,9 @@ typedef struct _OPTION {
     std::string url;
     int mode;
     int connect;
-    int debug;
+    int verbose;
 
-    _OPTION() : url("https://localhost:9000/"), mode(0), connect(0), debug(0) {}
+    _OPTION() : url("https://localhost:9000/"), mode(0), connect(0), verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -50,7 +50,7 @@ void do_split_url(const char* url, url_info_t* url_info) {
 
     split_url(url, url_info);
 
-    if (option.debug) {
+    if (option.verbose) {
         basic_stream bs;
         bs << "> url      : " << url << "\n"
            << "> scheme   : " << url_info->scheme << "\n"
@@ -147,7 +147,7 @@ void test_request() {
     http_request request;
     request.open(input);
 
-    if (option.debug) {
+    if (option.verbose) {
         test_case_notimecheck notimecheck(_test_case);
 
         printf("%s\n", input);
@@ -172,7 +172,7 @@ void test_response_compose() {
     response.get_http_header().add("Connection", "Keep-Alive");
     response.compose(200, "text/html", "<html><body>hello</body></html>");
 
-    if (option.debug) {
+    if (option.verbose) {
         test_case_notimecheck notimecheck(_test_case);
 
         basic_stream bs;
@@ -208,7 +208,7 @@ void test_response_parse() {
     response.get_http_header().get("WWW-Authenticate", wwwauth);
     http_header::to_keyvalue(wwwauth, kv);
 
-    if (option.debug) {
+    if (option.verbose) {
         kv.foreach ([&](std::string const& k, std::string const& v, void* param) -> void { printf("> %s:=%s\n", k.c_str(), v.c_str()); });
     }
 
@@ -242,7 +242,7 @@ void test_uri_form_encoded_body_parameter() {
     request2.compose(http_method_t::HTTP_GET, "/auth/bearer", "client_id=clientid");
     request2.get_request(request_stream2);
 
-    if (option.debug) {
+    if (option.verbose) {
         printf("%s\n", request_stream1.c_str());
         printf("%s\n", request_stream2.c_str());
     }
@@ -265,7 +265,7 @@ void test_uri2() {
     http_uri::to_keyvalue(input, kv);
     std::string client_id = kv.get("client_id");
     std::string access_token = kv.get("access_token");
-    if (option.debug) {
+    if (option.verbose) {
         printf("client_id %s\n", client_id.c_str());
         printf("access_token %s\n", access_token.c_str());
     }
@@ -282,7 +282,7 @@ void test_escape_url() {
     basic_stream unescaped;
     unescape_url(input, &unescaped);
 
-    if (option.debug) {
+    if (option.verbose) {
         std::cout << "unescape : " << unescaped.c_str() << std::endl;
     }
 
@@ -312,7 +312,7 @@ void test_basic_authentication() {
         return_t ret = errorcode_t::failed;
 
         // server response
-        if (option.debug) {
+        if (option.verbose) {
             response.get_response(bs);
 
             cprint("server response");
@@ -327,7 +327,7 @@ void test_basic_authentication() {
         request.open("GET / HTTP/1.1");
         request.get_http_header().add("Authorization", format("Basic %s", base64_encode(cred.c_str()).c_str()));
 
-        if (option.debug) {
+        if (option.verbose) {
             request.get_request(bs);
 
             cprint("client request");
@@ -426,7 +426,7 @@ return_t calc_digest_digest_access(http_authenticate_provider* provider, network
         dgst_sequence.add(":").add(digest_ha2);
         digest_response = dgst_sequence.digest(hashalg).get();
 
-        if (option.debug) {
+        if (option.verbose) {
             printf("- a1 %s -> %s\n", dgst_a1.get_sequence().c_str(), digest_ha1.c_str());
             printf("- a2 %s -> %s\n", dgst_a2.get_sequence().c_str(), digest_ha2.c_str());
             printf("- resp %s -> %s\n", dgst_sequence.get_sequence().c_str(), digest_response.c_str());
@@ -463,7 +463,7 @@ void test_digest_access_authentication(const char* alg = nullptr) {
         return_t ret = errorcode_t::failed;
 
         // server response
-        if (option.debug) {
+        if (option.verbose) {
             response.get_response(bs);
 
             cprint("session nonce %s", session.get_session_data()->get("nonce").c_str());
@@ -504,7 +504,7 @@ void test_digest_access_authentication(const char* alg = nullptr) {
                    request.get_http_uri().get_uri(), response_calc.c_str(), kv.get("opaque").c_str(), kv.get("qop").c_str(), kv.get("nc").c_str(),
                    kv.get("cnonce").c_str()));  // set a response
 
-        if (option.debug) {
+        if (option.verbose) {
             request.get_request(bs);
 
             cprint("client request");
@@ -675,7 +675,7 @@ void test_get_tlsclient() {
             req.get_request(body);
 
             cprint("request");
-            if (option.debug) {
+            if (option.verbose) {
                 std::cout << body.c_str() << std::endl;
             }
 
@@ -688,14 +688,14 @@ void test_get_tlsclient() {
                 if (0 == option.mode) {
                     ret = cli.read(sock, handle, buf, sizeof(buf), &sizeread);
 
-                    if (option.debug) {
+                    if (option.verbose) {
                         dump_memory((byte_t*)buf, sizeread, &bs);
                         printf("%s\n", bs.c_str());
                     }
                     while (errorcode_t::more_data == ret) {
                         ret = cli.more(sock, handle, buf, sizeof(buf), &sizeread);
 
-                        if (option.debug) {
+                        if (option.verbose) {
                             dump_memory((byte_t*)buf, sizeread, &bs);
                             printf("%s\n", bs.c_str());
                         }
@@ -719,7 +719,7 @@ void test_get_tlsclient() {
                     stream_interpreted.consume(&data);
                     if (data) {
                         cprint("response");
-                        if (option.debug) {
+                        if (option.verbose) {
                             printf("%.*s\n", (unsigned)data->size(), (char*)data->content());
                         }
 
@@ -760,7 +760,7 @@ void test_get_httpclient() {
 
     client.request(request, &response);
     if (response) {
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             response->get_response(bs);
             printf("%s\n", bs.c_str());
@@ -789,7 +789,7 @@ void test_bearer_token() {
 
     client.request(request, &response);
     if (response) {
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             response->get_response(bs);
             printf("%s\n", bs.c_str());
@@ -817,7 +817,7 @@ int main(int argc, char** argv) {
 
     *cmdline << cmdarg_t<OPTION>("-c", "connect", [&](OPTION& o, char* param) -> void { o.connect = 1; }).optional()
              << cmdarg_t<OPTION>("-p", "read stream using http_protocol", [&](OPTION& o, char* param) -> void { o.mode = 1; }).optional()
-             << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional()
+             << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional()
              << cmdarg_t<OPTION>("-u", "url (default https://localhost:9000/)", [&](OPTION& o, char* param) -> void { o.url = param; }).preced().optional();
 
     cmdline->parse(argc, argv);
diff --git a/test/io/sample.cpp b/test/io/sample.cpp
index e64ccaf8..66876c04 100644
--- a/test/io/sample.cpp
+++ b/test/io/sample.cpp
@@ -19,9 +19,9 @@ using namespace hotplace::io;
 test_case _test_case;
 
 typedef struct _OPTION {
-    int debug;
+    int verbose;
 
-    _OPTION() : debug(0) {}
+    _OPTION() : verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -53,7 +53,7 @@ void test_payload_dump() {
 
         pl.set_group("pad", true);  // enable "pad" group
         pl.dump(bin_padded);
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(bin_padded, &bs);
             printf("%s\n", bs.c_str());
         }
@@ -61,7 +61,7 @@ void test_payload_dump() {
 
         pl.set_group("pad", false);  // disable "pad" group
         pl.dump(bin_notpadded);
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(bin_notpadded, &bs);
             printf("%s\n", bs.c_str());
         }
@@ -119,7 +119,7 @@ void test_payload_uint24() {
            << new payload_member(pad, "pad");
 
         pl.dump(bin_payload);
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(bin_payload, &bs);
             printf("%s\n", bs.c_str());
         }
@@ -138,7 +138,7 @@ void test_payload_uint24() {
         uint32_24_t i24 = t_variant_to_int<uint32>(pl.select("int32_24")->get_variant().content());
         uint32 i32 = t_variant_to_int<uint32>(pl.select("int32_32")->get_variant().content());
 
-        if (option.debug) {
+        if (option.verbose) {
             uint32 i24_value = i24.get();
             printf("padlen %u uint32_24 %u (0x%08x) uint32_32 %u (0x%08x)\n", padlen, i24_value, i24_value, i32, i32);
         }
@@ -157,7 +157,7 @@ int main(int argc, char** argv) {
 #endif
     cmdline.make_share(new cmdline_t<OPTION>);
 
-    *cmdline << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional();
+    *cmdline << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional();
 
     cmdline->parse(argc, argv);
     OPTION& option = cmdline->value();
diff --git a/test/jose/sample.cpp b/test/jose/sample.cpp
index da7c375f..a5c11b7e 100644
--- a/test/jose/sample.cpp
+++ b/test/jose/sample.cpp
@@ -20,10 +20,10 @@ using namespace hotplace::crypto;
 
 test_case _test_case;
 typedef struct _OPTION {
-    bool debug;
+    bool verbose;
     bool dump_keys;
 
-    _OPTION() : debug(false), dump_keys(false) {
+    _OPTION() : verbose(false), dump_keys(false) {
         // do nothing
     }
 } OPTION;
@@ -44,7 +44,7 @@ void print_text(const char* text, ...) {
 void dump(const char* text, std::string const& value) {
     if (text) {
         OPTION& option = _cmdline->value();
-        if (option.debug) {
+        if (option.verbose) {
             std::cout << text << std::endl << value.c_str() << std::endl;
         }
     }
@@ -53,7 +53,7 @@ void dump(const char* text, std::string const& value) {
 void dump_b64url(const char* text, const byte_t* addr, size_t size) {
     if (text && addr) {
         OPTION& option = _cmdline->value();
-        if (option.debug) {
+        if (option.verbose) {
             printf("%s\n  %s\n", text, base64_encode(addr, size, base64_encoding_t::base64url_encoding).c_str());
         }
     }
@@ -62,7 +62,7 @@ void dump_b64url(const char* text, const byte_t* addr, size_t size) {
 void dump_b64url(const char* text, binary_t const& bin) {
     if (text) {
         OPTION& option = _cmdline->value();
-        if (option.debug) {
+        if (option.verbose) {
             printf("%s\n  %s\n", text, base64_encode(bin, base64_encoding_t::base64url_encoding).c_str());
         }
     }
@@ -71,7 +71,7 @@ void dump_b64url(const char* text, binary_t const& bin) {
 void dump(const char* text, std::string const str, basic_stream& bs) {
     if (text) {
         OPTION& option = _cmdline->value();
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(str, &bs, 16, 2);
             printf("%s\n%s\n", text, bs.c_str());
         }
@@ -81,7 +81,7 @@ void dump(const char* text, std::string const str, basic_stream& bs) {
 void dump(const char* text, binary_t const bin, basic_stream& bs) {
     if (text) {
         OPTION& option = _cmdline->value();
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(bin, &bs, 16, 2);
             printf("%s\n%s\n", text, bs.c_str());
         }
@@ -91,7 +91,7 @@ void dump(const char* text, binary_t const bin, basic_stream& bs) {
 void dump(const char* text, const byte_t* addr, size_t size, basic_stream& bs) {
     if (text && addr) {
         OPTION& option = _cmdline->value();
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(addr, size, &bs, 16, 2);
             printf("%s\n%s\n", text, bs.c_str());
         }
@@ -100,7 +100,7 @@ void dump(const char* text, const byte_t* addr, size_t size, basic_stream& bs) {
 
 void dump_elem(binary_t const& source) {
     OPTION& option = _cmdline->value();
-    if (option.debug) {
+    if (option.verbose) {
         std::cout << "[";
 #if __cplusplus >= 201103L  // c++11
         for_each(source.begin(), source.end(), [](byte_t c) { printf("%i,", c); });
@@ -116,7 +116,7 @@ void dump_elem(binary_t const& source) {
 
 void dump_elem(std::string const& source) {
     OPTION& option = _cmdline->value();
-    if (option.debug) {
+    if (option.verbose) {
         std::cout << "[";
 #if __cplusplus >= 201103L  // c++11
         for_each(source.begin(), source.end(), [](byte_t c) { printf("%i,", c); });
@@ -211,7 +211,7 @@ void test_basic() {
 
     const EVP_PKEY* pkey = crypto_key_es521.any();
     if (pkey) {
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             dump_key(pkey, &bs);
             printf("%s\n", bs.c_str());
@@ -1375,7 +1375,7 @@ int test_ecdh() {
     EVP_PKEY_free((EVP_PKEY*)bobPublicKey);
 
     OPTION& option = _cmdline->value();
-    if (option.debug) {
+    if (option.verbose) {
         std::cout << "alice public key  x : " << base16_encode(x_alice).c_str() << std::endl
                   << "alice public key  y : " << base16_encode(y_alice).c_str() << std::endl
                   << "alice private key d : " << base16_encode(d_alice).c_str() << std::endl
@@ -1853,7 +1853,7 @@ void test_jwk_thumbprint() {
     thumbprint = base64_encode(hash_value, base64_encoding_t::base64url_encoding);
 
     OPTION& option = _cmdline->value();
-    if (option.debug) {
+    if (option.verbose) {
         std::cout << "in lexicographic order : " << std::endl
                   << buffer.c_str() << std::endl
                   << "hash : " << std::endl
@@ -1890,7 +1890,7 @@ void test_rfc8037() {
     const EVP_PKEY* pkey = key.any();
     key.get_key(pkey, pub1, pub2, priv);
 
-    if (option.debug) {
+    if (option.verbose) {
         std::cout << "x : " << base16_encode(pub1).c_str() << std::endl << "d : " << base16_encode(priv).c_str() << std::endl;
     }
 
@@ -2116,14 +2116,14 @@ int main(int argc, char** argv) {
 #endif
 
     _cmdline.make_share(new cmdline_t<OPTION>);
-    *_cmdline << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = true; }).optional();
+    *_cmdline << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = true; }).optional();
     *_cmdline << cmdarg_t<OPTION>("-k", "dump keys", [&](OPTION& o, char* param) -> void { o.dump_keys = true; }).optional();
     (*_cmdline).parse(argc, argv);
 
     OPTION& option = _cmdline->value();
     std::cout << "option.dump_keys " << (option.dump_keys ? 1 : 0) << std::endl;
 
-    if (option.debug) {
+    if (option.verbose) {
         set_trace_option(trace_option_t::trace_bt | trace_option_t::trace_except);
     }
 
diff --git a/test/kdf/sample.cpp b/test/kdf/sample.cpp
index 9c1bcc2f..3c899a9b 100644
--- a/test/kdf/sample.cpp
+++ b/test/kdf/sample.cpp
@@ -20,9 +20,9 @@ using namespace hotplace::crypto;
 test_case _test_case;
 
 typedef struct _OPTION {
-    int debug;
+    int verbose;
 
-    _OPTION() : debug(0) {}
+    _OPTION() : verbose(0) {}
 } OPTION;
 
 t_shared_instance<cmdline_t<OPTION> > cmdline;
@@ -49,7 +49,7 @@ void test_kdf_hkdf() {
     for (int i = 0; i < RTL_NUMBER_OF(vector); i++) {
         kdf.hmac_kdf(result, hash_algorithm_t::sha2_256, vector[i].dlen, convert(vector[i].password), convert(vector[i].salt), convert(vector[i].info));
 
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             dump_memory(result, &bs);
             std::cout << bs.c_str() << std::endl;
@@ -94,7 +94,7 @@ void test_kdf_pbkdf2_rfc6070() {
         salt.insert(salt.end(), vector[i].salt, vector[i].salt + vector[i].size_salt);
         kdf.pbkdf2(result, hash_algorithm_t::sha1, vector[i].dlen, password, salt, vector[i].c);
 
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             dump_memory(result, &bs);
             std::cout << bs.c_str() << std::endl;
@@ -128,7 +128,7 @@ void test_kdf_pbkdf2_rfc7914() {
     for (int i = 0; i < RTL_NUMBER_OF(vector); i++) {
         kdf.pbkdf2(result, hash_algorithm_t::sha2_256, vector[i].dlen, vector[i].password, convert(vector[i].salt), vector[i].c);
 
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             dump_memory(result, &bs);
             std::cout << bs.c_str() << std::endl;
@@ -170,7 +170,7 @@ void test_kdf_scrypt_rfc7914() {
     for (int i = 0; i < RTL_NUMBER_OF(vector); i++) {
         ret = kdf.scrypt(result, vector[i].dlen, vector[i].password, convert(vector[i].salt), vector[i].n, vector[i].r, vector[i].p);
         if (errorcode_t::success == ret) {
-            if (option.debug) {
+            if (option.verbose) {
                 basic_stream bs;
                 dump_memory(result, &bs);
                 std::cout << bs.c_str() << std::endl;
@@ -212,7 +212,7 @@ void test_kdf_argon_rfc9106() {
         kdf.argon2(derived, vector[i].mode, 32, base16_decode(vector[i].password), base16_decode(vector[i].salt), base16_decode(vector[i].ad),
                    base16_decode(vector[i].secret));
 
-        if (option.debug) {
+        if (option.verbose) {
             basic_stream bs;
             dump_memory(derived, &bs);
             std::cout << bs.c_str() << std::endl;
@@ -339,7 +339,7 @@ void test_kdf_extract_expand_rfc5869() {
         binary_t okm;
         kdf.hkdf_expand(okm, expand_vector[i].alg, expand_vector[i].dlen, prk, base16_decode(expand_vector[i].info));
 
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(okm, &bs);
             printf("OKM\n%s\n", bs.c_str());
         }
@@ -348,7 +348,7 @@ void test_kdf_extract_expand_rfc5869() {
         kdf.hmac_kdf(derived, expand_vector[i].alg, expand_vector[i].dlen, base16_decode(expand_vector[i].ikm), base16_decode(expand_vector[i].salt),
                      base16_decode(expand_vector[i].info));
 
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(derived, &bs);
             printf("HKDF\n%s\n", bs.c_str());
         }
@@ -426,7 +426,7 @@ void test_ckdf_rfc4615() {
         // cmac_kdf_extract(output, crypt_algorithm_t::aes128, base16_decode(extract_vector[i].salt), base16_decode(extract_vector[i].ikm));
         kdf.cmac_kdf_extract(output, crypt_algorithm_t::aes128, salt, base16_decode(extract_vector[i].ikm));
 
-        if (option.debug) {
+        if (option.verbose) {
             dump_memory(output, &bs);
             printf("%s\n", bs.c_str());
         }
@@ -478,7 +478,7 @@ void test_ckdf_rfc4615() {
         kdf.cmac_kdf(ckdf_okm, crypt_algorithm_t::aes128, expand_vector[i].dlen, base16_decode(expand_vector[i].ikm), base16_decode(expand_vector[i].salt),
                      base16_decode(expand_vector[i].info));
 
-        if (option.debug) {
+        if (option.verbose) {
             test_case_notimecheck notimecheck(_test_case);
 
             dump_memory(prk, &bs);
@@ -501,7 +501,7 @@ int main(int argc, char** argv) {
 #endif
 
     cmdline.make_share(new cmdline_t<OPTION>);
-    *cmdline << cmdarg_t<OPTION>("-d", "debug", [&](OPTION& o, char* param) -> void { o.debug = 1; }).optional();
+    *cmdline << cmdarg_t<OPTION>("-v", "verbose", [&](OPTION& o, char* param) -> void { o.verbose = 1; }).optional();
 
     cmdline->parse(argc, argv);