diff --git a/src/routing/manet/aodv/aodv-dpd.cc b/src/routing/aodv/aodv-dpd.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-dpd.cc
rename to src/routing/aodv/aodv-dpd.cc
diff --git a/src/routing/manet/aodv/aodv-dpd.h b/src/routing/aodv/aodv-dpd.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-dpd.h
rename to src/routing/aodv/aodv-dpd.h
diff --git a/src/routing/manet/aodv/aodv-id-cache.cc b/src/routing/aodv/aodv-id-cache.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-id-cache.cc
rename to src/routing/aodv/aodv-id-cache.cc
diff --git a/src/routing/manet/aodv/aodv-id-cache.h b/src/routing/aodv/aodv-id-cache.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-id-cache.h
rename to src/routing/aodv/aodv-id-cache.h
diff --git a/src/routing/manet/aodv/aodv-neighbor.cc b/src/routing/aodv/aodv-neighbor.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-neighbor.cc
rename to src/routing/aodv/aodv-neighbor.cc
diff --git a/src/routing/manet/aodv/aodv-neighbor.h b/src/routing/aodv/aodv-neighbor.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-neighbor.h
rename to src/routing/aodv/aodv-neighbor.h
diff --git a/src/routing/manet/aodv/aodv-packet.cc b/src/routing/aodv/aodv-packet.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-packet.cc
rename to src/routing/aodv/aodv-packet.cc
diff --git a/src/routing/manet/aodv/aodv-packet.h b/src/routing/aodv/aodv-packet.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-packet.h
rename to src/routing/aodv/aodv-packet.h
diff --git a/src/routing/manet/aodv/aodv-routing-protocol.cc b/src/routing/aodv/aodv-routing-protocol.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-routing-protocol.cc
rename to src/routing/aodv/aodv-routing-protocol.cc
diff --git a/src/routing/manet/aodv/aodv-routing-protocol.h b/src/routing/aodv/aodv-routing-protocol.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-routing-protocol.h
rename to src/routing/aodv/aodv-routing-protocol.h
diff --git a/src/routing/manet/aodv/aodv-rqueue.cc b/src/routing/aodv/aodv-rqueue.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-rqueue.cc
rename to src/routing/aodv/aodv-rqueue.cc
diff --git a/src/routing/manet/aodv/aodv-rqueue.h b/src/routing/aodv/aodv-rqueue.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-rqueue.h
rename to src/routing/aodv/aodv-rqueue.h
diff --git a/src/routing/manet/aodv/aodv-rtable.cc b/src/routing/aodv/aodv-rtable.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-rtable.cc
rename to src/routing/aodv/aodv-rtable.cc
diff --git a/src/routing/manet/aodv/aodv-rtable.h b/src/routing/aodv/aodv-rtable.h
similarity index 100%
rename from src/routing/manet/aodv/aodv-rtable.h
rename to src/routing/aodv/aodv-rtable.h
diff --git a/src/routing/manet/aodv/aodv-test-suite.cc b/src/routing/aodv/aodv-test-suite.cc
similarity index 100%
rename from src/routing/manet/aodv/aodv-test-suite.cc
rename to src/routing/aodv/aodv-test-suite.cc
diff --git a/src/routing/manet/aodv/aodv.h b/src/routing/aodv/aodv.h
similarity index 100%
rename from src/routing/manet/aodv/aodv.h
rename to src/routing/aodv/aodv.h
diff --git a/src/routing/manet/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-chain-regression-test-0-0.pcap
rename to src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap
diff --git a/src/routing/manet/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-chain-regression-test-1-0.pcap
rename to src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap
diff --git a/src/routing/manet/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-chain-regression-test-2-0.pcap
rename to src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap
diff --git a/src/routing/manet/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-chain-regression-test-3-0.pcap
rename to src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap
diff --git a/src/routing/manet/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-chain-regression-test-4-0.pcap
rename to src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap
diff --git a/src/routing/manet/aodv/test/aodv-regression.cc b/src/routing/aodv/test/aodv-regression.cc
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-regression.cc
rename to src/routing/aodv/test/aodv-regression.cc
diff --git a/src/routing/manet/aodv/test/aodv-regression.h b/src/routing/aodv/test/aodv-regression.h
similarity index 100%
rename from src/routing/manet/aodv/test/aodv-regression.h
rename to src/routing/aodv/test/aodv-regression.h
diff --git a/src/routing/manet/aodv/waf b/src/routing/aodv/waf
similarity index 100%
rename from src/routing/manet/aodv/waf
rename to src/routing/aodv/waf
diff --git a/src/routing/manet/aodv/wscript b/src/routing/aodv/wscript
similarity index 100%
rename from src/routing/manet/aodv/wscript
rename to src/routing/aodv/wscript
diff --git a/src/wscript b/src/wscript
index 248e54d4c..807ebd7e1 100644
--- a/src/wscript
+++ b/src/wscript
@@ -32,7 +32,7 @@ all_modules = (
     'routing/global-routing',
     'routing/static-routing',
     'routing/list-routing',
-    'routing/manet/aodv',
+    'routing/aodv',
     'mobility',
     'devices/wifi',
     'helper',