diff --git a/examples/http-socket/Makefile b/examples/http-socket/Makefile
index 19fa386f8..e1904d3ab 100644
--- a/examples/http-socket/Makefile
+++ b/examples/http-socket/Makefile
@@ -1,4 +1,4 @@
-all: http-example
+all: http-example websocket-example
 CONTIKI=../..
 MODULES += os/net/app-layer/http-socket
 
diff --git a/examples/websockets/websocket-example.c b/examples/http-socket/websocket-example.c
similarity index 100%
rename from examples/websockets/websocket-example.c
rename to examples/http-socket/websocket-example.c
diff --git a/examples/websockets/node/Makefile b/examples/http-socket/websocket-node/Makefile
similarity index 100%
rename from examples/websockets/node/Makefile
rename to examples/http-socket/websocket-node/Makefile
diff --git a/examples/websockets/node/example-server.js b/examples/http-socket/websocket-node/example-server.js
similarity index 100%
rename from examples/websockets/node/example-server.js
rename to examples/http-socket/websocket-node/example-server.js
diff --git a/examples/websockets/Makefile b/examples/websockets/Makefile
deleted file mode 100644
index 6fd93eea5..000000000
--- a/examples/websockets/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: websocket-example
-CONTIKI=../..
-
-MODULES += os/net/app-layer/http-socket
-include $(CONTIKI)/Makefile.include
diff --git a/examples/websockets/project-conf.h b/examples/websockets/project-conf.h
deleted file mode 100644
index 38f34be86..000000000
--- a/examples/websockets/project-conf.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017, George Oikonomou - http://www.spd.gr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*---------------------------------------------------------------------------*/
-#ifndef PROJECT_CONF_H_
-#define PROJECT_CONF_H_
-/*---------------------------------------------------------------------------*/
-#define UIP_CONF_TCP 1
-/*---------------------------------------------------------------------------*/
-#endif /* PROJECT_CONF_H_ */