diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 00dd78e..20d7046 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
 project(ipc)
 
 if(UNIX)
-  file(GLOB SRC_FILES ${LIBIPC_PROJECT_DIR}/src/libipc/platform/*_linux.cpp)
+  file(GLOB SRC_FILES ${LIBIPC_PROJECT_DIR}/src/libipc/platform/linux/*.cpp)
 else()
-  file(GLOB SRC_FILES ${LIBIPC_PROJECT_DIR}/src/libipc/platform/*_win.cpp)
+  file(GLOB SRC_FILES ${LIBIPC_PROJECT_DIR}/src/libipc/platform/win/*.cpp)
 endif()
 aux_source_directory(${LIBIPC_PROJECT_DIR}/src/libipc SRC_FILES)
 aux_source_directory(${LIBIPC_PROJECT_DIR}/src/libipc/sync SRC_FILES)
diff --git a/src/libipc/platform/condition_linux.h b/src/libipc/platform/linux/condition.h
similarity index 98%
rename from src/libipc/platform/condition_linux.h
rename to src/libipc/platform/linux/condition.h
index d9d4280..7e5878a 100644
--- a/src/libipc/platform/condition_linux.h
+++ b/src/libipc/platform/linux/condition.h
@@ -5,12 +5,13 @@
 
 #include <pthread.h>
 
-#include "libipc/platform/get_wait_time.h"
 #include "libipc/utility/log.h"
 #include "libipc/utility/scope_guard.h"
 #include "libipc/mutex.h"
 #include "libipc/shm.h"
 
+#include "get_wait_time.h"
+
 namespace ipc {
 namespace detail {
 namespace sync {
diff --git a/src/libipc/platform/get_wait_time.h b/src/libipc/platform/linux/get_wait_time.h
similarity index 100%
rename from src/libipc/platform/get_wait_time.h
rename to src/libipc/platform/linux/get_wait_time.h
diff --git a/src/libipc/platform/mutex_linux.h b/src/libipc/platform/linux/mutex.h
similarity index 99%
rename from src/libipc/platform/mutex_linux.h
rename to src/libipc/platform/linux/mutex.h
index 9080f58..1b1215b 100644
--- a/src/libipc/platform/mutex_linux.h
+++ b/src/libipc/platform/linux/mutex.h
@@ -9,13 +9,14 @@
 
 #include <pthread.h>
 
-#include "libipc/platform/get_wait_time.h"
 #include "libipc/platform/detail.h"
 #include "libipc/utility/log.h"
 #include "libipc/utility/scope_guard.h"
 #include "libipc/memory/resource.h"
 #include "libipc/shm.h"
 
+#include "get_wait_time.h"
+
 namespace ipc {
 namespace detail {
 namespace sync {
diff --git a/src/libipc/platform/semaphore_linux.h b/src/libipc/platform/linux/semaphore.h
similarity index 98%
rename from src/libipc/platform/semaphore_linux.h
rename to src/libipc/platform/linux/semaphore.h
index cbc4973..d48bcd4 100644
--- a/src/libipc/platform/semaphore_linux.h
+++ b/src/libipc/platform/linux/semaphore.h
@@ -8,9 +8,10 @@
 #include <errno.h>
 
 #include "libipc/utility/log.h"
-#include "libipc/platform/get_wait_time.h"
 #include "libipc/shm.h"
 
+#include "get_wait_time.h"
+
 namespace ipc {
 namespace detail {
 namespace sync {
diff --git a/src/libipc/platform/shm_linux.cpp b/src/libipc/platform/linux/shm_linux.cpp
similarity index 100%
rename from src/libipc/platform/shm_linux.cpp
rename to src/libipc/platform/linux/shm_linux.cpp
diff --git a/src/libipc/platform/condition_win.h b/src/libipc/platform/win/condition.h
similarity index 100%
rename from src/libipc/platform/condition_win.h
rename to src/libipc/platform/win/condition.h
diff --git a/src/libipc/platform/get_sa.h b/src/libipc/platform/win/get_sa.h
similarity index 100%
rename from src/libipc/platform/get_sa.h
rename to src/libipc/platform/win/get_sa.h
diff --git a/src/libipc/platform/mutex_win.h b/src/libipc/platform/win/mutex.h
similarity index 96%
rename from src/libipc/platform/mutex_win.h
rename to src/libipc/platform/win/mutex.h
index b648c3b..68968c4 100644
--- a/src/libipc/platform/mutex_win.h
+++ b/src/libipc/platform/win/mutex.h
@@ -7,8 +7,8 @@
 
 #include "libipc/utility/log.h"
 
-#include "libipc/platform/to_tchar.h"
-#include "libipc/platform/get_sa.h"
+#include "to_tchar.h"
+#include "get_sa.h"
 
 namespace ipc {
 namespace detail {
diff --git a/src/libipc/platform/semaphore_win.h b/src/libipc/platform/win/semaphore.h
similarity index 95%
rename from src/libipc/platform/semaphore_win.h
rename to src/libipc/platform/win/semaphore.h
index 9a91eba..47fd45d 100644
--- a/src/libipc/platform/semaphore_win.h
+++ b/src/libipc/platform/win/semaphore.h
@@ -6,8 +6,8 @@
 
 #include "libipc/utility/log.h"
 
-#include "libipc/platform/to_tchar.h"
-#include "libipc/platform/get_sa.h"
+#include "to_tchar.h"
+#include "get_sa.h"
 
 namespace ipc {
 namespace detail {
diff --git a/src/libipc/platform/shm_win.cpp b/src/libipc/platform/win/shm_win.cpp
similarity index 94%
rename from src/libipc/platform/shm_win.cpp
rename to src/libipc/platform/win/shm_win.cpp
index ae49268..366e8bd 100755
--- a/src/libipc/platform/shm_win.cpp
+++ b/src/libipc/platform/win/shm_win.cpp
@@ -9,10 +9,11 @@
 #include "libipc/pool_alloc.h"
 
 #include "libipc/utility/log.h"
-#include "libipc/platform/to_tchar.h"
-#include "libipc/platform/get_sa.h"
 #include "libipc/memory/resource.h"
 
+#include "to_tchar.h"
+#include "get_sa.h"
+
 namespace {
 
 struct id_info_t {
diff --git a/src/libipc/platform/to_tchar.h b/src/libipc/platform/win/to_tchar.h
similarity index 97%
rename from src/libipc/platform/to_tchar.h
rename to src/libipc/platform/win/to_tchar.h
index 61def06..892177e 100755
--- a/src/libipc/platform/to_tchar.h
+++ b/src/libipc/platform/win/to_tchar.h
@@ -11,8 +11,8 @@
 #include <cstddef>
 
 #include "libipc/utility/concept.h"
-#include "libipc/platform/detail.h"
 #include "libipc/memory/resource.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace detail {
diff --git a/src/libipc/sync/condition.cpp b/src/libipc/sync/condition.cpp
index 2859d21..6da8772 100644
--- a/src/libipc/sync/condition.cpp
+++ b/src/libipc/sync/condition.cpp
@@ -5,9 +5,9 @@
 #include "libipc/memory/resource.h"
 #include "libipc/platform/detail.h"
 #if defined(IPC_OS_WINDOWS_)
-#include "libipc/platform/condition_win.h"
+#include "libipc/platform/win/condition.h"
 #elif defined(IPC_OS_LINUX_)
-#include "libipc/platform/condition_linux.h"
+#include "libipc/platform/linux/condition.h"
 #else/*linux*/
 #   error "Unsupported platform."
 #endif
diff --git a/src/libipc/sync/mutex.cpp b/src/libipc/sync/mutex.cpp
index 813e334..d8552f3 100644
--- a/src/libipc/sync/mutex.cpp
+++ b/src/libipc/sync/mutex.cpp
@@ -5,9 +5,9 @@
 #include "libipc/memory/resource.h"
 #include "libipc/platform/detail.h"
 #if defined(IPC_OS_WINDOWS_)
-#include "libipc/platform/mutex_win.h"
+#include "libipc/platform/win/mutex.h"
 #elif defined(IPC_OS_LINUX_)
-#include "libipc/platform/mutex_linux.h"
+#include "libipc/platform/linux/mutex.h"
 #else/*linux*/
 #   error "Unsupported platform."
 #endif
diff --git a/src/libipc/sync/semaphore.cpp b/src/libipc/sync/semaphore.cpp
index 6e86823..37c4bda 100644
--- a/src/libipc/sync/semaphore.cpp
+++ b/src/libipc/sync/semaphore.cpp
@@ -5,9 +5,9 @@
 #include "libipc/memory/resource.h"
 #include "libipc/platform/detail.h"
 #if defined(IPC_OS_WINDOWS_)
-#include "libipc/platform/semaphore_win.h"
+#include "libipc/platform/win/semaphore.h"
 #elif defined(IPC_OS_LINUX_)
-#include "libipc/platform/semaphore_linux.h"
+#include "libipc/platform/linux/semaphore.h"
 #else/*linux*/
 #   error "Unsupported platform."
 #endif