diff --git a/examples/broadcast_server/.gitignore b/examples/broadcast_server/.gitignore
deleted file mode 100644
index 477ba279..00000000
--- a/examples/broadcast_server/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-CMakeCache.txt
-package-lock.json
-CMakeFiles		
-ixwebsocket_unittest	
-cmake_install.cmake	
-node_modules
-ixwebsocket
-Makefile
-build
diff --git a/examples/broadcast_server/CMakeLists.txt b/examples/broadcast_server/CMakeLists.txt
deleted file mode 100644
index fbab35f9..00000000
--- a/examples/broadcast_server/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
-#
-
-cmake_minimum_required (VERSION 3.4.1)
-project (broadcast_server)
-
-# There's -Weverything too for clang
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
-
-set (OPENSSL_PREFIX /usr/local/opt/openssl) # Homebrew openssl
-
-set (CMAKE_CXX_STANDARD 14)
-
-option(USE_TLS "Add TLS support" ON)
-
-include_directories(broadcast_server .)
-
-add_executable(broadcast_server 
-  broadcast_server.cpp)
-
-if (APPLE AND USE_TLS)
-    target_link_libraries(broadcast_server "-framework foundation" "-framework security")
-endif()
-
-target_link_libraries(broadcast_server ixwebsocket)
-install(TARGETS broadcast_server DESTINATION bin)
diff --git a/examples/echo_server/CMakeLists.txt b/examples/echo_server/CMakeLists.txt
deleted file mode 100644
index 07afd709..00000000
--- a/examples/echo_server/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
-#
-
-cmake_minimum_required (VERSION 3.4.1)
-project (echo_server)
-
-# There's -Weverything too for clang
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
-
-set (OPENSSL_PREFIX /usr/local/opt/openssl) # Homebrew openssl
-
-set (CMAKE_CXX_STANDARD 14)
-
-option(USE_TLS "Add TLS support" ON)
-
-include_directories(echo_server .)
-
-add_executable(echo_server 
-  echo_server.cpp)
-
-if (APPLE AND USE_TLS)
-    target_link_libraries(echo_server "-framework foundation" "-framework security")
-endif()
-
-target_link_libraries(echo_server ixwebsocket)
-install(TARGETS echo_server DESTINATION bin)
diff --git a/examples/broadcast_server/broadcast_server.cpp b/ws/ws_broadcast_server.cpp
similarity index 100%
rename from examples/broadcast_server/broadcast_server.cpp
rename to ws/ws_broadcast_server.cpp
diff --git a/examples/echo_server/echo_server.cpp b/ws/ws_echo_server.cpp
similarity index 100%
rename from examples/echo_server/echo_server.cpp
rename to ws/ws_echo_server.cpp