From a7c82310f94799390e159a28cca2e7a14114789e Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Sun, 28 Jul 2013 05:31:11 +0000 Subject: [PATCH] moving files to /server to make merge possible --- Makefile => server/Makefile | 0 MaxScale.cnf => server/MaxScale.cnf | 0 {core => server/core}/Makefile | 0 {core => server/core}/adminusers.c | 0 {core => server/core}/atomic.c | 0 {core => server/core}/buffer.c | 0 {core => server/core}/config.c | 0 {core => server/core}/dbusers.c | 0 {core => server/core}/dcb.c | 0 {core => server/core}/depend.mk | 0 {core => server/core}/gateway.c | 0 {core => server/core}/gateway_mysql_protocol.c | 0 {core => server/core}/gw_utils.c | 0 {core => server/core}/gwbitmask.c | 0 {core => server/core}/hashtable.c | 0 {core => server/core}/load_utils.c | 0 {core => server/core}/maxkeys.c | 0 {core => server/core}/maxpasswd.c | 0 {core => server/core}/monitor.c | 0 {core => server/core}/poll.c | 0 {core => server/core}/secrets.c | 0 {core => server/core}/server.c | 0 {core => server/core}/service.c | 0 {core => server/core}/session.c | 0 {core => server/core}/spinlock.c | 0 {core => server/core}/thread.c | 0 {core => server/core}/users.c | 0 {core => server/core}/utils.c | 0 {include => server/include}/adminusers.h | 0 {include => server/include}/atomic.h | 0 {include => server/include}/buffer.h | 0 {include => server/include}/config.h | 0 {include => server/include}/dbusers.h | 0 {include => server/include}/dcb.h | 0 {include => server/include}/gateway_mysql.h | 0 {include => server/include}/gw.h | 0 {include => server/include}/gwbitmask.h | 0 {include => server/include}/hashtable.h | 0 {include => server/include}/modules.h | 0 {include => server/include}/monitor.h | 0 {include => server/include}/mysql_protocol.h | 0 {include => server/include}/poll.h | 0 {include => server/include}/router.h | 0 {include => server/include}/secrets.h | 0 {include => server/include}/server.h | 0 {include => server/include}/service.h | 0 {include => server/include}/session.h | 0 {include => server/include}/spinlock.h | 0 {include => server/include}/thread.h | 0 {include => server/include}/users.h | 0 {inih => server/inih}/._LICENSE.txt | Bin {inih => server/inih}/._README.txt | Bin {inih => server/inih}/._cpp | Bin {inih => server/inih}/._examples | Bin {inih => server/inih}/._extra | Bin {inih => server/inih}/._ini.c | Bin {inih => server/inih}/._ini.h | Bin {inih => server/inih}/._tests | Bin {inih => server/inih}/LICENSE.txt | 0 {inih => server/inih}/README.txt | 0 {inih => server/inih}/cpp/._INIReader.cpp | Bin {inih => server/inih}/cpp/._INIReader.h | Bin {inih => server/inih}/cpp/._INIReaderTest.cpp | Bin {inih => server/inih}/cpp/INIReader.cpp | 0 {inih => server/inih}/cpp/INIReader.h | 0 {inih => server/inih}/cpp/INIReaderTest.cpp | 0 {inih => server/inih}/examples/._config.def | Bin {inih => server/inih}/examples/._ini_dump.c | Bin {inih => server/inih}/examples/._ini_example.c | Bin {inih => server/inih}/examples/._ini_xmacros.c | Bin {inih => server/inih}/examples/._test.ini | Bin {inih => server/inih}/examples/config.def | 0 {inih => server/inih}/examples/ini_dump.c | 0 {inih => server/inih}/examples/ini_example.c | 0 {inih => server/inih}/examples/ini_xmacros.c | 0 {inih => server/inih}/examples/test.ini | 0 {inih => server/inih}/extra/._Makefile.static | Bin {inih => server/inih}/extra/Makefile.static | 0 {inih => server/inih}/ini.c | 0 {inih => server/inih}/ini.h | 0 {inih => server/inih}/tests/._bad_comment.ini | Bin {inih => server/inih}/tests/._bad_multi.ini | Bin {inih => server/inih}/tests/._bad_section.ini | Bin {inih => server/inih}/tests/._baseline_multi.txt | Bin {inih => server/inih}/tests/._baseline_single.txt | Bin {inih => server/inih}/tests/._bom.ini | Bin {inih => server/inih}/tests/._multi_line.ini | Bin {inih => server/inih}/tests/._normal.ini | Bin {inih => server/inih}/tests/._unittest.bat | Bin {inih => server/inih}/tests/._unittest.c | Bin {inih => server/inih}/tests/._user_error.ini | Bin {inih => server/inih}/tests/bad_comment.ini | 0 {inih => server/inih}/tests/bad_multi.ini | 0 {inih => server/inih}/tests/bad_section.ini | 0 {inih => server/inih}/tests/baseline_multi.txt | 0 {inih => server/inih}/tests/baseline_single.txt | 0 {inih => server/inih}/tests/bom.ini | 0 {inih => server/inih}/tests/multi_line.ini | 0 {inih => server/inih}/tests/normal.ini | 0 {inih => server/inih}/tests/unittest.bat | 0 {inih => server/inih}/tests/unittest.c | 0 {inih => server/inih}/tests/user_error.ini | 0 {modules => server/modules}/include/debugcli.h | 0 {modules => server/modules}/include/httpd.h | 0 .../modules}/include/mysql_client_server_protocol.h | 0 .../modules}/include/readconnection.h | 0 .../modules}/include/readwritesplit.h | 0 {modules => server/modules}/include/telnetd.h | 0 {modules => server/modules}/monitor/Makefile | 0 {modules => server/modules}/monitor/depend.mk | 0 {modules => server/modules}/monitor/galera_mon.c | 0 {modules => server/modules}/monitor/mysql_mon.c | 0 {modules => server/modules}/monitor/mysqlmon.h | 0 {modules => server/modules}/protocol/Makefile | 0 {modules => server/modules}/protocol/depend.mk | 0 {modules => server/modules}/protocol/httpd.c | 0 .../modules}/protocol/mysql_backend.c | 0 {modules => server/modules}/protocol/mysql_client.c | 0 {modules => server/modules}/protocol/mysql_common.c | 0 {modules => server/modules}/protocol/telnetd.c | 0 {modules => server/modules}/routing/Makefile | 0 {modules => server/modules}/routing/debugcli.c | 0 {modules => server/modules}/routing/debugcmd.c | 0 {modules => server/modules}/routing/depend.mk | 0 {modules => server/modules}/routing/readconnroute.c | 0 .../modules}/routing/readwritesplit/Makefile | 0 .../modules}/routing/readwritesplit/depend.mk | 0 .../routing/readwritesplit/readwritesplit.c | 0 {modules => server/modules}/routing/testroute.c | 0 129 files changed, 0 insertions(+), 0 deletions(-) rename Makefile => server/Makefile (100%) rename MaxScale.cnf => server/MaxScale.cnf (100%) rename {core => server/core}/Makefile (100%) rename {core => server/core}/adminusers.c (100%) rename {core => server/core}/atomic.c (100%) rename {core => server/core}/buffer.c (100%) rename {core => server/core}/config.c (100%) rename {core => server/core}/dbusers.c (100%) rename {core => server/core}/dcb.c (100%) rename {core => server/core}/depend.mk (100%) rename {core => server/core}/gateway.c (100%) rename {core => server/core}/gateway_mysql_protocol.c (100%) rename {core => server/core}/gw_utils.c (100%) rename {core => server/core}/gwbitmask.c (100%) rename {core => server/core}/hashtable.c (100%) rename {core => server/core}/load_utils.c (100%) rename {core => server/core}/maxkeys.c (100%) rename {core => server/core}/maxpasswd.c (100%) rename {core => server/core}/monitor.c (100%) rename {core => server/core}/poll.c (100%) rename {core => server/core}/secrets.c (100%) rename {core => server/core}/server.c (100%) rename {core => server/core}/service.c (100%) rename {core => server/core}/session.c (100%) rename {core => server/core}/spinlock.c (100%) rename {core => server/core}/thread.c (100%) rename {core => server/core}/users.c (100%) rename {core => server/core}/utils.c (100%) rename {include => server/include}/adminusers.h (100%) rename {include => server/include}/atomic.h (100%) rename {include => server/include}/buffer.h (100%) rename {include => server/include}/config.h (100%) rename {include => server/include}/dbusers.h (100%) rename {include => server/include}/dcb.h (100%) rename {include => server/include}/gateway_mysql.h (100%) rename {include => server/include}/gw.h (100%) rename {include => server/include}/gwbitmask.h (100%) rename {include => server/include}/hashtable.h (100%) rename {include => server/include}/modules.h (100%) rename {include => server/include}/monitor.h (100%) rename {include => server/include}/mysql_protocol.h (100%) rename {include => server/include}/poll.h (100%) rename {include => server/include}/router.h (100%) rename {include => server/include}/secrets.h (100%) rename {include => server/include}/server.h (100%) rename {include => server/include}/service.h (100%) rename {include => server/include}/session.h (100%) rename {include => server/include}/spinlock.h (100%) rename {include => server/include}/thread.h (100%) rename {include => server/include}/users.h (100%) rename {inih => server/inih}/._LICENSE.txt (100%) rename {inih => server/inih}/._README.txt (100%) rename {inih => server/inih}/._cpp (100%) rename {inih => server/inih}/._examples (100%) rename {inih => server/inih}/._extra (100%) rename {inih => server/inih}/._ini.c (100%) rename {inih => server/inih}/._ini.h (100%) rename {inih => server/inih}/._tests (100%) rename {inih => server/inih}/LICENSE.txt (100%) rename {inih => server/inih}/README.txt (100%) rename {inih => server/inih}/cpp/._INIReader.cpp (100%) rename {inih => server/inih}/cpp/._INIReader.h (100%) rename {inih => server/inih}/cpp/._INIReaderTest.cpp (100%) rename {inih => server/inih}/cpp/INIReader.cpp (100%) rename {inih => server/inih}/cpp/INIReader.h (100%) rename {inih => server/inih}/cpp/INIReaderTest.cpp (100%) rename {inih => server/inih}/examples/._config.def (100%) rename {inih => server/inih}/examples/._ini_dump.c (100%) rename {inih => server/inih}/examples/._ini_example.c (100%) rename {inih => server/inih}/examples/._ini_xmacros.c (100%) rename {inih => server/inih}/examples/._test.ini (100%) rename {inih => server/inih}/examples/config.def (100%) rename {inih => server/inih}/examples/ini_dump.c (100%) rename {inih => server/inih}/examples/ini_example.c (100%) rename {inih => server/inih}/examples/ini_xmacros.c (100%) rename {inih => server/inih}/examples/test.ini (100%) rename {inih => server/inih}/extra/._Makefile.static (100%) rename {inih => server/inih}/extra/Makefile.static (100%) rename {inih => server/inih}/ini.c (100%) rename {inih => server/inih}/ini.h (100%) rename {inih => server/inih}/tests/._bad_comment.ini (100%) rename {inih => server/inih}/tests/._bad_multi.ini (100%) rename {inih => server/inih}/tests/._bad_section.ini (100%) rename {inih => server/inih}/tests/._baseline_multi.txt (100%) rename {inih => server/inih}/tests/._baseline_single.txt (100%) rename {inih => server/inih}/tests/._bom.ini (100%) rename {inih => server/inih}/tests/._multi_line.ini (100%) rename {inih => server/inih}/tests/._normal.ini (100%) rename {inih => server/inih}/tests/._unittest.bat (100%) rename {inih => server/inih}/tests/._unittest.c (100%) rename {inih => server/inih}/tests/._user_error.ini (100%) rename {inih => server/inih}/tests/bad_comment.ini (100%) rename {inih => server/inih}/tests/bad_multi.ini (100%) rename {inih => server/inih}/tests/bad_section.ini (100%) rename {inih => server/inih}/tests/baseline_multi.txt (100%) rename {inih => server/inih}/tests/baseline_single.txt (100%) rename {inih => server/inih}/tests/bom.ini (100%) rename {inih => server/inih}/tests/multi_line.ini (100%) rename {inih => server/inih}/tests/normal.ini (100%) rename {inih => server/inih}/tests/unittest.bat (100%) rename {inih => server/inih}/tests/unittest.c (100%) rename {inih => server/inih}/tests/user_error.ini (100%) rename {modules => server/modules}/include/debugcli.h (100%) rename {modules => server/modules}/include/httpd.h (100%) rename {modules => server/modules}/include/mysql_client_server_protocol.h (100%) rename {modules => server/modules}/include/readconnection.h (100%) rename {modules => server/modules}/include/readwritesplit.h (100%) rename {modules => server/modules}/include/telnetd.h (100%) rename {modules => server/modules}/monitor/Makefile (100%) rename {modules => server/modules}/monitor/depend.mk (100%) rename {modules => server/modules}/monitor/galera_mon.c (100%) rename {modules => server/modules}/monitor/mysql_mon.c (100%) rename {modules => server/modules}/monitor/mysqlmon.h (100%) rename {modules => server/modules}/protocol/Makefile (100%) rename {modules => server/modules}/protocol/depend.mk (100%) rename {modules => server/modules}/protocol/httpd.c (100%) rename {modules => server/modules}/protocol/mysql_backend.c (100%) rename {modules => server/modules}/protocol/mysql_client.c (100%) rename {modules => server/modules}/protocol/mysql_common.c (100%) rename {modules => server/modules}/protocol/telnetd.c (100%) rename {modules => server/modules}/routing/Makefile (100%) rename {modules => server/modules}/routing/debugcli.c (100%) rename {modules => server/modules}/routing/debugcmd.c (100%) rename {modules => server/modules}/routing/depend.mk (100%) rename {modules => server/modules}/routing/readconnroute.c (100%) rename {modules => server/modules}/routing/readwritesplit/Makefile (100%) rename {modules => server/modules}/routing/readwritesplit/depend.mk (100%) rename {modules => server/modules}/routing/readwritesplit/readwritesplit.c (100%) rename {modules => server/modules}/routing/testroute.c (100%) diff --git a/Makefile b/server/Makefile similarity index 100% rename from Makefile rename to server/Makefile diff --git a/MaxScale.cnf b/server/MaxScale.cnf similarity index 100% rename from MaxScale.cnf rename to server/MaxScale.cnf diff --git a/core/Makefile b/server/core/Makefile similarity index 100% rename from core/Makefile rename to server/core/Makefile diff --git a/core/adminusers.c b/server/core/adminusers.c similarity index 100% rename from core/adminusers.c rename to server/core/adminusers.c diff --git a/core/atomic.c b/server/core/atomic.c similarity index 100% rename from core/atomic.c rename to server/core/atomic.c diff --git a/core/buffer.c b/server/core/buffer.c similarity index 100% rename from core/buffer.c rename to server/core/buffer.c diff --git a/core/config.c b/server/core/config.c similarity index 100% rename from core/config.c rename to server/core/config.c diff --git a/core/dbusers.c b/server/core/dbusers.c similarity index 100% rename from core/dbusers.c rename to server/core/dbusers.c diff --git a/core/dcb.c b/server/core/dcb.c similarity index 100% rename from core/dcb.c rename to server/core/dcb.c diff --git a/core/depend.mk b/server/core/depend.mk similarity index 100% rename from core/depend.mk rename to server/core/depend.mk diff --git a/core/gateway.c b/server/core/gateway.c similarity index 100% rename from core/gateway.c rename to server/core/gateway.c diff --git a/core/gateway_mysql_protocol.c b/server/core/gateway_mysql_protocol.c similarity index 100% rename from core/gateway_mysql_protocol.c rename to server/core/gateway_mysql_protocol.c diff --git a/core/gw_utils.c b/server/core/gw_utils.c similarity index 100% rename from core/gw_utils.c rename to server/core/gw_utils.c diff --git a/core/gwbitmask.c b/server/core/gwbitmask.c similarity index 100% rename from core/gwbitmask.c rename to server/core/gwbitmask.c diff --git a/core/hashtable.c b/server/core/hashtable.c similarity index 100% rename from core/hashtable.c rename to server/core/hashtable.c diff --git a/core/load_utils.c b/server/core/load_utils.c similarity index 100% rename from core/load_utils.c rename to server/core/load_utils.c diff --git a/core/maxkeys.c b/server/core/maxkeys.c similarity index 100% rename from core/maxkeys.c rename to server/core/maxkeys.c diff --git a/core/maxpasswd.c b/server/core/maxpasswd.c similarity index 100% rename from core/maxpasswd.c rename to server/core/maxpasswd.c diff --git a/core/monitor.c b/server/core/monitor.c similarity index 100% rename from core/monitor.c rename to server/core/monitor.c diff --git a/core/poll.c b/server/core/poll.c similarity index 100% rename from core/poll.c rename to server/core/poll.c diff --git a/core/secrets.c b/server/core/secrets.c similarity index 100% rename from core/secrets.c rename to server/core/secrets.c diff --git a/core/server.c b/server/core/server.c similarity index 100% rename from core/server.c rename to server/core/server.c diff --git a/core/service.c b/server/core/service.c similarity index 100% rename from core/service.c rename to server/core/service.c diff --git a/core/session.c b/server/core/session.c similarity index 100% rename from core/session.c rename to server/core/session.c diff --git a/core/spinlock.c b/server/core/spinlock.c similarity index 100% rename from core/spinlock.c rename to server/core/spinlock.c diff --git a/core/thread.c b/server/core/thread.c similarity index 100% rename from core/thread.c rename to server/core/thread.c diff --git a/core/users.c b/server/core/users.c similarity index 100% rename from core/users.c rename to server/core/users.c diff --git a/core/utils.c b/server/core/utils.c similarity index 100% rename from core/utils.c rename to server/core/utils.c diff --git a/include/adminusers.h b/server/include/adminusers.h similarity index 100% rename from include/adminusers.h rename to server/include/adminusers.h diff --git a/include/atomic.h b/server/include/atomic.h similarity index 100% rename from include/atomic.h rename to server/include/atomic.h diff --git a/include/buffer.h b/server/include/buffer.h similarity index 100% rename from include/buffer.h rename to server/include/buffer.h diff --git a/include/config.h b/server/include/config.h similarity index 100% rename from include/config.h rename to server/include/config.h diff --git a/include/dbusers.h b/server/include/dbusers.h similarity index 100% rename from include/dbusers.h rename to server/include/dbusers.h diff --git a/include/dcb.h b/server/include/dcb.h similarity index 100% rename from include/dcb.h rename to server/include/dcb.h diff --git a/include/gateway_mysql.h b/server/include/gateway_mysql.h similarity index 100% rename from include/gateway_mysql.h rename to server/include/gateway_mysql.h diff --git a/include/gw.h b/server/include/gw.h similarity index 100% rename from include/gw.h rename to server/include/gw.h diff --git a/include/gwbitmask.h b/server/include/gwbitmask.h similarity index 100% rename from include/gwbitmask.h rename to server/include/gwbitmask.h diff --git a/include/hashtable.h b/server/include/hashtable.h similarity index 100% rename from include/hashtable.h rename to server/include/hashtable.h diff --git a/include/modules.h b/server/include/modules.h similarity index 100% rename from include/modules.h rename to server/include/modules.h diff --git a/include/monitor.h b/server/include/monitor.h similarity index 100% rename from include/monitor.h rename to server/include/monitor.h diff --git a/include/mysql_protocol.h b/server/include/mysql_protocol.h similarity index 100% rename from include/mysql_protocol.h rename to server/include/mysql_protocol.h diff --git a/include/poll.h b/server/include/poll.h similarity index 100% rename from include/poll.h rename to server/include/poll.h diff --git a/include/router.h b/server/include/router.h similarity index 100% rename from include/router.h rename to server/include/router.h diff --git a/include/secrets.h b/server/include/secrets.h similarity index 100% rename from include/secrets.h rename to server/include/secrets.h diff --git a/include/server.h b/server/include/server.h similarity index 100% rename from include/server.h rename to server/include/server.h diff --git a/include/service.h b/server/include/service.h similarity index 100% rename from include/service.h rename to server/include/service.h diff --git a/include/session.h b/server/include/session.h similarity index 100% rename from include/session.h rename to server/include/session.h diff --git a/include/spinlock.h b/server/include/spinlock.h similarity index 100% rename from include/spinlock.h rename to server/include/spinlock.h diff --git a/include/thread.h b/server/include/thread.h similarity index 100% rename from include/thread.h rename to server/include/thread.h diff --git a/include/users.h b/server/include/users.h similarity index 100% rename from include/users.h rename to server/include/users.h diff --git a/inih/._LICENSE.txt b/server/inih/._LICENSE.txt similarity index 100% rename from inih/._LICENSE.txt rename to server/inih/._LICENSE.txt diff --git a/inih/._README.txt b/server/inih/._README.txt similarity index 100% rename from inih/._README.txt rename to server/inih/._README.txt diff --git a/inih/._cpp b/server/inih/._cpp similarity index 100% rename from inih/._cpp rename to server/inih/._cpp diff --git a/inih/._examples b/server/inih/._examples similarity index 100% rename from inih/._examples rename to server/inih/._examples diff --git a/inih/._extra b/server/inih/._extra similarity index 100% rename from inih/._extra rename to server/inih/._extra diff --git a/inih/._ini.c b/server/inih/._ini.c similarity index 100% rename from inih/._ini.c rename to server/inih/._ini.c diff --git a/inih/._ini.h b/server/inih/._ini.h similarity index 100% rename from inih/._ini.h rename to server/inih/._ini.h diff --git a/inih/._tests b/server/inih/._tests similarity index 100% rename from inih/._tests rename to server/inih/._tests diff --git a/inih/LICENSE.txt b/server/inih/LICENSE.txt similarity index 100% rename from inih/LICENSE.txt rename to server/inih/LICENSE.txt diff --git a/inih/README.txt b/server/inih/README.txt similarity index 100% rename from inih/README.txt rename to server/inih/README.txt diff --git a/inih/cpp/._INIReader.cpp b/server/inih/cpp/._INIReader.cpp similarity index 100% rename from inih/cpp/._INIReader.cpp rename to server/inih/cpp/._INIReader.cpp diff --git a/inih/cpp/._INIReader.h b/server/inih/cpp/._INIReader.h similarity index 100% rename from inih/cpp/._INIReader.h rename to server/inih/cpp/._INIReader.h diff --git a/inih/cpp/._INIReaderTest.cpp b/server/inih/cpp/._INIReaderTest.cpp similarity index 100% rename from inih/cpp/._INIReaderTest.cpp rename to server/inih/cpp/._INIReaderTest.cpp diff --git a/inih/cpp/INIReader.cpp b/server/inih/cpp/INIReader.cpp similarity index 100% rename from inih/cpp/INIReader.cpp rename to server/inih/cpp/INIReader.cpp diff --git a/inih/cpp/INIReader.h b/server/inih/cpp/INIReader.h similarity index 100% rename from inih/cpp/INIReader.h rename to server/inih/cpp/INIReader.h diff --git a/inih/cpp/INIReaderTest.cpp b/server/inih/cpp/INIReaderTest.cpp similarity index 100% rename from inih/cpp/INIReaderTest.cpp rename to server/inih/cpp/INIReaderTest.cpp diff --git a/inih/examples/._config.def b/server/inih/examples/._config.def similarity index 100% rename from inih/examples/._config.def rename to server/inih/examples/._config.def diff --git a/inih/examples/._ini_dump.c b/server/inih/examples/._ini_dump.c similarity index 100% rename from inih/examples/._ini_dump.c rename to server/inih/examples/._ini_dump.c diff --git a/inih/examples/._ini_example.c b/server/inih/examples/._ini_example.c similarity index 100% rename from inih/examples/._ini_example.c rename to server/inih/examples/._ini_example.c diff --git a/inih/examples/._ini_xmacros.c b/server/inih/examples/._ini_xmacros.c similarity index 100% rename from inih/examples/._ini_xmacros.c rename to server/inih/examples/._ini_xmacros.c diff --git a/inih/examples/._test.ini b/server/inih/examples/._test.ini similarity index 100% rename from inih/examples/._test.ini rename to server/inih/examples/._test.ini diff --git a/inih/examples/config.def b/server/inih/examples/config.def similarity index 100% rename from inih/examples/config.def rename to server/inih/examples/config.def diff --git a/inih/examples/ini_dump.c b/server/inih/examples/ini_dump.c similarity index 100% rename from inih/examples/ini_dump.c rename to server/inih/examples/ini_dump.c diff --git a/inih/examples/ini_example.c b/server/inih/examples/ini_example.c similarity index 100% rename from inih/examples/ini_example.c rename to server/inih/examples/ini_example.c diff --git a/inih/examples/ini_xmacros.c b/server/inih/examples/ini_xmacros.c similarity index 100% rename from inih/examples/ini_xmacros.c rename to server/inih/examples/ini_xmacros.c diff --git a/inih/examples/test.ini b/server/inih/examples/test.ini similarity index 100% rename from inih/examples/test.ini rename to server/inih/examples/test.ini diff --git a/inih/extra/._Makefile.static b/server/inih/extra/._Makefile.static similarity index 100% rename from inih/extra/._Makefile.static rename to server/inih/extra/._Makefile.static diff --git a/inih/extra/Makefile.static b/server/inih/extra/Makefile.static similarity index 100% rename from inih/extra/Makefile.static rename to server/inih/extra/Makefile.static diff --git a/inih/ini.c b/server/inih/ini.c similarity index 100% rename from inih/ini.c rename to server/inih/ini.c diff --git a/inih/ini.h b/server/inih/ini.h similarity index 100% rename from inih/ini.h rename to server/inih/ini.h diff --git a/inih/tests/._bad_comment.ini b/server/inih/tests/._bad_comment.ini similarity index 100% rename from inih/tests/._bad_comment.ini rename to server/inih/tests/._bad_comment.ini diff --git a/inih/tests/._bad_multi.ini b/server/inih/tests/._bad_multi.ini similarity index 100% rename from inih/tests/._bad_multi.ini rename to server/inih/tests/._bad_multi.ini diff --git a/inih/tests/._bad_section.ini b/server/inih/tests/._bad_section.ini similarity index 100% rename from inih/tests/._bad_section.ini rename to server/inih/tests/._bad_section.ini diff --git a/inih/tests/._baseline_multi.txt b/server/inih/tests/._baseline_multi.txt similarity index 100% rename from inih/tests/._baseline_multi.txt rename to server/inih/tests/._baseline_multi.txt diff --git a/inih/tests/._baseline_single.txt b/server/inih/tests/._baseline_single.txt similarity index 100% rename from inih/tests/._baseline_single.txt rename to server/inih/tests/._baseline_single.txt diff --git a/inih/tests/._bom.ini b/server/inih/tests/._bom.ini similarity index 100% rename from inih/tests/._bom.ini rename to server/inih/tests/._bom.ini diff --git a/inih/tests/._multi_line.ini b/server/inih/tests/._multi_line.ini similarity index 100% rename from inih/tests/._multi_line.ini rename to server/inih/tests/._multi_line.ini diff --git a/inih/tests/._normal.ini b/server/inih/tests/._normal.ini similarity index 100% rename from inih/tests/._normal.ini rename to server/inih/tests/._normal.ini diff --git a/inih/tests/._unittest.bat b/server/inih/tests/._unittest.bat similarity index 100% rename from inih/tests/._unittest.bat rename to server/inih/tests/._unittest.bat diff --git a/inih/tests/._unittest.c b/server/inih/tests/._unittest.c similarity index 100% rename from inih/tests/._unittest.c rename to server/inih/tests/._unittest.c diff --git a/inih/tests/._user_error.ini b/server/inih/tests/._user_error.ini similarity index 100% rename from inih/tests/._user_error.ini rename to server/inih/tests/._user_error.ini diff --git a/inih/tests/bad_comment.ini b/server/inih/tests/bad_comment.ini similarity index 100% rename from inih/tests/bad_comment.ini rename to server/inih/tests/bad_comment.ini diff --git a/inih/tests/bad_multi.ini b/server/inih/tests/bad_multi.ini similarity index 100% rename from inih/tests/bad_multi.ini rename to server/inih/tests/bad_multi.ini diff --git a/inih/tests/bad_section.ini b/server/inih/tests/bad_section.ini similarity index 100% rename from inih/tests/bad_section.ini rename to server/inih/tests/bad_section.ini diff --git a/inih/tests/baseline_multi.txt b/server/inih/tests/baseline_multi.txt similarity index 100% rename from inih/tests/baseline_multi.txt rename to server/inih/tests/baseline_multi.txt diff --git a/inih/tests/baseline_single.txt b/server/inih/tests/baseline_single.txt similarity index 100% rename from inih/tests/baseline_single.txt rename to server/inih/tests/baseline_single.txt diff --git a/inih/tests/bom.ini b/server/inih/tests/bom.ini similarity index 100% rename from inih/tests/bom.ini rename to server/inih/tests/bom.ini diff --git a/inih/tests/multi_line.ini b/server/inih/tests/multi_line.ini similarity index 100% rename from inih/tests/multi_line.ini rename to server/inih/tests/multi_line.ini diff --git a/inih/tests/normal.ini b/server/inih/tests/normal.ini similarity index 100% rename from inih/tests/normal.ini rename to server/inih/tests/normal.ini diff --git a/inih/tests/unittest.bat b/server/inih/tests/unittest.bat similarity index 100% rename from inih/tests/unittest.bat rename to server/inih/tests/unittest.bat diff --git a/inih/tests/unittest.c b/server/inih/tests/unittest.c similarity index 100% rename from inih/tests/unittest.c rename to server/inih/tests/unittest.c diff --git a/inih/tests/user_error.ini b/server/inih/tests/user_error.ini similarity index 100% rename from inih/tests/user_error.ini rename to server/inih/tests/user_error.ini diff --git a/modules/include/debugcli.h b/server/modules/include/debugcli.h similarity index 100% rename from modules/include/debugcli.h rename to server/modules/include/debugcli.h diff --git a/modules/include/httpd.h b/server/modules/include/httpd.h similarity index 100% rename from modules/include/httpd.h rename to server/modules/include/httpd.h diff --git a/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h similarity index 100% rename from modules/include/mysql_client_server_protocol.h rename to server/modules/include/mysql_client_server_protocol.h diff --git a/modules/include/readconnection.h b/server/modules/include/readconnection.h similarity index 100% rename from modules/include/readconnection.h rename to server/modules/include/readconnection.h diff --git a/modules/include/readwritesplit.h b/server/modules/include/readwritesplit.h similarity index 100% rename from modules/include/readwritesplit.h rename to server/modules/include/readwritesplit.h diff --git a/modules/include/telnetd.h b/server/modules/include/telnetd.h similarity index 100% rename from modules/include/telnetd.h rename to server/modules/include/telnetd.h diff --git a/modules/monitor/Makefile b/server/modules/monitor/Makefile similarity index 100% rename from modules/monitor/Makefile rename to server/modules/monitor/Makefile diff --git a/modules/monitor/depend.mk b/server/modules/monitor/depend.mk similarity index 100% rename from modules/monitor/depend.mk rename to server/modules/monitor/depend.mk diff --git a/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c similarity index 100% rename from modules/monitor/galera_mon.c rename to server/modules/monitor/galera_mon.c diff --git a/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c similarity index 100% rename from modules/monitor/mysql_mon.c rename to server/modules/monitor/mysql_mon.c diff --git a/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h similarity index 100% rename from modules/monitor/mysqlmon.h rename to server/modules/monitor/mysqlmon.h diff --git a/modules/protocol/Makefile b/server/modules/protocol/Makefile similarity index 100% rename from modules/protocol/Makefile rename to server/modules/protocol/Makefile diff --git a/modules/protocol/depend.mk b/server/modules/protocol/depend.mk similarity index 100% rename from modules/protocol/depend.mk rename to server/modules/protocol/depend.mk diff --git a/modules/protocol/httpd.c b/server/modules/protocol/httpd.c similarity index 100% rename from modules/protocol/httpd.c rename to server/modules/protocol/httpd.c diff --git a/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c similarity index 100% rename from modules/protocol/mysql_backend.c rename to server/modules/protocol/mysql_backend.c diff --git a/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c similarity index 100% rename from modules/protocol/mysql_client.c rename to server/modules/protocol/mysql_client.c diff --git a/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c similarity index 100% rename from modules/protocol/mysql_common.c rename to server/modules/protocol/mysql_common.c diff --git a/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c similarity index 100% rename from modules/protocol/telnetd.c rename to server/modules/protocol/telnetd.c diff --git a/modules/routing/Makefile b/server/modules/routing/Makefile similarity index 100% rename from modules/routing/Makefile rename to server/modules/routing/Makefile diff --git a/modules/routing/debugcli.c b/server/modules/routing/debugcli.c similarity index 100% rename from modules/routing/debugcli.c rename to server/modules/routing/debugcli.c diff --git a/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c similarity index 100% rename from modules/routing/debugcmd.c rename to server/modules/routing/debugcmd.c diff --git a/modules/routing/depend.mk b/server/modules/routing/depend.mk similarity index 100% rename from modules/routing/depend.mk rename to server/modules/routing/depend.mk diff --git a/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c similarity index 100% rename from modules/routing/readconnroute.c rename to server/modules/routing/readconnroute.c diff --git a/modules/routing/readwritesplit/Makefile b/server/modules/routing/readwritesplit/Makefile similarity index 100% rename from modules/routing/readwritesplit/Makefile rename to server/modules/routing/readwritesplit/Makefile diff --git a/modules/routing/readwritesplit/depend.mk b/server/modules/routing/readwritesplit/depend.mk similarity index 100% rename from modules/routing/readwritesplit/depend.mk rename to server/modules/routing/readwritesplit/depend.mk diff --git a/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c similarity index 100% rename from modules/routing/readwritesplit/readwritesplit.c rename to server/modules/routing/readwritesplit/readwritesplit.c diff --git a/modules/routing/testroute.c b/server/modules/routing/testroute.c similarity index 100% rename from modules/routing/testroute.c rename to server/modules/routing/testroute.c