diff --git a/Modules.cpp b/Modules.cpp
index 04142f7d..cb0469b2 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -1064,7 +1064,7 @@ CModules::ModDirList CModules::GetModDirs() {
 #ifdef RUN_FROM_SOURCE
 	// ./modules
 	sDir = CZNC::Get().GetCurPath() + "/modules/";
-	ret.push(std::make_pair(sDir, sDir));
+	ret.push(std::make_pair(sDir, sDir + "data/"));
 
 	// ./modules/extra
 	sDir = CZNC::Get().GetCurPath() + "/modules/extra/";
@@ -1076,7 +1076,7 @@ CModules::ModDirList CModules::GetModDirs() {
 	ret.push(std::make_pair(sDir, sDir));
 
 	// <moduledir> and <datadir> (<prefix>/lib/znc)
-	ret.push(std::make_pair(_MODDIR_ + CString("/"), _DATADIR_ + CString("/")));
+	ret.push(std::make_pair(_MODDIR_ + CString("/"), _DATADIR_ + CString("/modules/")));
 
 	return ret;
 }
diff --git a/modules/Makefile.in b/modules/Makefile.in
index b87f4626..adf9a536 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -93,23 +93,19 @@ CLEAN    += *.so extra/*.so
 
 all: $(TARGETS)
 
-install: all create_install_dir install_metadirs
+install: all create_install_dir install_datadir
 	$(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(MODDIR)
 
 create_install_dir:
 	mkdir -p $(DESTDIR)$(MODDIR)
 	mkdir -p $(DESTDIR)$(DATADIR)
 	rm -rf $(DESTDIR)$(MODDIR)/*.so
+	rm -rf $(DESTDIR)$(DATADIR)/modules
 
-install_metadirs: create_install_dir
-	for a in $(srcdir)/*; do \
-		d=$$(echo $$a | sed -e "s:$(srcdir)/::g;s:modperl::;s:modpython::"); \
-		if [ -d $$a ] && [ -f $${d}.so ]; then \
-			cp -R $$a $(DESTDIR)$(DATADIR); \
-			find $(DESTDIR)$(DATADIR)/$$a -type d -exec chmod 0755 '{}' \;; \
-			find $(DESTDIR)$(DATADIR)/$$a -type f -exec chmod 0644 '{}' \;; \
-		fi \
-	done
+install_datadir: create_install_dir
+	cp -R $(srcdir)/data $(DESTDIR)$(DATADIR)/modules
+	find $(DESTDIR)$(DATADIR)/modules -type d -exec chmod 0755 '{}' \;
+	find $(DESTDIR)$(DATADIR)/modules -type f -exec chmod 0644 '{}' \;
 
 clean:
 	rm -rf $(CLEAN)
diff --git a/modules/blockuser/tmpl/blockuser_WebadminUser.tmpl b/modules/data/blockuser/tmpl/blockuser_WebadminUser.tmpl
similarity index 100%
rename from modules/blockuser/tmpl/blockuser_WebadminUser.tmpl
rename to modules/data/blockuser/tmpl/blockuser_WebadminUser.tmpl
diff --git a/modules/lastseen/tmpl/index.tmpl b/modules/data/lastseen/tmpl/index.tmpl
similarity index 100%
rename from modules/lastseen/tmpl/index.tmpl
rename to modules/data/lastseen/tmpl/index.tmpl
diff --git a/modules/lastseen/tmpl/lastseen_WebadminUser.tmpl b/modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
similarity index 100%
rename from modules/lastseen/tmpl/lastseen_WebadminUser.tmpl
rename to modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
diff --git a/modules/notes/files/trash.gif b/modules/data/notes/files/trash.gif
similarity index 100%
rename from modules/notes/files/trash.gif
rename to modules/data/notes/files/trash.gif
diff --git a/modules/notes/tmpl/index.tmpl b/modules/data/notes/tmpl/index.tmpl
similarity index 100%
rename from modules/notes/tmpl/index.tmpl
rename to modules/data/notes/tmpl/index.tmpl
diff --git a/modules/perform/tmpl/index.tmpl b/modules/data/perform/tmpl/index.tmpl
similarity index 100%
rename from modules/perform/tmpl/index.tmpl
rename to modules/data/perform/tmpl/index.tmpl
diff --git a/modules/stickychan/tmpl/index.tmpl b/modules/data/stickychan/tmpl/index.tmpl
similarity index 100%
rename from modules/stickychan/tmpl/index.tmpl
rename to modules/data/stickychan/tmpl/index.tmpl
diff --git a/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl b/modules/data/stickychan/tmpl/stickychan_WebadminChan.tmpl
similarity index 100%
rename from modules/stickychan/tmpl/stickychan_WebadminChan.tmpl
rename to modules/data/stickychan/tmpl/stickychan_WebadminChan.tmpl
diff --git a/modules/webadmin/tmpl/add_edit_chan.tmpl b/modules/data/webadmin/tmpl/add_edit_chan.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/add_edit_chan.tmpl
rename to modules/data/webadmin/tmpl/add_edit_chan.tmpl
diff --git a/modules/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/add_edit_user.tmpl
rename to modules/data/webadmin/tmpl/add_edit_user.tmpl
diff --git a/modules/webadmin/tmpl/del_user.tmpl b/modules/data/webadmin/tmpl/del_user.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/del_user.tmpl
rename to modules/data/webadmin/tmpl/del_user.tmpl
diff --git a/modules/webadmin/tmpl/index.tmpl b/modules/data/webadmin/tmpl/index.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/index.tmpl
rename to modules/data/webadmin/tmpl/index.tmpl
diff --git a/modules/webadmin/tmpl/listusers.tmpl b/modules/data/webadmin/tmpl/listusers.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/listusers.tmpl
rename to modules/data/webadmin/tmpl/listusers.tmpl
diff --git a/modules/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/settings.tmpl
rename to modules/data/webadmin/tmpl/settings.tmpl
diff --git a/modules/webadmin/tmpl/traffic.tmpl b/modules/data/webadmin/tmpl/traffic.tmpl
similarity index 100%
rename from modules/webadmin/tmpl/traffic.tmpl
rename to modules/data/webadmin/tmpl/traffic.tmpl