diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 5bb7220..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,20 +0,0 @@
-Changes on version 1.2.4 (current):
-- Minor code fixes and change code formatting.
-
-Changes on version 1.2.2:
-- Fix problem with TCP transmission stick package. Thanks to ljia310.
-
-Changes on version 1.2.1:
-- Fix allocating string memory.
-
-Changes on version 1.2.0:
-- Rename source files to avoid duplication with other software.
-
-Changes on version 1.1.0:
-- Add Objective-C client.
-
-Changes on version 1.0.0:
-- Stable release.
-
-Changes on version 0.0.1:
-- Initial implementation.
diff --git a/SConscript b/SConscript
index 42aaf9b..be781de 100644
--- a/SConscript
+++ b/SConscript
@@ -9,13 +9,13 @@ src = []
 inc = []
 
 # add librws common include
-inc = inc + [cwd + '/librws/inc']
+inc = inc + [cwd + '/inc']
 
 # add librws basic code
-src = src + Glob('librws/src/*.c')
+src = src + Glob('src/*.c')
 
 # add group to IDE project
-objs = DefineGroup('librws_rtthread', src, depend = ['PKG_USING_LIBRWS', 'RT_USING_PTHREADS'], CPPPATH = inc)
+objs = DefineGroup('librws', src, depend = ['PKG_USING_LIBRWS', 'RT_USING_PTHREADS'], CPPPATH = inc)
 
 # traversal subscript
 list = os.listdir(cwd)
diff --git a/examples/SConscript b/examples/SConscript
index caa7c06..af2501f 100644
--- a/examples/SConscript
+++ b/examples/SConscript
@@ -12,7 +12,7 @@ inc = []
 inc = inc + [cwd]
 
 # add librws basic code
-src = src + Glob('./*.c')
+src = src + Glob('*.c')
 
 # add group to IDE project
 objs = DefineGroup('librws_example', src, depend = ['LIBRWS_USING_EXAMPLE'], CPPPATH = inc)
diff --git a/librws/inc/librws.h b/inc/librws.h
similarity index 100%
rename from librws/inc/librws.h
rename to inc/librws.h
diff --git a/librws/inc/rws_common.h b/inc/rws_common.h
similarity index 100%
rename from librws/inc/rws_common.h
rename to inc/rws_common.h
diff --git a/librws/inc/rws_error.h b/inc/rws_error.h
similarity index 100%
rename from librws/inc/rws_error.h
rename to inc/rws_error.h
diff --git a/librws/inc/rws_frame.h b/inc/rws_frame.h
similarity index 100%
rename from librws/inc/rws_frame.h
rename to inc/rws_frame.h
diff --git a/librws/inc/rws_list.h b/inc/rws_list.h
similarity index 100%
rename from librws/inc/rws_list.h
rename to inc/rws_list.h
diff --git a/librws/inc/rws_memory.h b/inc/rws_memory.h
similarity index 100%
rename from librws/inc/rws_memory.h
rename to inc/rws_memory.h
diff --git a/librws/inc/rws_socket.h b/inc/rws_socket.h
similarity index 100%
rename from librws/inc/rws_socket.h
rename to inc/rws_socket.h
diff --git a/librws/inc/rws_string.h b/inc/rws_string.h
similarity index 100%
rename from librws/inc/rws_string.h
rename to inc/rws_string.h
diff --git a/librws/inc/rws_thread.h b/inc/rws_thread.h
similarity index 100%
rename from librws/inc/rws_thread.h
rename to inc/rws_thread.h
diff --git a/librws/src/librws.c b/src/librws.c
similarity index 100%
rename from librws/src/librws.c
rename to src/librws.c
diff --git a/librws/src/rws_common.c b/src/rws_common.c
similarity index 100%
rename from librws/src/rws_common.c
rename to src/rws_common.c
diff --git a/librws/src/rws_error.c b/src/rws_error.c
similarity index 100%
rename from librws/src/rws_error.c
rename to src/rws_error.c
diff --git a/librws/src/rws_frame.c b/src/rws_frame.c
similarity index 100%
rename from librws/src/rws_frame.c
rename to src/rws_frame.c
diff --git a/librws/src/rws_list.c b/src/rws_list.c
similarity index 100%
rename from librws/src/rws_list.c
rename to src/rws_list.c
diff --git a/librws/src/rws_memory.c b/src/rws_memory.c
similarity index 100%
rename from librws/src/rws_memory.c
rename to src/rws_memory.c
diff --git a/librws/src/rws_socketpriv.c b/src/rws_socketpriv.c
similarity index 99%
rename from librws/src/rws_socketpriv.c
rename to src/rws_socketpriv.c
index a81a22b..a14a0a7 100644
--- a/librws/src/rws_socketpriv.c
+++ b/src/rws_socketpriv.c
@@ -1519,8 +1519,8 @@ void rws_socket_check_write_error(_rws_socket *s, int error_num)
     // send errors
     case EACCES: //
 
-    //		case EAGAIN: // The socket is marked nonblocking and the requested operation would block
-    //		case EWOULDBLOCK: // The socket is marked nonblocking and the receive operation would block
+    //      case EAGAIN: // The socket is marked nonblocking and the requested operation would block
+    //      case EWOULDBLOCK: // The socket is marked nonblocking and the receive operation would block
 
     case EBADF:        // An invalid descriptor was specified
     case ECONNRESET:   // Connection reset by peer
diff --git a/librws/src/rws_socketpub.c b/src/rws_socketpub.c
similarity index 100%
rename from librws/src/rws_socketpub.c
rename to src/rws_socketpub.c
diff --git a/librws/src/rws_string.c b/src/rws_string.c
similarity index 100%
rename from librws/src/rws_string.c
rename to src/rws_string.c
diff --git a/librws/src/rws_thread.c b/src/rws_thread.c
similarity index 100%
rename from librws/src/rws_thread.c
rename to src/rws_thread.c