diff --git a/smmapdfw/modules/cyrus_worker.c b/smmapdfw/modules/cyrus/cyrus_worker.c
similarity index 100%
rename from smmapdfw/modules/cyrus_worker.c
rename to smmapdfw/modules/cyrus/cyrus_worker.c
diff --git a/smmapdfw/modules/lua_worker.c b/smmapdfw/modules/lua/lua_worker.c
similarity index 100%
rename from smmapdfw/modules/lua_worker.c
rename to smmapdfw/modules/lua/lua_worker.c
diff --git a/smmapdfw/modules/test_workers.c b/smmapdfw/modules/test/test_workers.c
similarity index 100%
rename from smmapdfw/modules/test_workers.c
rename to smmapdfw/modules/test/test_workers.c
diff --git a/smmapdfw/modules/verify_worker.c b/smmapdfw/modules/verify/verify_worker.c
similarity index 100%
rename from smmapdfw/modules/verify_worker.c
rename to smmapdfw/modules/verify/verify_worker.c