diff --git a/udptunnel/COPYING b/COPYING
similarity index 100%
rename from udptunnel/COPYING
rename to COPYING
diff --git a/ClientGUI/README.md b/ClientGUI/README.md
deleted file mode 100644
index 2c11170..0000000
--- a/ClientGUI/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-GUI
-======
\ No newline at end of file
diff --git a/udptunnel/Makefile b/Makefile
similarity index 100%
rename from udptunnel/Makefile
rename to Makefile
diff --git a/udptunnel/Makefile.Win32 b/Makefile.Win32
similarity index 100%
rename from udptunnel/Makefile.Win32
rename to Makefile.Win32
diff --git a/udptunnel/README b/README
similarity index 100%
rename from udptunnel/README
rename to README
diff --git a/udptunnel/TODO b/TODO
similarity index 100%
rename from udptunnel/TODO
rename to TODO
diff --git a/udptunnel/acl.c b/acl.c
similarity index 100%
rename from udptunnel/acl.c
rename to acl.c
diff --git a/udptunnel/acl.h b/acl.h
similarity index 100%
rename from udptunnel/acl.h
rename to acl.h
diff --git a/udptunnel/client.c b/client.c
similarity index 100%
rename from udptunnel/client.c
rename to client.c
diff --git a/udptunnel/client.h b/client.h
similarity index 100%
rename from udptunnel/client.h
rename to client.h
diff --git a/udptunnel/common.h b/common.h
similarity index 100%
rename from udptunnel/common.h
rename to common.h
diff --git a/udptunnel/helpers/gettimeofday.c b/helpers/gettimeofday.c
similarity index 100%
rename from udptunnel/helpers/gettimeofday.c
rename to helpers/gettimeofday.c
diff --git a/udptunnel/helpers/strtok_r.c b/helpers/strtok_r.c
similarity index 100%
rename from udptunnel/helpers/strtok_r.c
rename to helpers/strtok_r.c
diff --git a/udptunnel/helpers/winhelpers.h b/helpers/winhelpers.h
similarity index 100%
rename from udptunnel/helpers/winhelpers.h
rename to helpers/winhelpers.h
diff --git a/udptunnel/helpers/xgetopt.c b/helpers/xgetopt.c
similarity index 100%
rename from udptunnel/helpers/xgetopt.c
rename to helpers/xgetopt.c
diff --git a/udptunnel/list.c b/list.c
similarity index 100%
rename from udptunnel/list.c
rename to list.c
diff --git a/udptunnel/list.h b/list.h
similarity index 100%
rename from udptunnel/list.h
rename to list.h
diff --git a/udptunnel/message.c b/message.c
similarity index 100%
rename from udptunnel/message.c
rename to message.c
diff --git a/udptunnel/message.h b/message.h
similarity index 100%
rename from udptunnel/message.h
rename to message.h
diff --git a/udptunnel/socket.c b/socket.c
similarity index 100%
rename from udptunnel/socket.c
rename to socket.c
diff --git a/udptunnel/socket.h b/socket.h
similarity index 100%
rename from udptunnel/socket.h
rename to socket.h
diff --git a/udptunnel/udpclient.c b/udpclient.c
similarity index 100%
rename from udptunnel/udpclient.c
rename to udpclient.c
diff --git a/udptunnel/udpserver.c b/udpserver.c
similarity index 100%
rename from udptunnel/udpserver.c
rename to udpserver.c
diff --git a/udptunnel/udptunnel.c b/udptunnel.c
similarity index 100%
rename from udptunnel/udptunnel.c
rename to udptunnel.c