diff --git a/Config.in b/batman-adv/Config.in
similarity index 100%
rename from Config.in
rename to batman-adv/Config.in
diff --git a/Makefile b/batman-adv/Makefile
similarity index 100%
rename from Makefile
rename to batman-adv/Makefile
diff --git a/files/etc/config/batman-adv b/batman-adv/files/etc/config/batman-adv
similarity index 100%
rename from files/etc/config/batman-adv
rename to batman-adv/files/etc/config/batman-adv
diff --git a/files/etc/hotplug.d/net/99-batman-adv b/batman-adv/files/etc/hotplug.d/net/99-batman-adv
similarity index 100%
rename from files/etc/hotplug.d/net/99-batman-adv
rename to batman-adv/files/etc/hotplug.d/net/99-batman-adv
diff --git a/files/lib/batman-adv/config.sh b/batman-adv/files/lib/batman-adv/config.sh
similarity index 100%
rename from files/lib/batman-adv/config.sh
rename to batman-adv/files/lib/batman-adv/config.sh
diff --git a/files/lib/netifd/proto/batadv.sh b/batman-adv/files/lib/netifd/proto/batadv.sh
similarity index 100%
rename from files/lib/netifd/proto/batadv.sh
rename to batman-adv/files/lib/netifd/proto/batadv.sh
diff --git a/patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch b/batman-adv/patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch
similarity index 100%
rename from patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch
rename to batman-adv/patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch
diff --git a/patches/0002-batman-adv-hlist-drop-the-node-parameter-from-iterators.patch b/batman-adv/patches/0002-batman-adv-hlist-drop-the-node-parameter-from-iterators.patch
similarity index 100%
rename from patches/0002-batman-adv-hlist-drop-the-node-parameter-from-iterators.patch
rename to batman-adv/patches/0002-batman-adv-hlist-drop-the-node-parameter-from-iterators.patch
diff --git a/patches/0003-batman-adv-make-is_my_mac-check-for-the-current-mesh.patch b/batman-adv/patches/0003-batman-adv-make-is_my_mac-check-for-the-current-mesh.patch
similarity index 100%
rename from patches/0003-batman-adv-make-is_my_mac-check-for-the-current-mesh.patch
rename to batman-adv/patches/0003-batman-adv-make-is_my_mac-check-for-the-current-mesh.patch