diff --git a/Makefile b/batman/Makefile
similarity index 99%
rename from Makefile
rename to batman/Makefile
index cd4a2ec..4026496 100644
--- a/Makefile
+++ b/batman/Makefile
@@ -59,7 +59,7 @@ endef
 define KernelPackage/batgat
 $(call Package/batmand/Default)
   SUBMENU:=Network Support
-  DEPENDS:=+batmand
+  DEPENDS:=+batmand @BROKEN
   TITLE:=B.A.T.M.A.N. gateway module
   FILES:=$(PKG_KMOD_BUILD_DIR)/batgat.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batgat)
diff --git a/files/etc/config/batmand b/batman/files/etc/config/batmand
similarity index 100%
rename from files/etc/config/batmand
rename to batman/files/etc/config/batmand
diff --git a/files/etc/config/vis b/batman/files/etc/config/vis
similarity index 100%
rename from files/etc/config/vis
rename to batman/files/etc/config/vis
diff --git a/files/etc/init.d/batmand b/batman/files/etc/init.d/batmand
similarity index 100%
rename from files/etc/init.d/batmand
rename to batman/files/etc/init.d/batmand
diff --git a/files/etc/init.d/vis b/batman/files/etc/init.d/vis
similarity index 100%
rename from files/etc/init.d/vis
rename to batman/files/etc/init.d/vis
diff --git a/patches/100-2.6.36.patch b/batman/patches/100-2.6.36.patch
similarity index 100%
rename from patches/100-2.6.36.patch
rename to batman/patches/100-2.6.36.patch