diff --git a/src/routing/aodv/doc/aodv.h b/src/aodv/doc/aodv.h
similarity index 100%
rename from src/routing/aodv/doc/aodv.h
rename to src/aodv/doc/aodv.h
diff --git a/src/routing/aodv/examples/aodv.cc b/src/aodv/examples/aodv.cc
similarity index 100%
rename from src/routing/aodv/examples/aodv.cc
rename to src/aodv/examples/aodv.cc
diff --git a/src/routing/aodv/examples/wscript b/src/aodv/examples/wscript
similarity index 100%
rename from src/routing/aodv/examples/wscript
rename to src/aodv/examples/wscript
diff --git a/src/routing/aodv/helper/aodv-helper.cc b/src/aodv/helper/aodv-helper.cc
similarity index 100%
rename from src/routing/aodv/helper/aodv-helper.cc
rename to src/aodv/helper/aodv-helper.cc
diff --git a/src/routing/aodv/helper/aodv-helper.h b/src/aodv/helper/aodv-helper.h
similarity index 100%
rename from src/routing/aodv/helper/aodv-helper.h
rename to src/aodv/helper/aodv-helper.h
diff --git a/src/routing/aodv/model/aodv-dpd.cc b/src/aodv/model/aodv-dpd.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-dpd.cc
rename to src/aodv/model/aodv-dpd.cc
diff --git a/src/routing/aodv/model/aodv-dpd.h b/src/aodv/model/aodv-dpd.h
similarity index 100%
rename from src/routing/aodv/model/aodv-dpd.h
rename to src/aodv/model/aodv-dpd.h
diff --git a/src/routing/aodv/model/aodv-id-cache.cc b/src/aodv/model/aodv-id-cache.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-id-cache.cc
rename to src/aodv/model/aodv-id-cache.cc
diff --git a/src/routing/aodv/model/aodv-id-cache.h b/src/aodv/model/aodv-id-cache.h
similarity index 100%
rename from src/routing/aodv/model/aodv-id-cache.h
rename to src/aodv/model/aodv-id-cache.h
diff --git a/src/routing/aodv/model/aodv-neighbor.cc b/src/aodv/model/aodv-neighbor.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-neighbor.cc
rename to src/aodv/model/aodv-neighbor.cc
diff --git a/src/routing/aodv/model/aodv-neighbor.h b/src/aodv/model/aodv-neighbor.h
similarity index 100%
rename from src/routing/aodv/model/aodv-neighbor.h
rename to src/aodv/model/aodv-neighbor.h
diff --git a/src/routing/aodv/model/aodv-packet.cc b/src/aodv/model/aodv-packet.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-packet.cc
rename to src/aodv/model/aodv-packet.cc
diff --git a/src/routing/aodv/model/aodv-packet.h b/src/aodv/model/aodv-packet.h
similarity index 100%
rename from src/routing/aodv/model/aodv-packet.h
rename to src/aodv/model/aodv-packet.h
diff --git a/src/routing/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-routing-protocol.cc
rename to src/aodv/model/aodv-routing-protocol.cc
diff --git a/src/routing/aodv/model/aodv-routing-protocol.h b/src/aodv/model/aodv-routing-protocol.h
similarity index 100%
rename from src/routing/aodv/model/aodv-routing-protocol.h
rename to src/aodv/model/aodv-routing-protocol.h
diff --git a/src/routing/aodv/model/aodv-rqueue.cc b/src/aodv/model/aodv-rqueue.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-rqueue.cc
rename to src/aodv/model/aodv-rqueue.cc
diff --git a/src/routing/aodv/model/aodv-rqueue.h b/src/aodv/model/aodv-rqueue.h
similarity index 100%
rename from src/routing/aodv/model/aodv-rqueue.h
rename to src/aodv/model/aodv-rqueue.h
diff --git a/src/routing/aodv/model/aodv-rtable.cc b/src/aodv/model/aodv-rtable.cc
similarity index 100%
rename from src/routing/aodv/model/aodv-rtable.cc
rename to src/aodv/model/aodv-rtable.cc
diff --git a/src/routing/aodv/model/aodv-rtable.h b/src/aodv/model/aodv-rtable.h
similarity index 100%
rename from src/routing/aodv/model/aodv-rtable.h
rename to src/aodv/model/aodv-rtable.h
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/aodv/test/aodv-chain-regression-test-0-0.pcap
similarity index 100%
rename from src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap
rename to src/aodv/test/aodv-chain-regression-test-0-0.pcap
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/aodv/test/aodv-chain-regression-test-1-0.pcap
similarity index 100%
rename from src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap
rename to src/aodv/test/aodv-chain-regression-test-1-0.pcap
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/aodv/test/aodv-chain-regression-test-2-0.pcap
similarity index 100%
rename from src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap
rename to src/aodv/test/aodv-chain-regression-test-2-0.pcap
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/aodv/test/aodv-chain-regression-test-3-0.pcap
similarity index 100%
rename from src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap
rename to src/aodv/test/aodv-chain-regression-test-3-0.pcap
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/aodv/test/aodv-chain-regression-test-4-0.pcap
similarity index 100%
rename from src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap
rename to src/aodv/test/aodv-chain-regression-test-4-0.pcap
diff --git a/src/routing/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc
similarity index 100%
rename from src/routing/aodv/test/aodv-regression.cc
rename to src/aodv/test/aodv-regression.cc
diff --git a/src/routing/aodv/test/aodv-regression.h b/src/aodv/test/aodv-regression.h
similarity index 100%
rename from src/routing/aodv/test/aodv-regression.h
rename to src/aodv/test/aodv-regression.h
diff --git a/src/routing/aodv/test/aodv-test-suite.cc b/src/aodv/test/aodv-test-suite.cc
similarity index 100%
rename from src/routing/aodv/test/aodv-test-suite.cc
rename to src/aodv/test/aodv-test-suite.cc
diff --git a/src/routing/aodv/test/bug-606-test-0-0.pcap b/src/aodv/test/bug-606-test-0-0.pcap
similarity index 100%
rename from src/routing/aodv/test/bug-606-test-0-0.pcap
rename to src/aodv/test/bug-606-test-0-0.pcap
diff --git a/src/routing/aodv/test/bug-606-test-1-0.pcap b/src/aodv/test/bug-606-test-1-0.pcap
similarity index 100%
rename from src/routing/aodv/test/bug-606-test-1-0.pcap
rename to src/aodv/test/bug-606-test-1-0.pcap
diff --git a/src/routing/aodv/test/bug-606-test-2-0.pcap b/src/aodv/test/bug-606-test-2-0.pcap
similarity index 100%
rename from src/routing/aodv/test/bug-606-test-2-0.pcap
rename to src/aodv/test/bug-606-test-2-0.pcap
diff --git a/src/routing/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc
similarity index 100%
rename from src/routing/aodv/test/bug-772.cc
rename to src/aodv/test/bug-772.cc
diff --git a/src/routing/aodv/test/bug-772.h b/src/aodv/test/bug-772.h
similarity index 100%
rename from src/routing/aodv/test/bug-772.h
rename to src/aodv/test/bug-772.h
diff --git a/src/routing/aodv/test/loopback.cc b/src/aodv/test/loopback.cc
similarity index 100%
rename from src/routing/aodv/test/loopback.cc
rename to src/aodv/test/loopback.cc
diff --git a/src/routing/aodv/test/loopback.h b/src/aodv/test/loopback.h
similarity index 100%
rename from src/routing/aodv/test/loopback.h
rename to src/aodv/test/loopback.h
diff --git a/src/routing/aodv/test/tcp-chain-test-0-0.pcap b/src/aodv/test/tcp-chain-test-0-0.pcap
similarity index 100%
rename from src/routing/aodv/test/tcp-chain-test-0-0.pcap
rename to src/aodv/test/tcp-chain-test-0-0.pcap
diff --git a/src/routing/aodv/test/tcp-chain-test-9-0.pcap b/src/aodv/test/tcp-chain-test-9-0.pcap
similarity index 100%
rename from src/routing/aodv/test/tcp-chain-test-9-0.pcap
rename to src/aodv/test/tcp-chain-test-9-0.pcap
diff --git a/src/routing/aodv/test/udp-chain-test-0-0.pcap b/src/aodv/test/udp-chain-test-0-0.pcap
similarity index 100%
rename from src/routing/aodv/test/udp-chain-test-0-0.pcap
rename to src/aodv/test/udp-chain-test-0-0.pcap
diff --git a/src/routing/aodv/test/udp-chain-test-9-0.pcap b/src/aodv/test/udp-chain-test-9-0.pcap
similarity index 100%
rename from src/routing/aodv/test/udp-chain-test-9-0.pcap
rename to src/aodv/test/udp-chain-test-9-0.pcap
diff --git a/src/routing/aodv/waf b/src/aodv/waf
similarity index 100%
rename from src/routing/aodv/waf
rename to src/aodv/waf
diff --git a/src/routing/aodv/wscript b/src/aodv/wscript
similarity index 100%
rename from src/routing/aodv/wscript
rename to src/aodv/wscript
diff --git a/src/devices/bridge/examples/csma-bridge-one-hop.cc b/src/bridge/examples/csma-bridge-one-hop.cc
similarity index 100%
rename from src/devices/bridge/examples/csma-bridge-one-hop.cc
rename to src/bridge/examples/csma-bridge-one-hop.cc
diff --git a/src/devices/bridge/examples/csma-bridge.cc b/src/bridge/examples/csma-bridge.cc
similarity index 100%
rename from src/devices/bridge/examples/csma-bridge.cc
rename to src/bridge/examples/csma-bridge.cc
diff --git a/src/devices/bridge/examples/csma-bridge.py b/src/bridge/examples/csma-bridge.py
similarity index 100%
rename from src/devices/bridge/examples/csma-bridge.py
rename to src/bridge/examples/csma-bridge.py
diff --git a/src/devices/bridge/examples/wscript b/src/bridge/examples/wscript
similarity index 100%
rename from src/devices/bridge/examples/wscript
rename to src/bridge/examples/wscript
diff --git a/src/devices/bridge/helper/bridge-helper.cc b/src/bridge/helper/bridge-helper.cc
similarity index 100%
rename from src/devices/bridge/helper/bridge-helper.cc
rename to src/bridge/helper/bridge-helper.cc
diff --git a/src/devices/bridge/helper/bridge-helper.h b/src/bridge/helper/bridge-helper.h
similarity index 100%
rename from src/devices/bridge/helper/bridge-helper.h
rename to src/bridge/helper/bridge-helper.h
diff --git a/src/devices/bridge/model/bridge-channel.cc b/src/bridge/model/bridge-channel.cc
similarity index 100%
rename from src/devices/bridge/model/bridge-channel.cc
rename to src/bridge/model/bridge-channel.cc
diff --git a/src/devices/bridge/model/bridge-channel.h b/src/bridge/model/bridge-channel.h
similarity index 100%
rename from src/devices/bridge/model/bridge-channel.h
rename to src/bridge/model/bridge-channel.h
diff --git a/src/devices/bridge/model/bridge-net-device.cc b/src/bridge/model/bridge-net-device.cc
similarity index 100%
rename from src/devices/bridge/model/bridge-net-device.cc
rename to src/bridge/model/bridge-net-device.cc
diff --git a/src/devices/bridge/model/bridge-net-device.h b/src/bridge/model/bridge-net-device.h
similarity index 100%
rename from src/devices/bridge/model/bridge-net-device.h
rename to src/bridge/model/bridge-net-device.h
diff --git a/src/devices/bridge/waf b/src/bridge/waf
similarity index 100%
rename from src/devices/bridge/waf
rename to src/bridge/waf
diff --git a/src/devices/bridge/wscript b/src/bridge/wscript
similarity index 100%
rename from src/devices/bridge/wscript
rename to src/bridge/wscript
diff --git a/src/routing/click/doc/click.h b/src/click/doc/click.h
similarity index 100%
rename from src/routing/click/doc/click.h
rename to src/click/doc/click.h
diff --git a/src/routing/click/examples/nsclick-ip-router.click b/src/click/examples/nsclick-ip-router.click
similarity index 100%
rename from src/routing/click/examples/nsclick-ip-router.click
rename to src/click/examples/nsclick-ip-router.click
diff --git a/src/routing/click/examples/nsclick-lan-single-interface.click b/src/click/examples/nsclick-lan-single-interface.click
similarity index 100%
rename from src/routing/click/examples/nsclick-lan-single-interface.click
rename to src/click/examples/nsclick-lan-single-interface.click
diff --git a/src/routing/click/examples/nsclick-raw-wlan.cc b/src/click/examples/nsclick-raw-wlan.cc
similarity index 100%
rename from src/routing/click/examples/nsclick-raw-wlan.cc
rename to src/click/examples/nsclick-raw-wlan.cc
diff --git a/src/routing/click/examples/nsclick-routing-node0.click b/src/click/examples/nsclick-routing-node0.click
similarity index 100%
rename from src/routing/click/examples/nsclick-routing-node0.click
rename to src/click/examples/nsclick-routing-node0.click
diff --git a/src/routing/click/examples/nsclick-routing-node2.click b/src/click/examples/nsclick-routing-node2.click
similarity index 100%
rename from src/routing/click/examples/nsclick-routing-node2.click
rename to src/click/examples/nsclick-routing-node2.click
diff --git a/src/routing/click/examples/nsclick-routing.cc b/src/click/examples/nsclick-routing.cc
similarity index 100%
rename from src/routing/click/examples/nsclick-routing.cc
rename to src/click/examples/nsclick-routing.cc
diff --git a/src/routing/click/examples/nsclick-simple-lan.cc b/src/click/examples/nsclick-simple-lan.cc
similarity index 100%
rename from src/routing/click/examples/nsclick-simple-lan.cc
rename to src/click/examples/nsclick-simple-lan.cc
diff --git a/src/routing/click/examples/nsclick-udp-client-server-csma.cc b/src/click/examples/nsclick-udp-client-server-csma.cc
similarity index 100%
rename from src/routing/click/examples/nsclick-udp-client-server-csma.cc
rename to src/click/examples/nsclick-udp-client-server-csma.cc
diff --git a/src/routing/click/examples/nsclick-udp-client-server-wifi.cc b/src/click/examples/nsclick-udp-client-server-wifi.cc
similarity index 100%
rename from src/routing/click/examples/nsclick-udp-client-server-wifi.cc
rename to src/click/examples/nsclick-udp-client-server-wifi.cc
diff --git a/src/routing/click/examples/nsclick-wifi-single-interface.click b/src/click/examples/nsclick-wifi-single-interface.click
similarity index 100%
rename from src/routing/click/examples/nsclick-wifi-single-interface.click
rename to src/click/examples/nsclick-wifi-single-interface.click
diff --git a/src/routing/click/examples/wscript b/src/click/examples/wscript
similarity index 100%
rename from src/routing/click/examples/wscript
rename to src/click/examples/wscript
diff --git a/src/routing/click/helper/click-internet-stack-helper.cc b/src/click/helper/click-internet-stack-helper.cc
similarity index 100%
rename from src/routing/click/helper/click-internet-stack-helper.cc
rename to src/click/helper/click-internet-stack-helper.cc
diff --git a/src/routing/click/helper/click-internet-stack-helper.h b/src/click/helper/click-internet-stack-helper.h
similarity index 100%
rename from src/routing/click/helper/click-internet-stack-helper.h
rename to src/click/helper/click-internet-stack-helper.h
diff --git a/src/routing/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc
similarity index 100%
rename from src/routing/click/model/ipv4-click-routing.cc
rename to src/click/model/ipv4-click-routing.cc
diff --git a/src/routing/click/model/ipv4-click-routing.h b/src/click/model/ipv4-click-routing.h
similarity index 100%
rename from src/routing/click/model/ipv4-click-routing.h
rename to src/click/model/ipv4-click-routing.h
diff --git a/src/routing/click/model/ipv4-l3-click-protocol.cc b/src/click/model/ipv4-l3-click-protocol.cc
similarity index 100%
rename from src/routing/click/model/ipv4-l3-click-protocol.cc
rename to src/click/model/ipv4-l3-click-protocol.cc
diff --git a/src/routing/click/model/ipv4-l3-click-protocol.h b/src/click/model/ipv4-l3-click-protocol.h
similarity index 100%
rename from src/routing/click/model/ipv4-l3-click-protocol.h
rename to src/click/model/ipv4-l3-click-protocol.h
diff --git a/src/routing/click/test/ipv4-click-routing-test.cc b/src/click/test/ipv4-click-routing-test.cc
similarity index 100%
rename from src/routing/click/test/ipv4-click-routing-test.cc
rename to src/click/test/ipv4-click-routing-test.cc
diff --git a/src/devices/csma/waf b/src/click/waf
old mode 100755
new mode 100644
similarity index 100%
rename from src/devices/csma/waf
rename to src/click/waf
diff --git a/src/routing/click/wscript b/src/click/wscript
similarity index 100%
rename from src/routing/click/wscript
rename to src/click/wscript
diff --git a/src/devices/csma/examples/csma-broadcast.cc b/src/csma/examples/csma-broadcast.cc
similarity index 100%
rename from src/devices/csma/examples/csma-broadcast.cc
rename to src/csma/examples/csma-broadcast.cc
diff --git a/src/devices/csma/examples/csma-multicast.cc b/src/csma/examples/csma-multicast.cc
similarity index 100%
rename from src/devices/csma/examples/csma-multicast.cc
rename to src/csma/examples/csma-multicast.cc
diff --git a/src/devices/csma/examples/csma-one-subnet.cc b/src/csma/examples/csma-one-subnet.cc
similarity index 100%
rename from src/devices/csma/examples/csma-one-subnet.cc
rename to src/csma/examples/csma-one-subnet.cc
diff --git a/src/devices/csma/examples/csma-packet-socket.cc b/src/csma/examples/csma-packet-socket.cc
similarity index 100%
rename from src/devices/csma/examples/csma-packet-socket.cc
rename to src/csma/examples/csma-packet-socket.cc
diff --git a/src/devices/csma/examples/csma-ping.cc b/src/csma/examples/csma-ping.cc
similarity index 100%
rename from src/devices/csma/examples/csma-ping.cc
rename to src/csma/examples/csma-ping.cc
diff --git a/src/devices/csma/examples/csma-raw-ip-socket.cc b/src/csma/examples/csma-raw-ip-socket.cc
similarity index 100%
rename from src/devices/csma/examples/csma-raw-ip-socket.cc
rename to src/csma/examples/csma-raw-ip-socket.cc
diff --git a/src/devices/csma/examples/csma-star.cc b/src/csma/examples/csma-star.cc
similarity index 100%
rename from src/devices/csma/examples/csma-star.cc
rename to src/csma/examples/csma-star.cc
diff --git a/src/devices/csma/examples/waf b/src/csma/examples/waf
similarity index 100%
rename from src/devices/csma/examples/waf
rename to src/csma/examples/waf
diff --git a/src/devices/csma/examples/wscript b/src/csma/examples/wscript
similarity index 100%
rename from src/devices/csma/examples/wscript
rename to src/csma/examples/wscript
diff --git a/src/devices/csma/helper/csma-helper.cc b/src/csma/helper/csma-helper.cc
similarity index 100%
rename from src/devices/csma/helper/csma-helper.cc
rename to src/csma/helper/csma-helper.cc
diff --git a/src/devices/csma/helper/csma-helper.h b/src/csma/helper/csma-helper.h
similarity index 100%
rename from src/devices/csma/helper/csma-helper.h
rename to src/csma/helper/csma-helper.h
diff --git a/src/devices/csma/helper/csma-star-helper.cc b/src/csma/helper/csma-star-helper.cc
similarity index 100%
rename from src/devices/csma/helper/csma-star-helper.cc
rename to src/csma/helper/csma-star-helper.cc
diff --git a/src/devices/csma/helper/csma-star-helper.h b/src/csma/helper/csma-star-helper.h
similarity index 100%
rename from src/devices/csma/helper/csma-star-helper.h
rename to src/csma/helper/csma-star-helper.h
diff --git a/src/devices/csma/model/backoff.cc b/src/csma/model/backoff.cc
similarity index 100%
rename from src/devices/csma/model/backoff.cc
rename to src/csma/model/backoff.cc
diff --git a/src/devices/csma/model/backoff.h b/src/csma/model/backoff.h
similarity index 100%
rename from src/devices/csma/model/backoff.h
rename to src/csma/model/backoff.h
diff --git a/src/devices/csma/model/csma-channel.cc b/src/csma/model/csma-channel.cc
similarity index 100%
rename from src/devices/csma/model/csma-channel.cc
rename to src/csma/model/csma-channel.cc
diff --git a/src/devices/csma/model/csma-channel.h b/src/csma/model/csma-channel.h
similarity index 100%
rename from src/devices/csma/model/csma-channel.h
rename to src/csma/model/csma-channel.h
diff --git a/src/devices/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc
similarity index 100%
rename from src/devices/csma/model/csma-net-device.cc
rename to src/csma/model/csma-net-device.cc
diff --git a/src/devices/csma/model/csma-net-device.h b/src/csma/model/csma-net-device.h
similarity index 100%
rename from src/devices/csma/model/csma-net-device.h
rename to src/csma/model/csma-net-device.h
diff --git a/src/devices/csma/model/csma.h b/src/csma/model/csma.h
similarity index 100%
rename from src/devices/csma/model/csma.h
rename to src/csma/model/csma.h
diff --git a/src/devices/emu/waf b/src/csma/waf
similarity index 100%
rename from src/devices/emu/waf
rename to src/csma/waf
diff --git a/src/devices/csma/wscript b/src/csma/wscript
similarity index 100%
rename from src/devices/csma/wscript
rename to src/csma/wscript
diff --git a/src/routing/dsdv/doc/dsdv.h b/src/dsdv/doc/dsdv.h
similarity index 100%
rename from src/routing/dsdv/doc/dsdv.h
rename to src/dsdv/doc/dsdv.h
diff --git a/src/routing/dsdv/examples/dsdv-manet.cc b/src/dsdv/examples/dsdv-manet.cc
similarity index 100%
rename from src/routing/dsdv/examples/dsdv-manet.cc
rename to src/dsdv/examples/dsdv-manet.cc
diff --git a/src/routing/dsdv/examples/wscript b/src/dsdv/examples/wscript
similarity index 100%
rename from src/routing/dsdv/examples/wscript
rename to src/dsdv/examples/wscript
diff --git a/src/routing/dsdv/helper/dsdv-helper.cc b/src/dsdv/helper/dsdv-helper.cc
similarity index 100%
rename from src/routing/dsdv/helper/dsdv-helper.cc
rename to src/dsdv/helper/dsdv-helper.cc
diff --git a/src/routing/dsdv/helper/dsdv-helper.h b/src/dsdv/helper/dsdv-helper.h
similarity index 100%
rename from src/routing/dsdv/helper/dsdv-helper.h
rename to src/dsdv/helper/dsdv-helper.h
diff --git a/src/routing/dsdv/model/dsdv-packet-queue.cc b/src/dsdv/model/dsdv-packet-queue.cc
similarity index 100%
rename from src/routing/dsdv/model/dsdv-packet-queue.cc
rename to src/dsdv/model/dsdv-packet-queue.cc
diff --git a/src/routing/dsdv/model/dsdv-packet-queue.h b/src/dsdv/model/dsdv-packet-queue.h
similarity index 100%
rename from src/routing/dsdv/model/dsdv-packet-queue.h
rename to src/dsdv/model/dsdv-packet-queue.h
diff --git a/src/routing/dsdv/model/dsdv-packet.cc b/src/dsdv/model/dsdv-packet.cc
similarity index 100%
rename from src/routing/dsdv/model/dsdv-packet.cc
rename to src/dsdv/model/dsdv-packet.cc
diff --git a/src/routing/dsdv/model/dsdv-packet.h b/src/dsdv/model/dsdv-packet.h
similarity index 100%
rename from src/routing/dsdv/model/dsdv-packet.h
rename to src/dsdv/model/dsdv-packet.h
diff --git a/src/routing/dsdv/model/dsdv-routing-protocol.cc b/src/dsdv/model/dsdv-routing-protocol.cc
similarity index 100%
rename from src/routing/dsdv/model/dsdv-routing-protocol.cc
rename to src/dsdv/model/dsdv-routing-protocol.cc
diff --git a/src/routing/dsdv/model/dsdv-routing-protocol.h b/src/dsdv/model/dsdv-routing-protocol.h
similarity index 100%
rename from src/routing/dsdv/model/dsdv-routing-protocol.h
rename to src/dsdv/model/dsdv-routing-protocol.h
diff --git a/src/routing/dsdv/model/dsdv-rtable.cc b/src/dsdv/model/dsdv-rtable.cc
similarity index 100%
rename from src/routing/dsdv/model/dsdv-rtable.cc
rename to src/dsdv/model/dsdv-rtable.cc
diff --git a/src/routing/dsdv/model/dsdv-rtable.h b/src/dsdv/model/dsdv-rtable.h
similarity index 100%
rename from src/routing/dsdv/model/dsdv-rtable.h
rename to src/dsdv/model/dsdv-rtable.h
diff --git a/src/routing/dsdv/test/dsdv-testcase.cc b/src/dsdv/test/dsdv-testcase.cc
similarity index 100%
rename from src/routing/dsdv/test/dsdv-testcase.cc
rename to src/dsdv/test/dsdv-testcase.cc
diff --git a/src/routing/dsdv/wscript b/src/dsdv/wscript
similarity index 100%
rename from src/routing/dsdv/wscript
rename to src/dsdv/wscript
diff --git a/src/devices/emu/doc/emu.h b/src/emu/doc/emu.h
similarity index 100%
rename from src/devices/emu/doc/emu.h
rename to src/emu/doc/emu.h
diff --git a/src/devices/emu/examples/emu-ping.cc b/src/emu/examples/emu-ping.cc
similarity index 100%
rename from src/devices/emu/examples/emu-ping.cc
rename to src/emu/examples/emu-ping.cc
diff --git a/src/devices/emu/examples/emu-udp-echo.cc b/src/emu/examples/emu-udp-echo.cc
similarity index 100%
rename from src/devices/emu/examples/emu-udp-echo.cc
rename to src/emu/examples/emu-udp-echo.cc
diff --git a/src/devices/emu/examples/waf b/src/emu/examples/waf
similarity index 100%
rename from src/devices/emu/examples/waf
rename to src/emu/examples/waf
diff --git a/src/devices/emu/examples/wscript b/src/emu/examples/wscript
similarity index 100%
rename from src/devices/emu/examples/wscript
rename to src/emu/examples/wscript
diff --git a/src/devices/emu/helper/emu-helper.cc b/src/emu/helper/emu-helper.cc
similarity index 100%
rename from src/devices/emu/helper/emu-helper.cc
rename to src/emu/helper/emu-helper.cc
diff --git a/src/devices/emu/helper/emu-helper.h b/src/emu/helper/emu-helper.h
similarity index 100%
rename from src/devices/emu/helper/emu-helper.h
rename to src/emu/helper/emu-helper.h
diff --git a/src/devices/emu/model/emu-encode-decode.cc b/src/emu/model/emu-encode-decode.cc
similarity index 100%
rename from src/devices/emu/model/emu-encode-decode.cc
rename to src/emu/model/emu-encode-decode.cc
diff --git a/src/devices/emu/model/emu-encode-decode.h b/src/emu/model/emu-encode-decode.h
similarity index 100%
rename from src/devices/emu/model/emu-encode-decode.h
rename to src/emu/model/emu-encode-decode.h
diff --git a/src/devices/emu/model/emu-net-device.cc b/src/emu/model/emu-net-device.cc
similarity index 100%
rename from src/devices/emu/model/emu-net-device.cc
rename to src/emu/model/emu-net-device.cc
diff --git a/src/devices/emu/model/emu-net-device.h b/src/emu/model/emu-net-device.h
similarity index 100%
rename from src/devices/emu/model/emu-net-device.h
rename to src/emu/model/emu-net-device.h
diff --git a/src/devices/emu/model/emu-sock-creator.cc b/src/emu/model/emu-sock-creator.cc
similarity index 100%
rename from src/devices/emu/model/emu-sock-creator.cc
rename to src/emu/model/emu-sock-creator.cc
diff --git a/src/devices/point-to-point/waf b/src/emu/waf
similarity index 100%
rename from src/devices/point-to-point/waf
rename to src/emu/waf
diff --git a/src/devices/emu/wscript b/src/emu/wscript
similarity index 100%
rename from src/devices/emu/wscript
rename to src/emu/wscript
diff --git a/src/devices/lte/AUTHORS b/src/lte/AUTHORS
similarity index 100%
rename from src/devices/lte/AUTHORS
rename to src/lte/AUTHORS
diff --git a/src/devices/lte/examples/lte-amc.cc b/src/lte/examples/lte-amc.cc
similarity index 100%
rename from src/devices/lte/examples/lte-amc.cc
rename to src/lte/examples/lte-amc.cc
diff --git a/src/devices/lte/examples/lte-channel-model.cc b/src/lte/examples/lte-channel-model.cc
similarity index 100%
rename from src/devices/lte/examples/lte-channel-model.cc
rename to src/lte/examples/lte-channel-model.cc
diff --git a/src/devices/lte/examples/lte-device.cc b/src/lte/examples/lte-device.cc
similarity index 100%
rename from src/devices/lte/examples/lte-device.cc
rename to src/lte/examples/lte-device.cc
diff --git a/src/devices/lte/examples/lte-multiple-flows.cc b/src/lte/examples/lte-multiple-flows.cc
similarity index 100%
rename from src/devices/lte/examples/lte-multiple-flows.cc
rename to src/lte/examples/lte-multiple-flows.cc
diff --git a/src/devices/lte/examples/lte-phy-downlink.cc b/src/lte/examples/lte-phy-downlink.cc
similarity index 100%
rename from src/devices/lte/examples/lte-phy-downlink.cc
rename to src/lte/examples/lte-phy-downlink.cc
diff --git a/src/devices/lte/examples/lte-phy-uplink.cc b/src/lte/examples/lte-phy-uplink.cc
similarity index 100%
rename from src/devices/lte/examples/lte-phy-uplink.cc
rename to src/lte/examples/lte-phy-uplink.cc
diff --git a/src/devices/lte/examples/waf b/src/lte/examples/waf
similarity index 100%
rename from src/devices/lte/examples/waf
rename to src/lte/examples/waf
diff --git a/src/devices/lte/examples/wscript b/src/lte/examples/wscript
similarity index 100%
rename from src/devices/lte/examples/wscript
rename to src/lte/examples/wscript
diff --git a/src/devices/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc
similarity index 100%
rename from src/devices/lte/helper/lte-helper.cc
rename to src/lte/helper/lte-helper.cc
diff --git a/src/devices/lte/helper/lte-helper.h b/src/lte/helper/lte-helper.h
similarity index 100%
rename from src/devices/lte/helper/lte-helper.h
rename to src/lte/helper/lte-helper.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v0_M10.h b/src/lte/model/JakesTraces/multipath_v0_M10.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v0_M10.h
rename to src/lte/model/JakesTraces/multipath_v0_M10.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v0_M12.h b/src/lte/model/JakesTraces/multipath_v0_M12.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v0_M12.h
rename to src/lte/model/JakesTraces/multipath_v0_M12.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v0_M6.h b/src/lte/model/JakesTraces/multipath_v0_M6.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v0_M6.h
rename to src/lte/model/JakesTraces/multipath_v0_M6.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v0_M8.h b/src/lte/model/JakesTraces/multipath_v0_M8.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v0_M8.h
rename to src/lte/model/JakesTraces/multipath_v0_M8.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v120_M10.h b/src/lte/model/JakesTraces/multipath_v120_M10.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v120_M10.h
rename to src/lte/model/JakesTraces/multipath_v120_M10.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v120_M12.h b/src/lte/model/JakesTraces/multipath_v120_M12.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v120_M12.h
rename to src/lte/model/JakesTraces/multipath_v120_M12.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v120_M6.h b/src/lte/model/JakesTraces/multipath_v120_M6.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v120_M6.h
rename to src/lte/model/JakesTraces/multipath_v120_M6.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v120_M8.h b/src/lte/model/JakesTraces/multipath_v120_M8.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v120_M8.h
rename to src/lte/model/JakesTraces/multipath_v120_M8.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v30_M10.h b/src/lte/model/JakesTraces/multipath_v30_M10.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v30_M10.h
rename to src/lte/model/JakesTraces/multipath_v30_M10.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v30_M12.h b/src/lte/model/JakesTraces/multipath_v30_M12.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v30_M12.h
rename to src/lte/model/JakesTraces/multipath_v30_M12.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v30_M6.h b/src/lte/model/JakesTraces/multipath_v30_M6.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v30_M6.h
rename to src/lte/model/JakesTraces/multipath_v30_M6.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v30_M8.h b/src/lte/model/JakesTraces/multipath_v30_M8.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v30_M8.h
rename to src/lte/model/JakesTraces/multipath_v30_M8.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v3_M10.h b/src/lte/model/JakesTraces/multipath_v3_M10.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v3_M10.h
rename to src/lte/model/JakesTraces/multipath_v3_M10.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v3_M12.h b/src/lte/model/JakesTraces/multipath_v3_M12.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v3_M12.h
rename to src/lte/model/JakesTraces/multipath_v3_M12.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v3_M6.h b/src/lte/model/JakesTraces/multipath_v3_M6.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v3_M6.h
rename to src/lte/model/JakesTraces/multipath_v3_M6.h
diff --git a/src/devices/lte/model/JakesTraces/multipath_v3_M8.h b/src/lte/model/JakesTraces/multipath_v3_M8.h
similarity index 100%
rename from src/devices/lte/model/JakesTraces/multipath_v3_M8.h
rename to src/lte/model/JakesTraces/multipath_v3_M8.h
diff --git a/src/devices/lte/model/amc-module.cc b/src/lte/model/amc-module.cc
similarity index 100%
rename from src/devices/lte/model/amc-module.cc
rename to src/lte/model/amc-module.cc
diff --git a/src/devices/lte/model/amc-module.h b/src/lte/model/amc-module.h
similarity index 100%
rename from src/devices/lte/model/amc-module.h
rename to src/lte/model/amc-module.h
diff --git a/src/devices/lte/model/bearer-qos-parameters.cc b/src/lte/model/bearer-qos-parameters.cc
similarity index 100%
rename from src/devices/lte/model/bearer-qos-parameters.cc
rename to src/lte/model/bearer-qos-parameters.cc
diff --git a/src/devices/lte/model/bearer-qos-parameters.h b/src/lte/model/bearer-qos-parameters.h
similarity index 100%
rename from src/devices/lte/model/bearer-qos-parameters.h
rename to src/lte/model/bearer-qos-parameters.h
diff --git a/src/devices/lte/model/channel-realization.cc b/src/lte/model/channel-realization.cc
similarity index 100%
rename from src/devices/lte/model/channel-realization.cc
rename to src/lte/model/channel-realization.cc
diff --git a/src/devices/lte/model/channel-realization.h b/src/lte/model/channel-realization.h
similarity index 100%
rename from src/devices/lte/model/channel-realization.h
rename to src/lte/model/channel-realization.h
diff --git a/src/devices/lte/model/discrete-time-loss-model.cc b/src/lte/model/discrete-time-loss-model.cc
similarity index 100%
rename from src/devices/lte/model/discrete-time-loss-model.cc
rename to src/lte/model/discrete-time-loss-model.cc
diff --git a/src/devices/lte/model/discrete-time-loss-model.h b/src/lte/model/discrete-time-loss-model.h
similarity index 100%
rename from src/devices/lte/model/discrete-time-loss-model.h
rename to src/lte/model/discrete-time-loss-model.h
diff --git a/src/devices/lte/model/enb-lte-spectrum-phy.cc b/src/lte/model/enb-lte-spectrum-phy.cc
similarity index 100%
rename from src/devices/lte/model/enb-lte-spectrum-phy.cc
rename to src/lte/model/enb-lte-spectrum-phy.cc
diff --git a/src/devices/lte/model/enb-lte-spectrum-phy.h b/src/lte/model/enb-lte-spectrum-phy.h
similarity index 100%
rename from src/devices/lte/model/enb-lte-spectrum-phy.h
rename to src/lte/model/enb-lte-spectrum-phy.h
diff --git a/src/devices/lte/model/enb-mac-entity.cc b/src/lte/model/enb-mac-entity.cc
similarity index 100%
rename from src/devices/lte/model/enb-mac-entity.cc
rename to src/lte/model/enb-mac-entity.cc
diff --git a/src/devices/lte/model/enb-mac-entity.h b/src/lte/model/enb-mac-entity.h
similarity index 100%
rename from src/devices/lte/model/enb-mac-entity.h
rename to src/lte/model/enb-mac-entity.h
diff --git a/src/devices/lte/model/enb-net-device.cc b/src/lte/model/enb-net-device.cc
similarity index 100%
rename from src/devices/lte/model/enb-net-device.cc
rename to src/lte/model/enb-net-device.cc
diff --git a/src/devices/lte/model/enb-net-device.h b/src/lte/model/enb-net-device.h
similarity index 100%
rename from src/devices/lte/model/enb-net-device.h
rename to src/lte/model/enb-net-device.h
diff --git a/src/devices/lte/model/enb-phy.cc b/src/lte/model/enb-phy.cc
similarity index 100%
rename from src/devices/lte/model/enb-phy.cc
rename to src/lte/model/enb-phy.cc
diff --git a/src/devices/lte/model/enb-phy.h b/src/lte/model/enb-phy.h
similarity index 100%
rename from src/devices/lte/model/enb-phy.h
rename to src/lte/model/enb-phy.h
diff --git a/src/devices/lte/model/ideal-control-messages.cc b/src/lte/model/ideal-control-messages.cc
similarity index 100%
rename from src/devices/lte/model/ideal-control-messages.cc
rename to src/lte/model/ideal-control-messages.cc
diff --git a/src/devices/lte/model/ideal-control-messages.h b/src/lte/model/ideal-control-messages.h
similarity index 100%
rename from src/devices/lte/model/ideal-control-messages.h
rename to src/lte/model/ideal-control-messages.h
diff --git a/src/devices/lte/model/jakes-fading-loss-model.cc b/src/lte/model/jakes-fading-loss-model.cc
similarity index 100%
rename from src/devices/lte/model/jakes-fading-loss-model.cc
rename to src/lte/model/jakes-fading-loss-model.cc
diff --git a/src/devices/lte/model/jakes-fading-loss-model.h b/src/lte/model/jakes-fading-loss-model.h
similarity index 100%
rename from src/devices/lte/model/jakes-fading-loss-model.h
rename to src/lte/model/jakes-fading-loss-model.h
diff --git a/src/devices/lte/model/jakes-fading-realizations.h b/src/lte/model/jakes-fading-realizations.h
similarity index 100%
rename from src/devices/lte/model/jakes-fading-realizations.h
rename to src/lte/model/jakes-fading-realizations.h
diff --git a/src/devices/lte/model/lte-mac-header.cc b/src/lte/model/lte-mac-header.cc
similarity index 100%
rename from src/devices/lte/model/lte-mac-header.cc
rename to src/lte/model/lte-mac-header.cc
diff --git a/src/devices/lte/model/lte-mac-header.h b/src/lte/model/lte-mac-header.h
similarity index 100%
rename from src/devices/lte/model/lte-mac-header.h
rename to src/lte/model/lte-mac-header.h
diff --git a/src/devices/lte/model/lte-mac-queue.cc b/src/lte/model/lte-mac-queue.cc
similarity index 100%
rename from src/devices/lte/model/lte-mac-queue.cc
rename to src/lte/model/lte-mac-queue.cc
diff --git a/src/devices/lte/model/lte-mac-queue.h b/src/lte/model/lte-mac-queue.h
similarity index 100%
rename from src/devices/lte/model/lte-mac-queue.h
rename to src/lte/model/lte-mac-queue.h
diff --git a/src/devices/lte/model/lte-net-device.cc b/src/lte/model/lte-net-device.cc
similarity index 100%
rename from src/devices/lte/model/lte-net-device.cc
rename to src/lte/model/lte-net-device.cc
diff --git a/src/devices/lte/model/lte-net-device.h b/src/lte/model/lte-net-device.h
similarity index 100%
rename from src/devices/lte/model/lte-net-device.h
rename to src/lte/model/lte-net-device.h
diff --git a/src/devices/lte/model/lte-phy.cc b/src/lte/model/lte-phy.cc
similarity index 100%
rename from src/devices/lte/model/lte-phy.cc
rename to src/lte/model/lte-phy.cc
diff --git a/src/devices/lte/model/lte-phy.h b/src/lte/model/lte-phy.h
similarity index 100%
rename from src/devices/lte/model/lte-phy.h
rename to src/lte/model/lte-phy.h
diff --git a/src/devices/lte/model/lte-propagation-loss-model.cc b/src/lte/model/lte-propagation-loss-model.cc
similarity index 100%
rename from src/devices/lte/model/lte-propagation-loss-model.cc
rename to src/lte/model/lte-propagation-loss-model.cc
diff --git a/src/devices/lte/model/lte-propagation-loss-model.h b/src/lte/model/lte-propagation-loss-model.h
similarity index 100%
rename from src/devices/lte/model/lte-propagation-loss-model.h
rename to src/lte/model/lte-propagation-loss-model.h
diff --git a/src/devices/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc
similarity index 100%
rename from src/devices/lte/model/lte-spectrum-phy.cc
rename to src/lte/model/lte-spectrum-phy.cc
diff --git a/src/devices/lte/model/lte-spectrum-phy.h b/src/lte/model/lte-spectrum-phy.h
similarity index 100%
rename from src/devices/lte/model/lte-spectrum-phy.h
rename to src/lte/model/lte-spectrum-phy.h
diff --git a/src/devices/lte/model/lte-spectrum-value-helper.cc b/src/lte/model/lte-spectrum-value-helper.cc
similarity index 100%
rename from src/devices/lte/model/lte-spectrum-value-helper.cc
rename to src/lte/model/lte-spectrum-value-helper.cc
diff --git a/src/devices/lte/model/lte-spectrum-value-helper.h b/src/lte/model/lte-spectrum-value-helper.h
similarity index 100%
rename from src/devices/lte/model/lte-spectrum-value-helper.h
rename to src/lte/model/lte-spectrum-value-helper.h
diff --git a/src/devices/lte/model/mac-entity.cc b/src/lte/model/mac-entity.cc
similarity index 100%
rename from src/devices/lte/model/mac-entity.cc
rename to src/lte/model/mac-entity.cc
diff --git a/src/devices/lte/model/mac-entity.h b/src/lte/model/mac-entity.h
similarity index 100%
rename from src/devices/lte/model/mac-entity.h
rename to src/lte/model/mac-entity.h
diff --git a/src/devices/lte/model/packet-scheduler.cc b/src/lte/model/packet-scheduler.cc
similarity index 100%
rename from src/devices/lte/model/packet-scheduler.cc
rename to src/lte/model/packet-scheduler.cc
diff --git a/src/devices/lte/model/packet-scheduler.h b/src/lte/model/packet-scheduler.h
similarity index 100%
rename from src/devices/lte/model/packet-scheduler.h
rename to src/lte/model/packet-scheduler.h
diff --git a/src/devices/lte/model/path-loss-model.cc b/src/lte/model/path-loss-model.cc
similarity index 100%
rename from src/devices/lte/model/path-loss-model.cc
rename to src/lte/model/path-loss-model.cc
diff --git a/src/devices/lte/model/path-loss-model.h b/src/lte/model/path-loss-model.h
similarity index 100%
rename from src/devices/lte/model/path-loss-model.h
rename to src/lte/model/path-loss-model.h
diff --git a/src/devices/lte/model/penetration-loss-model.cc b/src/lte/model/penetration-loss-model.cc
similarity index 100%
rename from src/devices/lte/model/penetration-loss-model.cc
rename to src/lte/model/penetration-loss-model.cc
diff --git a/src/devices/lte/model/penetration-loss-model.h b/src/lte/model/penetration-loss-model.h
similarity index 100%
rename from src/devices/lte/model/penetration-loss-model.h
rename to src/lte/model/penetration-loss-model.h
diff --git a/src/devices/lte/model/radio-bearer-instance.cc b/src/lte/model/radio-bearer-instance.cc
similarity index 100%
rename from src/devices/lte/model/radio-bearer-instance.cc
rename to src/lte/model/radio-bearer-instance.cc
diff --git a/src/devices/lte/model/radio-bearer-instance.h b/src/lte/model/radio-bearer-instance.h
similarity index 100%
rename from src/devices/lte/model/radio-bearer-instance.h
rename to src/lte/model/radio-bearer-instance.h
diff --git a/src/devices/lte/model/rlc-entity.cc b/src/lte/model/rlc-entity.cc
similarity index 100%
rename from src/devices/lte/model/rlc-entity.cc
rename to src/lte/model/rlc-entity.cc
diff --git a/src/devices/lte/model/rlc-entity.h b/src/lte/model/rlc-entity.h
similarity index 100%
rename from src/devices/lte/model/rlc-entity.h
rename to src/lte/model/rlc-entity.h
diff --git a/src/devices/lte/model/rrc-entity.cc b/src/lte/model/rrc-entity.cc
similarity index 100%
rename from src/devices/lte/model/rrc-entity.cc
rename to src/lte/model/rrc-entity.cc
diff --git a/src/devices/lte/model/rrc-entity.h b/src/lte/model/rrc-entity.h
similarity index 100%
rename from src/devices/lte/model/rrc-entity.h
rename to src/lte/model/rrc-entity.h
diff --git a/src/devices/lte/model/shadowing-loss-model.cc b/src/lte/model/shadowing-loss-model.cc
similarity index 100%
rename from src/devices/lte/model/shadowing-loss-model.cc
rename to src/lte/model/shadowing-loss-model.cc
diff --git a/src/devices/lte/model/shadowing-loss-model.h b/src/lte/model/shadowing-loss-model.h
similarity index 100%
rename from src/devices/lte/model/shadowing-loss-model.h
rename to src/lte/model/shadowing-loss-model.h
diff --git a/src/devices/lte/model/simple-packet-scheduler.cc b/src/lte/model/simple-packet-scheduler.cc
similarity index 100%
rename from src/devices/lte/model/simple-packet-scheduler.cc
rename to src/lte/model/simple-packet-scheduler.cc
diff --git a/src/devices/lte/model/simple-packet-scheduler.h b/src/lte/model/simple-packet-scheduler.h
similarity index 100%
rename from src/devices/lte/model/simple-packet-scheduler.h
rename to src/lte/model/simple-packet-scheduler.h
diff --git a/src/devices/lte/model/ue-lte-spectrum-phy.cc b/src/lte/model/ue-lte-spectrum-phy.cc
similarity index 100%
rename from src/devices/lte/model/ue-lte-spectrum-phy.cc
rename to src/lte/model/ue-lte-spectrum-phy.cc
diff --git a/src/devices/lte/model/ue-lte-spectrum-phy.h b/src/lte/model/ue-lte-spectrum-phy.h
similarity index 100%
rename from src/devices/lte/model/ue-lte-spectrum-phy.h
rename to src/lte/model/ue-lte-spectrum-phy.h
diff --git a/src/devices/lte/model/ue-mac-entity.cc b/src/lte/model/ue-mac-entity.cc
similarity index 100%
rename from src/devices/lte/model/ue-mac-entity.cc
rename to src/lte/model/ue-mac-entity.cc
diff --git a/src/devices/lte/model/ue-mac-entity.h b/src/lte/model/ue-mac-entity.h
similarity index 100%
rename from src/devices/lte/model/ue-mac-entity.h
rename to src/lte/model/ue-mac-entity.h
diff --git a/src/devices/lte/model/ue-manager.cc b/src/lte/model/ue-manager.cc
similarity index 100%
rename from src/devices/lte/model/ue-manager.cc
rename to src/lte/model/ue-manager.cc
diff --git a/src/devices/lte/model/ue-manager.h b/src/lte/model/ue-manager.h
similarity index 100%
rename from src/devices/lte/model/ue-manager.h
rename to src/lte/model/ue-manager.h
diff --git a/src/devices/lte/model/ue-net-device.cc b/src/lte/model/ue-net-device.cc
similarity index 100%
rename from src/devices/lte/model/ue-net-device.cc
rename to src/lte/model/ue-net-device.cc
diff --git a/src/devices/lte/model/ue-net-device.h b/src/lte/model/ue-net-device.h
similarity index 100%
rename from src/devices/lte/model/ue-net-device.h
rename to src/lte/model/ue-net-device.h
diff --git a/src/devices/lte/model/ue-phy.cc b/src/lte/model/ue-phy.cc
similarity index 100%
rename from src/devices/lte/model/ue-phy.cc
rename to src/lte/model/ue-phy.cc
diff --git a/src/devices/lte/model/ue-phy.h b/src/lte/model/ue-phy.h
similarity index 100%
rename from src/devices/lte/model/ue-phy.h
rename to src/lte/model/ue-phy.h
diff --git a/src/devices/lte/model/ue-record.cc b/src/lte/model/ue-record.cc
similarity index 100%
rename from src/devices/lte/model/ue-record.cc
rename to src/lte/model/ue-record.cc
diff --git a/src/devices/lte/model/ue-record.h b/src/lte/model/ue-record.h
similarity index 100%
rename from src/devices/lte/model/ue-record.h
rename to src/lte/model/ue-record.h
diff --git a/src/devices/lte/test/lte-bearer-test.cc b/src/lte/test/lte-bearer-test.cc
similarity index 100%
rename from src/devices/lte/test/lte-bearer-test.cc
rename to src/lte/test/lte-bearer-test.cc
diff --git a/src/devices/lte/test/lte-device-test.cc b/src/lte/test/lte-device-test.cc
similarity index 100%
rename from src/devices/lte/test/lte-device-test.cc
rename to src/lte/test/lte-device-test.cc
diff --git a/src/devices/lte/test/lte-phy-test.cc b/src/lte/test/lte-phy-test.cc
similarity index 100%
rename from src/devices/lte/test/lte-phy-test.cc
rename to src/lte/test/lte-phy-test.cc
diff --git a/src/devices/lte/test/lte-propagation-loss-model-test.cc b/src/lte/test/lte-propagation-loss-model-test.cc
similarity index 100%
rename from src/devices/lte/test/lte-propagation-loss-model-test.cc
rename to src/lte/test/lte-propagation-loss-model-test.cc
diff --git a/src/devices/lte/wscript b/src/lte/wscript
similarity index 100%
rename from src/devices/lte/wscript
rename to src/lte/wscript
diff --git a/src/routing/nix-vector-routing/doc/nix-vector-routing.h b/src/nix-vector-routing/doc/nix-vector-routing.h
similarity index 100%
rename from src/routing/nix-vector-routing/doc/nix-vector-routing.h
rename to src/nix-vector-routing/doc/nix-vector-routing.h
diff --git a/src/routing/nix-vector-routing/examples/nix-simple.cc b/src/nix-vector-routing/examples/nix-simple.cc
similarity index 100%
rename from src/routing/nix-vector-routing/examples/nix-simple.cc
rename to src/nix-vector-routing/examples/nix-simple.cc
diff --git a/src/routing/nix-vector-routing/examples/nms-p2p-nix.cc b/src/nix-vector-routing/examples/nms-p2p-nix.cc
similarity index 100%
rename from src/routing/nix-vector-routing/examples/nms-p2p-nix.cc
rename to src/nix-vector-routing/examples/nms-p2p-nix.cc
diff --git a/src/routing/nix-vector-routing/examples/wscript b/src/nix-vector-routing/examples/wscript
similarity index 100%
rename from src/routing/nix-vector-routing/examples/wscript
rename to src/nix-vector-routing/examples/wscript
diff --git a/src/routing/nix-vector-routing/helper/ipv4-nix-vector-helper.cc b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc
similarity index 100%
rename from src/routing/nix-vector-routing/helper/ipv4-nix-vector-helper.cc
rename to src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc
diff --git a/src/routing/nix-vector-routing/helper/ipv4-nix-vector-helper.h b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h
similarity index 100%
rename from src/routing/nix-vector-routing/helper/ipv4-nix-vector-helper.h
rename to src/nix-vector-routing/helper/ipv4-nix-vector-helper.h
diff --git a/src/routing/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
similarity index 100%
rename from src/routing/nix-vector-routing/model/ipv4-nix-vector-routing.cc
rename to src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
diff --git a/src/routing/nix-vector-routing/model/ipv4-nix-vector-routing.h b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
similarity index 100%
rename from src/routing/nix-vector-routing/model/ipv4-nix-vector-routing.h
rename to src/nix-vector-routing/model/ipv4-nix-vector-routing.h
diff --git a/src/devices/tap-bridge/waf b/src/nix-vector-routing/waf
old mode 100755
new mode 100644
similarity index 100%
rename from src/devices/tap-bridge/waf
rename to src/nix-vector-routing/waf
diff --git a/src/routing/nix-vector-routing/wscript b/src/nix-vector-routing/wscript
similarity index 100%
rename from src/routing/nix-vector-routing/wscript
rename to src/nix-vector-routing/wscript
diff --git a/src/routing/olsr/doc/olsr.h b/src/olsr/doc/olsr.h
similarity index 100%
rename from src/routing/olsr/doc/olsr.h
rename to src/olsr/doc/olsr.h
diff --git a/src/routing/olsr/examples/olsr-hna.cc b/src/olsr/examples/olsr-hna.cc
similarity index 100%
rename from src/routing/olsr/examples/olsr-hna.cc
rename to src/olsr/examples/olsr-hna.cc
diff --git a/src/routing/olsr/examples/simple-point-to-point-olsr.cc b/src/olsr/examples/simple-point-to-point-olsr.cc
similarity index 100%
rename from src/routing/olsr/examples/simple-point-to-point-olsr.cc
rename to src/olsr/examples/simple-point-to-point-olsr.cc
diff --git a/src/routing/olsr/examples/wscript b/src/olsr/examples/wscript
similarity index 100%
rename from src/routing/olsr/examples/wscript
rename to src/olsr/examples/wscript
diff --git a/src/routing/olsr/helper/olsr-helper.cc b/src/olsr/helper/olsr-helper.cc
similarity index 100%
rename from src/routing/olsr/helper/olsr-helper.cc
rename to src/olsr/helper/olsr-helper.cc
diff --git a/src/routing/olsr/helper/olsr-helper.h b/src/olsr/helper/olsr-helper.h
similarity index 100%
rename from src/routing/olsr/helper/olsr-helper.h
rename to src/olsr/helper/olsr-helper.h
diff --git a/src/routing/olsr/model/olsr-header.cc b/src/olsr/model/olsr-header.cc
similarity index 100%
rename from src/routing/olsr/model/olsr-header.cc
rename to src/olsr/model/olsr-header.cc
diff --git a/src/routing/olsr/model/olsr-header.h b/src/olsr/model/olsr-header.h
similarity index 100%
rename from src/routing/olsr/model/olsr-header.h
rename to src/olsr/model/olsr-header.h
diff --git a/src/routing/olsr/model/olsr-repositories.h b/src/olsr/model/olsr-repositories.h
similarity index 100%
rename from src/routing/olsr/model/olsr-repositories.h
rename to src/olsr/model/olsr-repositories.h
diff --git a/src/routing/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc
similarity index 100%
rename from src/routing/olsr/model/olsr-routing-protocol.cc
rename to src/olsr/model/olsr-routing-protocol.cc
diff --git a/src/routing/olsr/model/olsr-routing-protocol.h b/src/olsr/model/olsr-routing-protocol.h
similarity index 100%
rename from src/routing/olsr/model/olsr-routing-protocol.h
rename to src/olsr/model/olsr-routing-protocol.h
diff --git a/src/routing/olsr/model/olsr-state.cc b/src/olsr/model/olsr-state.cc
similarity index 100%
rename from src/routing/olsr/model/olsr-state.cc
rename to src/olsr/model/olsr-state.cc
diff --git a/src/routing/olsr/model/olsr-state.h b/src/olsr/model/olsr-state.h
similarity index 100%
rename from src/routing/olsr/model/olsr-state.h
rename to src/olsr/model/olsr-state.h
diff --git a/src/routing/olsr/test/bug780-0-0.pcap b/src/olsr/test/bug780-0-0.pcap
similarity index 100%
rename from src/routing/olsr/test/bug780-0-0.pcap
rename to src/olsr/test/bug780-0-0.pcap
diff --git a/src/routing/olsr/test/bug780-1-0.pcap b/src/olsr/test/bug780-1-0.pcap
similarity index 100%
rename from src/routing/olsr/test/bug780-1-0.pcap
rename to src/olsr/test/bug780-1-0.pcap
diff --git a/src/routing/olsr/test/bug780-2-0.pcap b/src/olsr/test/bug780-2-0.pcap
similarity index 100%
rename from src/routing/olsr/test/bug780-2-0.pcap
rename to src/olsr/test/bug780-2-0.pcap
diff --git a/src/routing/olsr/test/bug780-test.cc b/src/olsr/test/bug780-test.cc
similarity index 100%
rename from src/routing/olsr/test/bug780-test.cc
rename to src/olsr/test/bug780-test.cc
diff --git a/src/routing/olsr/test/bug780-test.h b/src/olsr/test/bug780-test.h
similarity index 100%
rename from src/routing/olsr/test/bug780-test.h
rename to src/olsr/test/bug780-test.h
diff --git a/src/routing/olsr/test/hello-regression-test.cc b/src/olsr/test/hello-regression-test.cc
similarity index 100%
rename from src/routing/olsr/test/hello-regression-test.cc
rename to src/olsr/test/hello-regression-test.cc
diff --git a/src/routing/olsr/test/hello-regression-test.h b/src/olsr/test/hello-regression-test.h
similarity index 100%
rename from src/routing/olsr/test/hello-regression-test.h
rename to src/olsr/test/hello-regression-test.h
diff --git a/src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap b/src/olsr/test/olsr-hello-regression-test-0-1.pcap
similarity index 100%
rename from src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap
rename to src/olsr/test/olsr-hello-regression-test-0-1.pcap
diff --git a/src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap b/src/olsr/test/olsr-hello-regression-test-1-1.pcap
similarity index 100%
rename from src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap
rename to src/olsr/test/olsr-hello-regression-test-1-1.pcap
diff --git a/src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap b/src/olsr/test/olsr-tc-regression-test-0-1.pcap
similarity index 100%
rename from src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap
rename to src/olsr/test/olsr-tc-regression-test-0-1.pcap
diff --git a/src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap b/src/olsr/test/olsr-tc-regression-test-1-1.pcap
similarity index 100%
rename from src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap
rename to src/olsr/test/olsr-tc-regression-test-1-1.pcap
diff --git a/src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap b/src/olsr/test/olsr-tc-regression-test-2-1.pcap
similarity index 100%
rename from src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap
rename to src/olsr/test/olsr-tc-regression-test-2-1.pcap
diff --git a/src/routing/olsr/test/regression-test-suite.cc b/src/olsr/test/regression-test-suite.cc
similarity index 100%
rename from src/routing/olsr/test/regression-test-suite.cc
rename to src/olsr/test/regression-test-suite.cc
diff --git a/src/routing/olsr/test/tc-regression-test.cc b/src/olsr/test/tc-regression-test.cc
similarity index 100%
rename from src/routing/olsr/test/tc-regression-test.cc
rename to src/olsr/test/tc-regression-test.cc
diff --git a/src/routing/olsr/test/tc-regression-test.h b/src/olsr/test/tc-regression-test.h
similarity index 100%
rename from src/routing/olsr/test/tc-regression-test.h
rename to src/olsr/test/tc-regression-test.h
diff --git a/src/devices/virtual-net-device/waf b/src/olsr/waf
similarity index 100%
rename from src/devices/virtual-net-device/waf
rename to src/olsr/waf
diff --git a/src/routing/olsr/wscript b/src/olsr/wscript
similarity index 100%
rename from src/routing/olsr/wscript
rename to src/olsr/wscript
diff --git a/src/devices/point-to-point/doc/point-to-point.h b/src/point-to-point/doc/point-to-point.h
similarity index 100%
rename from src/devices/point-to-point/doc/point-to-point.h
rename to src/point-to-point/doc/point-to-point.h
diff --git a/src/devices/point-to-point/helper/point-to-point-dumbbell-helper.cc b/src/point-to-point/helper/point-to-point-dumbbell-helper.cc
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-dumbbell-helper.cc
rename to src/point-to-point/helper/point-to-point-dumbbell-helper.cc
diff --git a/src/devices/point-to-point/helper/point-to-point-dumbbell-helper.h b/src/point-to-point/helper/point-to-point-dumbbell-helper.h
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-dumbbell-helper.h
rename to src/point-to-point/helper/point-to-point-dumbbell-helper.h
diff --git a/src/devices/point-to-point/helper/point-to-point-grid-helper.cc b/src/point-to-point/helper/point-to-point-grid-helper.cc
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-grid-helper.cc
rename to src/point-to-point/helper/point-to-point-grid-helper.cc
diff --git a/src/devices/point-to-point/helper/point-to-point-grid-helper.h b/src/point-to-point/helper/point-to-point-grid-helper.h
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-grid-helper.h
rename to src/point-to-point/helper/point-to-point-grid-helper.h
diff --git a/src/devices/point-to-point/helper/point-to-point-helper.cc b/src/point-to-point/helper/point-to-point-helper.cc
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-helper.cc
rename to src/point-to-point/helper/point-to-point-helper.cc
diff --git a/src/devices/point-to-point/helper/point-to-point-helper.h b/src/point-to-point/helper/point-to-point-helper.h
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-helper.h
rename to src/point-to-point/helper/point-to-point-helper.h
diff --git a/src/devices/point-to-point/helper/point-to-point-star-helper.cc b/src/point-to-point/helper/point-to-point-star-helper.cc
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-star-helper.cc
rename to src/point-to-point/helper/point-to-point-star-helper.cc
diff --git a/src/devices/point-to-point/helper/point-to-point-star-helper.h b/src/point-to-point/helper/point-to-point-star-helper.h
similarity index 100%
rename from src/devices/point-to-point/helper/point-to-point-star-helper.h
rename to src/point-to-point/helper/point-to-point-star-helper.h
diff --git a/src/devices/point-to-point/model/point-to-point-channel.cc b/src/point-to-point/model/point-to-point-channel.cc
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-channel.cc
rename to src/point-to-point/model/point-to-point-channel.cc
diff --git a/src/devices/point-to-point/model/point-to-point-channel.h b/src/point-to-point/model/point-to-point-channel.h
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-channel.h
rename to src/point-to-point/model/point-to-point-channel.h
diff --git a/src/devices/point-to-point/model/point-to-point-net-device.cc b/src/point-to-point/model/point-to-point-net-device.cc
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-net-device.cc
rename to src/point-to-point/model/point-to-point-net-device.cc
diff --git a/src/devices/point-to-point/model/point-to-point-net-device.h b/src/point-to-point/model/point-to-point-net-device.h
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-net-device.h
rename to src/point-to-point/model/point-to-point-net-device.h
diff --git a/src/devices/point-to-point/model/point-to-point-remote-channel.cc b/src/point-to-point/model/point-to-point-remote-channel.cc
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-remote-channel.cc
rename to src/point-to-point/model/point-to-point-remote-channel.cc
diff --git a/src/devices/point-to-point/model/point-to-point-remote-channel.h b/src/point-to-point/model/point-to-point-remote-channel.h
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-remote-channel.h
rename to src/point-to-point/model/point-to-point-remote-channel.h
diff --git a/src/devices/point-to-point/model/point-to-point-test.cc b/src/point-to-point/model/point-to-point-test.cc
similarity index 100%
rename from src/devices/point-to-point/model/point-to-point-test.cc
rename to src/point-to-point/model/point-to-point-test.cc
diff --git a/src/devices/point-to-point/model/ppp-header.cc b/src/point-to-point/model/ppp-header.cc
similarity index 100%
rename from src/devices/point-to-point/model/ppp-header.cc
rename to src/point-to-point/model/ppp-header.cc
diff --git a/src/devices/point-to-point/model/ppp-header.h b/src/point-to-point/model/ppp-header.h
similarity index 100%
rename from src/devices/point-to-point/model/ppp-header.h
rename to src/point-to-point/model/ppp-header.h
diff --git a/src/devices/wifi/waf b/src/point-to-point/waf
similarity index 100%
rename from src/devices/wifi/waf
rename to src/point-to-point/waf
diff --git a/src/devices/point-to-point/wscript b/src/point-to-point/wscript
similarity index 100%
rename from src/devices/point-to-point/wscript
rename to src/point-to-point/wscript
diff --git a/src/devices/tap-bridge/doc/tap.h b/src/tap-bridge/doc/tap.h
similarity index 100%
rename from src/devices/tap-bridge/doc/tap.h
rename to src/tap-bridge/doc/tap.h
diff --git a/src/devices/tap-bridge/examples/lxc-left.conf b/src/tap-bridge/examples/lxc-left.conf
similarity index 100%
rename from src/devices/tap-bridge/examples/lxc-left.conf
rename to src/tap-bridge/examples/lxc-left.conf
diff --git a/src/devices/tap-bridge/examples/lxc-right.conf b/src/tap-bridge/examples/lxc-right.conf
similarity index 100%
rename from src/devices/tap-bridge/examples/lxc-right.conf
rename to src/tap-bridge/examples/lxc-right.conf
diff --git a/src/devices/tap-bridge/examples/tap-csma-virtual-machine.cc b/src/tap-bridge/examples/tap-csma-virtual-machine.cc
similarity index 100%
rename from src/devices/tap-bridge/examples/tap-csma-virtual-machine.cc
rename to src/tap-bridge/examples/tap-csma-virtual-machine.cc
diff --git a/src/devices/tap-bridge/examples/tap-csma-virtual-machine.py b/src/tap-bridge/examples/tap-csma-virtual-machine.py
similarity index 100%
rename from src/devices/tap-bridge/examples/tap-csma-virtual-machine.py
rename to src/tap-bridge/examples/tap-csma-virtual-machine.py
diff --git a/src/devices/tap-bridge/examples/tap-csma.cc b/src/tap-bridge/examples/tap-csma.cc
similarity index 100%
rename from src/devices/tap-bridge/examples/tap-csma.cc
rename to src/tap-bridge/examples/tap-csma.cc
diff --git a/src/devices/tap-bridge/examples/tap-wifi-dumbbell.cc b/src/tap-bridge/examples/tap-wifi-dumbbell.cc
similarity index 100%
rename from src/devices/tap-bridge/examples/tap-wifi-dumbbell.cc
rename to src/tap-bridge/examples/tap-wifi-dumbbell.cc
diff --git a/src/devices/tap-bridge/examples/tap-wifi-virtual-machine.cc b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
similarity index 100%
rename from src/devices/tap-bridge/examples/tap-wifi-virtual-machine.cc
rename to src/tap-bridge/examples/tap-wifi-virtual-machine.cc
diff --git a/src/devices/tap-bridge/examples/tap-wifi-virtual-machine.py b/src/tap-bridge/examples/tap-wifi-virtual-machine.py
similarity index 100%
rename from src/devices/tap-bridge/examples/tap-wifi-virtual-machine.py
rename to src/tap-bridge/examples/tap-wifi-virtual-machine.py
diff --git a/src/devices/tap-bridge/examples/virtual-network-setup.sh b/src/tap-bridge/examples/virtual-network-setup.sh
similarity index 100%
rename from src/devices/tap-bridge/examples/virtual-network-setup.sh
rename to src/tap-bridge/examples/virtual-network-setup.sh
diff --git a/src/devices/tap-bridge/examples/virtual-network-teardown.sh b/src/tap-bridge/examples/virtual-network-teardown.sh
similarity index 100%
rename from src/devices/tap-bridge/examples/virtual-network-teardown.sh
rename to src/tap-bridge/examples/virtual-network-teardown.sh
diff --git a/src/devices/tap-bridge/examples/waf b/src/tap-bridge/examples/waf
similarity index 100%
rename from src/devices/tap-bridge/examples/waf
rename to src/tap-bridge/examples/waf
diff --git a/src/devices/tap-bridge/examples/wscript b/src/tap-bridge/examples/wscript
similarity index 100%
rename from src/devices/tap-bridge/examples/wscript
rename to src/tap-bridge/examples/wscript
diff --git a/src/devices/tap-bridge/helper/tap-bridge-helper.cc b/src/tap-bridge/helper/tap-bridge-helper.cc
similarity index 100%
rename from src/devices/tap-bridge/helper/tap-bridge-helper.cc
rename to src/tap-bridge/helper/tap-bridge-helper.cc
diff --git a/src/devices/tap-bridge/helper/tap-bridge-helper.h b/src/tap-bridge/helper/tap-bridge-helper.h
similarity index 100%
rename from src/devices/tap-bridge/helper/tap-bridge-helper.h
rename to src/tap-bridge/helper/tap-bridge-helper.h
diff --git a/src/devices/tap-bridge/model/tap-bridge.cc b/src/tap-bridge/model/tap-bridge.cc
similarity index 100%
rename from src/devices/tap-bridge/model/tap-bridge.cc
rename to src/tap-bridge/model/tap-bridge.cc
diff --git a/src/devices/tap-bridge/model/tap-bridge.h b/src/tap-bridge/model/tap-bridge.h
similarity index 100%
rename from src/devices/tap-bridge/model/tap-bridge.h
rename to src/tap-bridge/model/tap-bridge.h
diff --git a/src/devices/tap-bridge/model/tap-creator.cc b/src/tap-bridge/model/tap-creator.cc
similarity index 100%
rename from src/devices/tap-bridge/model/tap-creator.cc
rename to src/tap-bridge/model/tap-creator.cc
diff --git a/src/devices/tap-bridge/model/tap-encode-decode.cc b/src/tap-bridge/model/tap-encode-decode.cc
similarity index 100%
rename from src/devices/tap-bridge/model/tap-encode-decode.cc
rename to src/tap-bridge/model/tap-encode-decode.cc
diff --git a/src/devices/tap-bridge/model/tap-encode-decode.h b/src/tap-bridge/model/tap-encode-decode.h
similarity index 100%
rename from src/devices/tap-bridge/model/tap-encode-decode.h
rename to src/tap-bridge/model/tap-encode-decode.h
diff --git a/src/routing/click/waf b/src/tap-bridge/waf
old mode 100644
new mode 100755
similarity index 100%
rename from src/routing/click/waf
rename to src/tap-bridge/waf
diff --git a/src/devices/tap-bridge/wscript b/src/tap-bridge/wscript
similarity index 100%
rename from src/devices/tap-bridge/wscript
rename to src/tap-bridge/wscript
diff --git a/src/devices/uan/doc/uan.h b/src/uan/doc/uan.h
similarity index 100%
rename from src/devices/uan/doc/uan.h
rename to src/uan/doc/uan.h
diff --git a/src/devices/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc
similarity index 100%
rename from src/devices/uan/examples/uan-cw-example.cc
rename to src/uan/examples/uan-cw-example.cc
diff --git a/src/devices/uan/examples/uan-cw-example.h b/src/uan/examples/uan-cw-example.h
similarity index 100%
rename from src/devices/uan/examples/uan-cw-example.h
rename to src/uan/examples/uan-cw-example.h
diff --git a/src/devices/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc
similarity index 100%
rename from src/devices/uan/examples/uan-rc-example.cc
rename to src/uan/examples/uan-rc-example.cc
diff --git a/src/devices/uan/examples/uan-rc-example.h b/src/uan/examples/uan-rc-example.h
similarity index 100%
rename from src/devices/uan/examples/uan-rc-example.h
rename to src/uan/examples/uan-rc-example.h
diff --git a/src/devices/uan/examples/wscript b/src/uan/examples/wscript
similarity index 100%
rename from src/devices/uan/examples/wscript
rename to src/uan/examples/wscript
diff --git a/src/devices/uan/helper/acoustic-modem-energy-model-helper.cc b/src/uan/helper/acoustic-modem-energy-model-helper.cc
similarity index 100%
rename from src/devices/uan/helper/acoustic-modem-energy-model-helper.cc
rename to src/uan/helper/acoustic-modem-energy-model-helper.cc
diff --git a/src/devices/uan/helper/acoustic-modem-energy-model-helper.h b/src/uan/helper/acoustic-modem-energy-model-helper.h
similarity index 100%
rename from src/devices/uan/helper/acoustic-modem-energy-model-helper.h
rename to src/uan/helper/acoustic-modem-energy-model-helper.h
diff --git a/src/devices/uan/helper/uan-helper.cc b/src/uan/helper/uan-helper.cc
similarity index 100%
rename from src/devices/uan/helper/uan-helper.cc
rename to src/uan/helper/uan-helper.cc
diff --git a/src/devices/uan/helper/uan-helper.h b/src/uan/helper/uan-helper.h
similarity index 100%
rename from src/devices/uan/helper/uan-helper.h
rename to src/uan/helper/uan-helper.h
diff --git a/src/devices/uan/model/acoustic-modem-energy-model.cc b/src/uan/model/acoustic-modem-energy-model.cc
similarity index 100%
rename from src/devices/uan/model/acoustic-modem-energy-model.cc
rename to src/uan/model/acoustic-modem-energy-model.cc
diff --git a/src/devices/uan/model/acoustic-modem-energy-model.h b/src/uan/model/acoustic-modem-energy-model.h
similarity index 100%
rename from src/devices/uan/model/acoustic-modem-energy-model.h
rename to src/uan/model/acoustic-modem-energy-model.h
diff --git a/src/devices/uan/model/uan-address.cc b/src/uan/model/uan-address.cc
similarity index 100%
rename from src/devices/uan/model/uan-address.cc
rename to src/uan/model/uan-address.cc
diff --git a/src/devices/uan/model/uan-address.h b/src/uan/model/uan-address.h
similarity index 100%
rename from src/devices/uan/model/uan-address.h
rename to src/uan/model/uan-address.h
diff --git a/src/devices/uan/model/uan-channel.cc b/src/uan/model/uan-channel.cc
similarity index 100%
rename from src/devices/uan/model/uan-channel.cc
rename to src/uan/model/uan-channel.cc
diff --git a/src/devices/uan/model/uan-channel.h b/src/uan/model/uan-channel.h
similarity index 100%
rename from src/devices/uan/model/uan-channel.h
rename to src/uan/model/uan-channel.h
diff --git a/src/devices/uan/model/uan-header-common.cc b/src/uan/model/uan-header-common.cc
similarity index 100%
rename from src/devices/uan/model/uan-header-common.cc
rename to src/uan/model/uan-header-common.cc
diff --git a/src/devices/uan/model/uan-header-common.h b/src/uan/model/uan-header-common.h
similarity index 100%
rename from src/devices/uan/model/uan-header-common.h
rename to src/uan/model/uan-header-common.h
diff --git a/src/devices/uan/model/uan-header-rc.cc b/src/uan/model/uan-header-rc.cc
similarity index 100%
rename from src/devices/uan/model/uan-header-rc.cc
rename to src/uan/model/uan-header-rc.cc
diff --git a/src/devices/uan/model/uan-header-rc.h b/src/uan/model/uan-header-rc.h
similarity index 100%
rename from src/devices/uan/model/uan-header-rc.h
rename to src/uan/model/uan-header-rc.h
diff --git a/src/devices/uan/model/uan-mac-aloha.cc b/src/uan/model/uan-mac-aloha.cc
similarity index 100%
rename from src/devices/uan/model/uan-mac-aloha.cc
rename to src/uan/model/uan-mac-aloha.cc
diff --git a/src/devices/uan/model/uan-mac-aloha.h b/src/uan/model/uan-mac-aloha.h
similarity index 100%
rename from src/devices/uan/model/uan-mac-aloha.h
rename to src/uan/model/uan-mac-aloha.h
diff --git a/src/devices/uan/model/uan-mac-cw.cc b/src/uan/model/uan-mac-cw.cc
similarity index 100%
rename from src/devices/uan/model/uan-mac-cw.cc
rename to src/uan/model/uan-mac-cw.cc
diff --git a/src/devices/uan/model/uan-mac-cw.h b/src/uan/model/uan-mac-cw.h
similarity index 100%
rename from src/devices/uan/model/uan-mac-cw.h
rename to src/uan/model/uan-mac-cw.h
diff --git a/src/devices/uan/model/uan-mac-rc-gw.cc b/src/uan/model/uan-mac-rc-gw.cc
similarity index 100%
rename from src/devices/uan/model/uan-mac-rc-gw.cc
rename to src/uan/model/uan-mac-rc-gw.cc
diff --git a/src/devices/uan/model/uan-mac-rc-gw.h b/src/uan/model/uan-mac-rc-gw.h
similarity index 100%
rename from src/devices/uan/model/uan-mac-rc-gw.h
rename to src/uan/model/uan-mac-rc-gw.h
diff --git a/src/devices/uan/model/uan-mac-rc.cc b/src/uan/model/uan-mac-rc.cc
similarity index 100%
rename from src/devices/uan/model/uan-mac-rc.cc
rename to src/uan/model/uan-mac-rc.cc
diff --git a/src/devices/uan/model/uan-mac-rc.h b/src/uan/model/uan-mac-rc.h
similarity index 100%
rename from src/devices/uan/model/uan-mac-rc.h
rename to src/uan/model/uan-mac-rc.h
diff --git a/src/devices/uan/model/uan-mac.h b/src/uan/model/uan-mac.h
similarity index 100%
rename from src/devices/uan/model/uan-mac.h
rename to src/uan/model/uan-mac.h
diff --git a/src/devices/uan/model/uan-net-device.cc b/src/uan/model/uan-net-device.cc
similarity index 100%
rename from src/devices/uan/model/uan-net-device.cc
rename to src/uan/model/uan-net-device.cc
diff --git a/src/devices/uan/model/uan-net-device.h b/src/uan/model/uan-net-device.h
similarity index 100%
rename from src/devices/uan/model/uan-net-device.h
rename to src/uan/model/uan-net-device.h
diff --git a/src/devices/uan/model/uan-noise-model-default.cc b/src/uan/model/uan-noise-model-default.cc
similarity index 100%
rename from src/devices/uan/model/uan-noise-model-default.cc
rename to src/uan/model/uan-noise-model-default.cc
diff --git a/src/devices/uan/model/uan-noise-model-default.h b/src/uan/model/uan-noise-model-default.h
similarity index 100%
rename from src/devices/uan/model/uan-noise-model-default.h
rename to src/uan/model/uan-noise-model-default.h
diff --git a/src/devices/uan/model/uan-noise-model.cc b/src/uan/model/uan-noise-model.cc
similarity index 100%
rename from src/devices/uan/model/uan-noise-model.cc
rename to src/uan/model/uan-noise-model.cc
diff --git a/src/devices/uan/model/uan-noise-model.h b/src/uan/model/uan-noise-model.h
similarity index 100%
rename from src/devices/uan/model/uan-noise-model.h
rename to src/uan/model/uan-noise-model.h
diff --git a/src/devices/uan/model/uan-phy-dual.cc b/src/uan/model/uan-phy-dual.cc
similarity index 100%
rename from src/devices/uan/model/uan-phy-dual.cc
rename to src/uan/model/uan-phy-dual.cc
diff --git a/src/devices/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h
similarity index 100%
rename from src/devices/uan/model/uan-phy-dual.h
rename to src/uan/model/uan-phy-dual.h
diff --git a/src/devices/uan/model/uan-phy-gen.cc b/src/uan/model/uan-phy-gen.cc
similarity index 100%
rename from src/devices/uan/model/uan-phy-gen.cc
rename to src/uan/model/uan-phy-gen.cc
diff --git a/src/devices/uan/model/uan-phy-gen.h b/src/uan/model/uan-phy-gen.h
similarity index 100%
rename from src/devices/uan/model/uan-phy-gen.h
rename to src/uan/model/uan-phy-gen.h
diff --git a/src/devices/uan/model/uan-phy.cc b/src/uan/model/uan-phy.cc
similarity index 100%
rename from src/devices/uan/model/uan-phy.cc
rename to src/uan/model/uan-phy.cc
diff --git a/src/devices/uan/model/uan-phy.h b/src/uan/model/uan-phy.h
similarity index 100%
rename from src/devices/uan/model/uan-phy.h
rename to src/uan/model/uan-phy.h
diff --git a/src/devices/uan/model/uan-prop-model-ideal.cc b/src/uan/model/uan-prop-model-ideal.cc
similarity index 100%
rename from src/devices/uan/model/uan-prop-model-ideal.cc
rename to src/uan/model/uan-prop-model-ideal.cc
diff --git a/src/devices/uan/model/uan-prop-model-ideal.h b/src/uan/model/uan-prop-model-ideal.h
similarity index 100%
rename from src/devices/uan/model/uan-prop-model-ideal.h
rename to src/uan/model/uan-prop-model-ideal.h
diff --git a/src/devices/uan/model/uan-prop-model-thorp.cc b/src/uan/model/uan-prop-model-thorp.cc
similarity index 100%
rename from src/devices/uan/model/uan-prop-model-thorp.cc
rename to src/uan/model/uan-prop-model-thorp.cc
diff --git a/src/devices/uan/model/uan-prop-model-thorp.h b/src/uan/model/uan-prop-model-thorp.h
similarity index 100%
rename from src/devices/uan/model/uan-prop-model-thorp.h
rename to src/uan/model/uan-prop-model-thorp.h
diff --git a/src/devices/uan/model/uan-prop-model.cc b/src/uan/model/uan-prop-model.cc
similarity index 100%
rename from src/devices/uan/model/uan-prop-model.cc
rename to src/uan/model/uan-prop-model.cc
diff --git a/src/devices/uan/model/uan-prop-model.h b/src/uan/model/uan-prop-model.h
similarity index 100%
rename from src/devices/uan/model/uan-prop-model.h
rename to src/uan/model/uan-prop-model.h
diff --git a/src/devices/uan/model/uan-transducer-hd.cc b/src/uan/model/uan-transducer-hd.cc
similarity index 100%
rename from src/devices/uan/model/uan-transducer-hd.cc
rename to src/uan/model/uan-transducer-hd.cc
diff --git a/src/devices/uan/model/uan-transducer-hd.h b/src/uan/model/uan-transducer-hd.h
similarity index 100%
rename from src/devices/uan/model/uan-transducer-hd.h
rename to src/uan/model/uan-transducer-hd.h
diff --git a/src/devices/uan/model/uan-transducer.h b/src/uan/model/uan-transducer.h
similarity index 100%
rename from src/devices/uan/model/uan-transducer.h
rename to src/uan/model/uan-transducer.h
diff --git a/src/devices/uan/model/uan-tx-mode.cc b/src/uan/model/uan-tx-mode.cc
similarity index 100%
rename from src/devices/uan/model/uan-tx-mode.cc
rename to src/uan/model/uan-tx-mode.cc
diff --git a/src/devices/uan/model/uan-tx-mode.h b/src/uan/model/uan-tx-mode.h
similarity index 100%
rename from src/devices/uan/model/uan-tx-mode.h
rename to src/uan/model/uan-tx-mode.h
diff --git a/src/devices/uan/test/uan-energy-model-test.cc b/src/uan/test/uan-energy-model-test.cc
similarity index 100%
rename from src/devices/uan/test/uan-energy-model-test.cc
rename to src/uan/test/uan-energy-model-test.cc
diff --git a/src/devices/uan/test/uan-test.cc b/src/uan/test/uan-test.cc
similarity index 100%
rename from src/devices/uan/test/uan-test.cc
rename to src/uan/test/uan-test.cc
diff --git a/src/devices/uan/wscript b/src/uan/wscript
similarity index 100%
rename from src/devices/uan/wscript
rename to src/uan/wscript
diff --git a/src/devices/virtual-net-device/examples/virtual-net-device.cc b/src/virtual-net-device/examples/virtual-net-device.cc
similarity index 100%
rename from src/devices/virtual-net-device/examples/virtual-net-device.cc
rename to src/virtual-net-device/examples/virtual-net-device.cc
diff --git a/src/devices/virtual-net-device/examples/wscript b/src/virtual-net-device/examples/wscript
similarity index 100%
rename from src/devices/virtual-net-device/examples/wscript
rename to src/virtual-net-device/examples/wscript
diff --git a/src/devices/virtual-net-device/model/virtual-net-device.cc b/src/virtual-net-device/model/virtual-net-device.cc
similarity index 100%
rename from src/devices/virtual-net-device/model/virtual-net-device.cc
rename to src/virtual-net-device/model/virtual-net-device.cc
diff --git a/src/devices/virtual-net-device/model/virtual-net-device.h b/src/virtual-net-device/model/virtual-net-device.h
similarity index 100%
rename from src/devices/virtual-net-device/model/virtual-net-device.h
rename to src/virtual-net-device/model/virtual-net-device.h
diff --git a/src/routing/nix-vector-routing/waf b/src/virtual-net-device/waf
old mode 100644
new mode 100755
similarity index 100%
rename from src/routing/nix-vector-routing/waf
rename to src/virtual-net-device/waf
diff --git a/src/devices/virtual-net-device/wscript b/src/virtual-net-device/wscript
similarity index 100%
rename from src/devices/virtual-net-device/wscript
rename to src/virtual-net-device/wscript
diff --git a/src/devices/wifi/doc/wifi.h b/src/wifi/doc/wifi.h
similarity index 100%
rename from src/devices/wifi/doc/wifi.h
rename to src/wifi/doc/wifi.h
diff --git a/src/devices/wifi/helper/nqos-wifi-mac-helper.cc b/src/wifi/helper/nqos-wifi-mac-helper.cc
similarity index 100%
rename from src/devices/wifi/helper/nqos-wifi-mac-helper.cc
rename to src/wifi/helper/nqos-wifi-mac-helper.cc
diff --git a/src/devices/wifi/helper/nqos-wifi-mac-helper.h b/src/wifi/helper/nqos-wifi-mac-helper.h
similarity index 100%
rename from src/devices/wifi/helper/nqos-wifi-mac-helper.h
rename to src/wifi/helper/nqos-wifi-mac-helper.h
diff --git a/src/devices/wifi/helper/qos-wifi-mac-helper.cc b/src/wifi/helper/qos-wifi-mac-helper.cc
similarity index 100%
rename from src/devices/wifi/helper/qos-wifi-mac-helper.cc
rename to src/wifi/helper/qos-wifi-mac-helper.cc
diff --git a/src/devices/wifi/helper/qos-wifi-mac-helper.h b/src/wifi/helper/qos-wifi-mac-helper.h
similarity index 100%
rename from src/devices/wifi/helper/qos-wifi-mac-helper.h
rename to src/wifi/helper/qos-wifi-mac-helper.h
diff --git a/src/devices/wifi/helper/wifi-helper.cc b/src/wifi/helper/wifi-helper.cc
similarity index 100%
rename from src/devices/wifi/helper/wifi-helper.cc
rename to src/wifi/helper/wifi-helper.cc
diff --git a/src/devices/wifi/helper/wifi-helper.h b/src/wifi/helper/wifi-helper.h
similarity index 100%
rename from src/devices/wifi/helper/wifi-helper.h
rename to src/wifi/helper/wifi-helper.h
diff --git a/src/devices/wifi/helper/yans-wifi-helper.cc b/src/wifi/helper/yans-wifi-helper.cc
similarity index 100%
rename from src/devices/wifi/helper/yans-wifi-helper.cc
rename to src/wifi/helper/yans-wifi-helper.cc
diff --git a/src/devices/wifi/helper/yans-wifi-helper.h b/src/wifi/helper/yans-wifi-helper.h
similarity index 100%
rename from src/devices/wifi/helper/yans-wifi-helper.h
rename to src/wifi/helper/yans-wifi-helper.h
diff --git a/src/devices/wifi/model/aarf-wifi-manager.cc b/src/wifi/model/aarf-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/aarf-wifi-manager.cc
rename to src/wifi/model/aarf-wifi-manager.cc
diff --git a/src/devices/wifi/model/aarf-wifi-manager.h b/src/wifi/model/aarf-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/aarf-wifi-manager.h
rename to src/wifi/model/aarf-wifi-manager.h
diff --git a/src/devices/wifi/model/aarfcd-wifi-manager.cc b/src/wifi/model/aarfcd-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/aarfcd-wifi-manager.cc
rename to src/wifi/model/aarfcd-wifi-manager.cc
diff --git a/src/devices/wifi/model/aarfcd-wifi-manager.h b/src/wifi/model/aarfcd-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/aarfcd-wifi-manager.h
rename to src/wifi/model/aarfcd-wifi-manager.h
diff --git a/src/devices/wifi/model/adhoc-wifi-mac.cc b/src/wifi/model/adhoc-wifi-mac.cc
similarity index 100%
rename from src/devices/wifi/model/adhoc-wifi-mac.cc
rename to src/wifi/model/adhoc-wifi-mac.cc
diff --git a/src/devices/wifi/model/adhoc-wifi-mac.h b/src/wifi/model/adhoc-wifi-mac.h
similarity index 100%
rename from src/devices/wifi/model/adhoc-wifi-mac.h
rename to src/wifi/model/adhoc-wifi-mac.h
diff --git a/src/devices/wifi/model/amrr-wifi-manager.cc b/src/wifi/model/amrr-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/amrr-wifi-manager.cc
rename to src/wifi/model/amrr-wifi-manager.cc
diff --git a/src/devices/wifi/model/amrr-wifi-manager.h b/src/wifi/model/amrr-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/amrr-wifi-manager.h
rename to src/wifi/model/amrr-wifi-manager.h
diff --git a/src/devices/wifi/model/amsdu-subframe-header.cc b/src/wifi/model/amsdu-subframe-header.cc
similarity index 100%
rename from src/devices/wifi/model/amsdu-subframe-header.cc
rename to src/wifi/model/amsdu-subframe-header.cc
diff --git a/src/devices/wifi/model/amsdu-subframe-header.h b/src/wifi/model/amsdu-subframe-header.h
similarity index 100%
rename from src/devices/wifi/model/amsdu-subframe-header.h
rename to src/wifi/model/amsdu-subframe-header.h
diff --git a/src/devices/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
similarity index 100%
rename from src/devices/wifi/model/ap-wifi-mac.cc
rename to src/wifi/model/ap-wifi-mac.cc
diff --git a/src/devices/wifi/model/ap-wifi-mac.h b/src/wifi/model/ap-wifi-mac.h
similarity index 100%
rename from src/devices/wifi/model/ap-wifi-mac.h
rename to src/wifi/model/ap-wifi-mac.h
diff --git a/src/devices/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/arf-wifi-manager.cc
rename to src/wifi/model/arf-wifi-manager.cc
diff --git a/src/devices/wifi/model/arf-wifi-manager.h b/src/wifi/model/arf-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/arf-wifi-manager.h
rename to src/wifi/model/arf-wifi-manager.h
diff --git a/src/devices/wifi/model/block-ack-agreement.cc b/src/wifi/model/block-ack-agreement.cc
similarity index 100%
rename from src/devices/wifi/model/block-ack-agreement.cc
rename to src/wifi/model/block-ack-agreement.cc
diff --git a/src/devices/wifi/model/block-ack-agreement.h b/src/wifi/model/block-ack-agreement.h
similarity index 100%
rename from src/devices/wifi/model/block-ack-agreement.h
rename to src/wifi/model/block-ack-agreement.h
diff --git a/src/devices/wifi/model/block-ack-cache.cc b/src/wifi/model/block-ack-cache.cc
similarity index 100%
rename from src/devices/wifi/model/block-ack-cache.cc
rename to src/wifi/model/block-ack-cache.cc
diff --git a/src/devices/wifi/model/block-ack-cache.h b/src/wifi/model/block-ack-cache.h
similarity index 100%
rename from src/devices/wifi/model/block-ack-cache.h
rename to src/wifi/model/block-ack-cache.h
diff --git a/src/devices/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc
similarity index 100%
rename from src/devices/wifi/model/block-ack-manager.cc
rename to src/wifi/model/block-ack-manager.cc
diff --git a/src/devices/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h
similarity index 100%
rename from src/devices/wifi/model/block-ack-manager.h
rename to src/wifi/model/block-ack-manager.h
diff --git a/src/devices/wifi/model/block-ack-test-suite.cc b/src/wifi/model/block-ack-test-suite.cc
similarity index 100%
rename from src/devices/wifi/model/block-ack-test-suite.cc
rename to src/wifi/model/block-ack-test-suite.cc
diff --git a/src/devices/wifi/model/capability-information.cc b/src/wifi/model/capability-information.cc
similarity index 100%
rename from src/devices/wifi/model/capability-information.cc
rename to src/wifi/model/capability-information.cc
diff --git a/src/devices/wifi/model/capability-information.h b/src/wifi/model/capability-information.h
similarity index 100%
rename from src/devices/wifi/model/capability-information.h
rename to src/wifi/model/capability-information.h
diff --git a/src/devices/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/cara-wifi-manager.cc
rename to src/wifi/model/cara-wifi-manager.cc
diff --git a/src/devices/wifi/model/cara-wifi-manager.h b/src/wifi/model/cara-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/cara-wifi-manager.h
rename to src/wifi/model/cara-wifi-manager.h
diff --git a/src/devices/wifi/model/constant-rate-wifi-manager.cc b/src/wifi/model/constant-rate-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/constant-rate-wifi-manager.cc
rename to src/wifi/model/constant-rate-wifi-manager.cc
diff --git a/src/devices/wifi/model/constant-rate-wifi-manager.h b/src/wifi/model/constant-rate-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/constant-rate-wifi-manager.h
rename to src/wifi/model/constant-rate-wifi-manager.h
diff --git a/src/devices/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc
similarity index 100%
rename from src/devices/wifi/model/ctrl-headers.cc
rename to src/wifi/model/ctrl-headers.cc
diff --git a/src/devices/wifi/model/ctrl-headers.h b/src/wifi/model/ctrl-headers.h
similarity index 100%
rename from src/devices/wifi/model/ctrl-headers.h
rename to src/wifi/model/ctrl-headers.h
diff --git a/src/devices/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc
similarity index 100%
rename from src/devices/wifi/model/dca-txop.cc
rename to src/wifi/model/dca-txop.cc
diff --git a/src/devices/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h
similarity index 100%
rename from src/devices/wifi/model/dca-txop.h
rename to src/wifi/model/dca-txop.h
diff --git a/src/devices/wifi/model/dcf-manager-test.cc b/src/wifi/model/dcf-manager-test.cc
similarity index 100%
rename from src/devices/wifi/model/dcf-manager-test.cc
rename to src/wifi/model/dcf-manager-test.cc
diff --git a/src/devices/wifi/model/dcf-manager.cc b/src/wifi/model/dcf-manager.cc
similarity index 100%
rename from src/devices/wifi/model/dcf-manager.cc
rename to src/wifi/model/dcf-manager.cc
diff --git a/src/devices/wifi/model/dcf-manager.h b/src/wifi/model/dcf-manager.h
similarity index 100%
rename from src/devices/wifi/model/dcf-manager.h
rename to src/wifi/model/dcf-manager.h
diff --git a/src/devices/wifi/model/dcf.cc b/src/wifi/model/dcf.cc
similarity index 100%
rename from src/devices/wifi/model/dcf.cc
rename to src/wifi/model/dcf.cc
diff --git a/src/devices/wifi/model/dcf.h b/src/wifi/model/dcf.h
similarity index 100%
rename from src/devices/wifi/model/dcf.h
rename to src/wifi/model/dcf.h
diff --git a/src/devices/wifi/model/dsss-error-rate-model.cc b/src/wifi/model/dsss-error-rate-model.cc
similarity index 100%
rename from src/devices/wifi/model/dsss-error-rate-model.cc
rename to src/wifi/model/dsss-error-rate-model.cc
diff --git a/src/devices/wifi/model/dsss-error-rate-model.h b/src/wifi/model/dsss-error-rate-model.h
similarity index 100%
rename from src/devices/wifi/model/dsss-error-rate-model.h
rename to src/wifi/model/dsss-error-rate-model.h
diff --git a/src/devices/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc
similarity index 100%
rename from src/devices/wifi/model/edca-txop-n.cc
rename to src/wifi/model/edca-txop-n.cc
diff --git a/src/devices/wifi/model/edca-txop-n.h b/src/wifi/model/edca-txop-n.h
similarity index 100%
rename from src/devices/wifi/model/edca-txop-n.h
rename to src/wifi/model/edca-txop-n.h
diff --git a/src/devices/wifi/model/error-rate-model.cc b/src/wifi/model/error-rate-model.cc
similarity index 100%
rename from src/devices/wifi/model/error-rate-model.cc
rename to src/wifi/model/error-rate-model.cc
diff --git a/src/devices/wifi/model/error-rate-model.h b/src/wifi/model/error-rate-model.h
similarity index 100%
rename from src/devices/wifi/model/error-rate-model.h
rename to src/wifi/model/error-rate-model.h
diff --git a/src/devices/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/ideal-wifi-manager.cc
rename to src/wifi/model/ideal-wifi-manager.cc
diff --git a/src/devices/wifi/model/ideal-wifi-manager.h b/src/wifi/model/ideal-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/ideal-wifi-manager.h
rename to src/wifi/model/ideal-wifi-manager.h
diff --git a/src/devices/wifi/model/interference-helper-tx-duration-test.cc b/src/wifi/model/interference-helper-tx-duration-test.cc
similarity index 100%
rename from src/devices/wifi/model/interference-helper-tx-duration-test.cc
rename to src/wifi/model/interference-helper-tx-duration-test.cc
diff --git a/src/devices/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc
similarity index 100%
rename from src/devices/wifi/model/interference-helper.cc
rename to src/wifi/model/interference-helper.cc
diff --git a/src/devices/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h
similarity index 100%
rename from src/devices/wifi/model/interference-helper.h
rename to src/wifi/model/interference-helper.h
diff --git a/src/devices/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc
similarity index 100%
rename from src/devices/wifi/model/mac-low.cc
rename to src/wifi/model/mac-low.cc
diff --git a/src/devices/wifi/model/mac-low.h b/src/wifi/model/mac-low.h
similarity index 100%
rename from src/devices/wifi/model/mac-low.h
rename to src/wifi/model/mac-low.h
diff --git a/src/devices/wifi/model/mac-rx-middle.cc b/src/wifi/model/mac-rx-middle.cc
similarity index 100%
rename from src/devices/wifi/model/mac-rx-middle.cc
rename to src/wifi/model/mac-rx-middle.cc
diff --git a/src/devices/wifi/model/mac-rx-middle.h b/src/wifi/model/mac-rx-middle.h
similarity index 100%
rename from src/devices/wifi/model/mac-rx-middle.h
rename to src/wifi/model/mac-rx-middle.h
diff --git a/src/devices/wifi/model/mac-tx-middle.cc b/src/wifi/model/mac-tx-middle.cc
similarity index 100%
rename from src/devices/wifi/model/mac-tx-middle.cc
rename to src/wifi/model/mac-tx-middle.cc
diff --git a/src/devices/wifi/model/mac-tx-middle.h b/src/wifi/model/mac-tx-middle.h
similarity index 100%
rename from src/devices/wifi/model/mac-tx-middle.h
rename to src/wifi/model/mac-tx-middle.h
diff --git a/src/devices/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc
similarity index 100%
rename from src/devices/wifi/model/mgt-headers.cc
rename to src/wifi/model/mgt-headers.cc
diff --git a/src/devices/wifi/model/mgt-headers.h b/src/wifi/model/mgt-headers.h
similarity index 100%
rename from src/devices/wifi/model/mgt-headers.h
rename to src/wifi/model/mgt-headers.h
diff --git a/src/devices/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/minstrel-wifi-manager.cc
rename to src/wifi/model/minstrel-wifi-manager.cc
diff --git a/src/devices/wifi/model/minstrel-wifi-manager.h b/src/wifi/model/minstrel-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/minstrel-wifi-manager.h
rename to src/wifi/model/minstrel-wifi-manager.h
diff --git a/src/devices/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc
similarity index 100%
rename from src/devices/wifi/model/msdu-aggregator.cc
rename to src/wifi/model/msdu-aggregator.cc
diff --git a/src/devices/wifi/model/msdu-aggregator.h b/src/wifi/model/msdu-aggregator.h
similarity index 100%
rename from src/devices/wifi/model/msdu-aggregator.h
rename to src/wifi/model/msdu-aggregator.h
diff --git a/src/devices/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc
similarity index 100%
rename from src/devices/wifi/model/msdu-standard-aggregator.cc
rename to src/wifi/model/msdu-standard-aggregator.cc
diff --git a/src/devices/wifi/model/msdu-standard-aggregator.h b/src/wifi/model/msdu-standard-aggregator.h
similarity index 100%
rename from src/devices/wifi/model/msdu-standard-aggregator.h
rename to src/wifi/model/msdu-standard-aggregator.h
diff --git a/src/devices/wifi/model/nist-error-rate-model.cc b/src/wifi/model/nist-error-rate-model.cc
similarity index 100%
rename from src/devices/wifi/model/nist-error-rate-model.cc
rename to src/wifi/model/nist-error-rate-model.cc
diff --git a/src/devices/wifi/model/nist-error-rate-model.h b/src/wifi/model/nist-error-rate-model.h
similarity index 100%
rename from src/devices/wifi/model/nist-error-rate-model.h
rename to src/wifi/model/nist-error-rate-model.h
diff --git a/src/devices/wifi/model/onoe-wifi-manager.cc b/src/wifi/model/onoe-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/onoe-wifi-manager.cc
rename to src/wifi/model/onoe-wifi-manager.cc
diff --git a/src/devices/wifi/model/onoe-wifi-manager.h b/src/wifi/model/onoe-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/onoe-wifi-manager.h
rename to src/wifi/model/onoe-wifi-manager.h
diff --git a/src/devices/wifi/model/originator-block-ack-agreement.cc b/src/wifi/model/originator-block-ack-agreement.cc
similarity index 100%
rename from src/devices/wifi/model/originator-block-ack-agreement.cc
rename to src/wifi/model/originator-block-ack-agreement.cc
diff --git a/src/devices/wifi/model/originator-block-ack-agreement.h b/src/wifi/model/originator-block-ack-agreement.h
similarity index 100%
rename from src/devices/wifi/model/originator-block-ack-agreement.h
rename to src/wifi/model/originator-block-ack-agreement.h
diff --git a/src/devices/wifi/model/qos-blocked-destinations.cc b/src/wifi/model/qos-blocked-destinations.cc
similarity index 100%
rename from src/devices/wifi/model/qos-blocked-destinations.cc
rename to src/wifi/model/qos-blocked-destinations.cc
diff --git a/src/devices/wifi/model/qos-blocked-destinations.h b/src/wifi/model/qos-blocked-destinations.h
similarity index 100%
rename from src/devices/wifi/model/qos-blocked-destinations.h
rename to src/wifi/model/qos-blocked-destinations.h
diff --git a/src/devices/wifi/model/qos-tag.cc b/src/wifi/model/qos-tag.cc
similarity index 100%
rename from src/devices/wifi/model/qos-tag.cc
rename to src/wifi/model/qos-tag.cc
diff --git a/src/devices/wifi/model/qos-tag.h b/src/wifi/model/qos-tag.h
similarity index 100%
rename from src/devices/wifi/model/qos-tag.h
rename to src/wifi/model/qos-tag.h
diff --git a/src/devices/wifi/model/qos-utils.cc b/src/wifi/model/qos-utils.cc
similarity index 100%
rename from src/devices/wifi/model/qos-utils.cc
rename to src/wifi/model/qos-utils.cc
diff --git a/src/devices/wifi/model/qos-utils.h b/src/wifi/model/qos-utils.h
similarity index 100%
rename from src/devices/wifi/model/qos-utils.h
rename to src/wifi/model/qos-utils.h
diff --git a/src/devices/wifi/model/random-stream.cc b/src/wifi/model/random-stream.cc
similarity index 100%
rename from src/devices/wifi/model/random-stream.cc
rename to src/wifi/model/random-stream.cc
diff --git a/src/devices/wifi/model/random-stream.h b/src/wifi/model/random-stream.h
similarity index 100%
rename from src/devices/wifi/model/random-stream.h
rename to src/wifi/model/random-stream.h
diff --git a/src/devices/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc
similarity index 100%
rename from src/devices/wifi/model/regular-wifi-mac.cc
rename to src/wifi/model/regular-wifi-mac.cc
diff --git a/src/devices/wifi/model/regular-wifi-mac.h b/src/wifi/model/regular-wifi-mac.h
similarity index 100%
rename from src/devices/wifi/model/regular-wifi-mac.h
rename to src/wifi/model/regular-wifi-mac.h
diff --git a/src/devices/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc
similarity index 100%
rename from src/devices/wifi/model/rraa-wifi-manager.cc
rename to src/wifi/model/rraa-wifi-manager.cc
diff --git a/src/devices/wifi/model/rraa-wifi-manager.h b/src/wifi/model/rraa-wifi-manager.h
similarity index 100%
rename from src/devices/wifi/model/rraa-wifi-manager.h
rename to src/wifi/model/rraa-wifi-manager.h
diff --git a/src/devices/wifi/model/ssid.cc b/src/wifi/model/ssid.cc
similarity index 100%
rename from src/devices/wifi/model/ssid.cc
rename to src/wifi/model/ssid.cc
diff --git a/src/devices/wifi/model/ssid.h b/src/wifi/model/ssid.h
similarity index 100%
rename from src/devices/wifi/model/ssid.h
rename to src/wifi/model/ssid.h
diff --git a/src/devices/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc
similarity index 100%
rename from src/devices/wifi/model/sta-wifi-mac.cc
rename to src/wifi/model/sta-wifi-mac.cc
diff --git a/src/devices/wifi/model/sta-wifi-mac.h b/src/wifi/model/sta-wifi-mac.h
similarity index 100%
rename from src/devices/wifi/model/sta-wifi-mac.h
rename to src/wifi/model/sta-wifi-mac.h
diff --git a/src/devices/wifi/model/status-code.cc b/src/wifi/model/status-code.cc
similarity index 100%
rename from src/devices/wifi/model/status-code.cc
rename to src/wifi/model/status-code.cc
diff --git a/src/devices/wifi/model/status-code.h b/src/wifi/model/status-code.h
similarity index 100%
rename from src/devices/wifi/model/status-code.h
rename to src/wifi/model/status-code.h
diff --git a/src/devices/wifi/model/supported-rates.cc b/src/wifi/model/supported-rates.cc
similarity index 100%
rename from src/devices/wifi/model/supported-rates.cc
rename to src/wifi/model/supported-rates.cc
diff --git a/src/devices/wifi/model/supported-rates.h b/src/wifi/model/supported-rates.h
similarity index 100%
rename from src/devices/wifi/model/supported-rates.h
rename to src/wifi/model/supported-rates.h
diff --git a/src/devices/wifi/model/wifi-channel.cc b/src/wifi/model/wifi-channel.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-channel.cc
rename to src/wifi/model/wifi-channel.cc
diff --git a/src/devices/wifi/model/wifi-channel.h b/src/wifi/model/wifi-channel.h
similarity index 100%
rename from src/devices/wifi/model/wifi-channel.h
rename to src/wifi/model/wifi-channel.h
diff --git a/src/devices/wifi/model/wifi-information-element-vector.cc b/src/wifi/model/wifi-information-element-vector.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-information-element-vector.cc
rename to src/wifi/model/wifi-information-element-vector.cc
diff --git a/src/devices/wifi/model/wifi-information-element-vector.h b/src/wifi/model/wifi-information-element-vector.h
similarity index 100%
rename from src/devices/wifi/model/wifi-information-element-vector.h
rename to src/wifi/model/wifi-information-element-vector.h
diff --git a/src/devices/wifi/model/wifi-information-element.cc b/src/wifi/model/wifi-information-element.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-information-element.cc
rename to src/wifi/model/wifi-information-element.cc
diff --git a/src/devices/wifi/model/wifi-information-element.h b/src/wifi/model/wifi-information-element.h
similarity index 100%
rename from src/devices/wifi/model/wifi-information-element.h
rename to src/wifi/model/wifi-information-element.h
diff --git a/src/devices/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-mac-header.cc
rename to src/wifi/model/wifi-mac-header.cc
diff --git a/src/devices/wifi/model/wifi-mac-header.h b/src/wifi/model/wifi-mac-header.h
similarity index 100%
rename from src/devices/wifi/model/wifi-mac-header.h
rename to src/wifi/model/wifi-mac-header.h
diff --git a/src/devices/wifi/model/wifi-mac-queue.cc b/src/wifi/model/wifi-mac-queue.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-mac-queue.cc
rename to src/wifi/model/wifi-mac-queue.cc
diff --git a/src/devices/wifi/model/wifi-mac-queue.h b/src/wifi/model/wifi-mac-queue.h
similarity index 100%
rename from src/devices/wifi/model/wifi-mac-queue.h
rename to src/wifi/model/wifi-mac-queue.h
diff --git a/src/devices/wifi/model/wifi-mac-trailer.cc b/src/wifi/model/wifi-mac-trailer.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-mac-trailer.cc
rename to src/wifi/model/wifi-mac-trailer.cc
diff --git a/src/devices/wifi/model/wifi-mac-trailer.h b/src/wifi/model/wifi-mac-trailer.h
similarity index 100%
rename from src/devices/wifi/model/wifi-mac-trailer.h
rename to src/wifi/model/wifi-mac-trailer.h
diff --git a/src/devices/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-mac.cc
rename to src/wifi/model/wifi-mac.cc
diff --git a/src/devices/wifi/model/wifi-mac.h b/src/wifi/model/wifi-mac.h
similarity index 100%
rename from src/devices/wifi/model/wifi-mac.h
rename to src/wifi/model/wifi-mac.h
diff --git a/src/devices/wifi/model/wifi-mode.cc b/src/wifi/model/wifi-mode.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-mode.cc
rename to src/wifi/model/wifi-mode.cc
diff --git a/src/devices/wifi/model/wifi-mode.h b/src/wifi/model/wifi-mode.h
similarity index 100%
rename from src/devices/wifi/model/wifi-mode.h
rename to src/wifi/model/wifi-mode.h
diff --git a/src/devices/wifi/model/wifi-net-device.cc b/src/wifi/model/wifi-net-device.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-net-device.cc
rename to src/wifi/model/wifi-net-device.cc
diff --git a/src/devices/wifi/model/wifi-net-device.h b/src/wifi/model/wifi-net-device.h
similarity index 100%
rename from src/devices/wifi/model/wifi-net-device.h
rename to src/wifi/model/wifi-net-device.h
diff --git a/src/devices/wifi/model/wifi-phy-standard.h b/src/wifi/model/wifi-phy-standard.h
similarity index 100%
rename from src/devices/wifi/model/wifi-phy-standard.h
rename to src/wifi/model/wifi-phy-standard.h
diff --git a/src/devices/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-phy-state-helper.cc
rename to src/wifi/model/wifi-phy-state-helper.cc
diff --git a/src/devices/wifi/model/wifi-phy-state-helper.h b/src/wifi/model/wifi-phy-state-helper.h
similarity index 100%
rename from src/devices/wifi/model/wifi-phy-state-helper.h
rename to src/wifi/model/wifi-phy-state-helper.h
diff --git a/src/devices/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-phy.cc
rename to src/wifi/model/wifi-phy.cc
diff --git a/src/devices/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h
similarity index 100%
rename from src/devices/wifi/model/wifi-phy.h
rename to src/wifi/model/wifi-phy.h
diff --git a/src/devices/wifi/model/wifi-preamble.h b/src/wifi/model/wifi-preamble.h
similarity index 100%
rename from src/devices/wifi/model/wifi-preamble.h
rename to src/wifi/model/wifi-preamble.h
diff --git a/src/devices/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc
similarity index 100%
rename from src/devices/wifi/model/wifi-remote-station-manager.cc
rename to src/wifi/model/wifi-remote-station-manager.cc
diff --git a/src/devices/wifi/model/wifi-remote-station-manager.h b/src/wifi/model/wifi-remote-station-manager.h
similarity index 100%
rename from src/devices/wifi/model/wifi-remote-station-manager.h
rename to src/wifi/model/wifi-remote-station-manager.h
diff --git a/src/devices/wifi/model/yans-error-rate-model.cc b/src/wifi/model/yans-error-rate-model.cc
similarity index 100%
rename from src/devices/wifi/model/yans-error-rate-model.cc
rename to src/wifi/model/yans-error-rate-model.cc
diff --git a/src/devices/wifi/model/yans-error-rate-model.h b/src/wifi/model/yans-error-rate-model.h
similarity index 100%
rename from src/devices/wifi/model/yans-error-rate-model.h
rename to src/wifi/model/yans-error-rate-model.h
diff --git a/src/devices/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc
similarity index 100%
rename from src/devices/wifi/model/yans-wifi-channel.cc
rename to src/wifi/model/yans-wifi-channel.cc
diff --git a/src/devices/wifi/model/yans-wifi-channel.h b/src/wifi/model/yans-wifi-channel.h
similarity index 100%
rename from src/devices/wifi/model/yans-wifi-channel.h
rename to src/wifi/model/yans-wifi-channel.h
diff --git a/src/devices/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc
similarity index 100%
rename from src/devices/wifi/model/yans-wifi-phy.cc
rename to src/wifi/model/yans-wifi-phy.cc
diff --git a/src/devices/wifi/model/yans-wifi-phy.h b/src/wifi/model/yans-wifi-phy.h
similarity index 100%
rename from src/devices/wifi/model/yans-wifi-phy.h
rename to src/wifi/model/yans-wifi-phy.h
diff --git a/src/devices/wifi/test/wifi-phy-test.cc b/src/wifi/test/wifi-phy-test.cc
similarity index 100%
rename from src/devices/wifi/test/wifi-phy-test.cc
rename to src/wifi/test/wifi-phy-test.cc
diff --git a/src/devices/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc
similarity index 100%
rename from src/devices/wifi/test/wifi-test.cc
rename to src/wifi/test/wifi-test.cc
diff --git a/src/routing/olsr/waf b/src/wifi/waf
similarity index 100%
rename from src/routing/olsr/waf
rename to src/wifi/waf
diff --git a/src/devices/wifi/wscript b/src/wifi/wscript
similarity index 100%
rename from src/devices/wifi/wscript
rename to src/wifi/wscript
diff --git a/src/devices/wimax/AUTHORS b/src/wimax/AUTHORS
similarity index 100%
rename from src/devices/wimax/AUTHORS
rename to src/wimax/AUTHORS
diff --git a/src/devices/wimax/doc/wimax.h b/src/wimax/doc/wimax.h
similarity index 100%
rename from src/devices/wimax/doc/wimax.h
rename to src/wimax/doc/wimax.h
diff --git a/src/devices/wimax/examples/waf b/src/wimax/examples/waf
similarity index 100%
rename from src/devices/wimax/examples/waf
rename to src/wimax/examples/waf
diff --git a/src/devices/wimax/examples/wimax-ipv4.cc b/src/wimax/examples/wimax-ipv4.cc
similarity index 100%
rename from src/devices/wimax/examples/wimax-ipv4.cc
rename to src/wimax/examples/wimax-ipv4.cc
diff --git a/src/devices/wimax/examples/wimax-multicast.cc b/src/wimax/examples/wimax-multicast.cc
similarity index 100%
rename from src/devices/wimax/examples/wimax-multicast.cc
rename to src/wimax/examples/wimax-multicast.cc
diff --git a/src/devices/wimax/examples/wimax-simple.cc b/src/wimax/examples/wimax-simple.cc
similarity index 100%
rename from src/devices/wimax/examples/wimax-simple.cc
rename to src/wimax/examples/wimax-simple.cc
diff --git a/src/devices/wimax/examples/wscript b/src/wimax/examples/wscript
similarity index 100%
rename from src/devices/wimax/examples/wscript
rename to src/wimax/examples/wscript
diff --git a/src/devices/wimax/helper/wimax-helper.cc b/src/wimax/helper/wimax-helper.cc
similarity index 100%
rename from src/devices/wimax/helper/wimax-helper.cc
rename to src/wimax/helper/wimax-helper.cc
diff --git a/src/devices/wimax/helper/wimax-helper.h b/src/wimax/helper/wimax-helper.h
similarity index 100%
rename from src/devices/wimax/helper/wimax-helper.h
rename to src/wimax/helper/wimax-helper.h
diff --git a/src/devices/wimax/model/bandwidth-manager.cc b/src/wimax/model/bandwidth-manager.cc
similarity index 100%
rename from src/devices/wimax/model/bandwidth-manager.cc
rename to src/wimax/model/bandwidth-manager.cc
diff --git a/src/devices/wimax/model/bandwidth-manager.h b/src/wimax/model/bandwidth-manager.h
similarity index 100%
rename from src/devices/wimax/model/bandwidth-manager.h
rename to src/wimax/model/bandwidth-manager.h
diff --git a/src/devices/wimax/model/bs-link-manager.cc b/src/wimax/model/bs-link-manager.cc
similarity index 100%
rename from src/devices/wimax/model/bs-link-manager.cc
rename to src/wimax/model/bs-link-manager.cc
diff --git a/src/devices/wimax/model/bs-link-manager.h b/src/wimax/model/bs-link-manager.h
similarity index 100%
rename from src/devices/wimax/model/bs-link-manager.h
rename to src/wimax/model/bs-link-manager.h
diff --git a/src/devices/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc
similarity index 100%
rename from src/devices/wimax/model/bs-net-device.cc
rename to src/wimax/model/bs-net-device.cc
diff --git a/src/devices/wimax/model/bs-net-device.h b/src/wimax/model/bs-net-device.h
similarity index 100%
rename from src/devices/wimax/model/bs-net-device.h
rename to src/wimax/model/bs-net-device.h
diff --git a/src/devices/wimax/model/bs-scheduler-rtps.cc b/src/wimax/model/bs-scheduler-rtps.cc
similarity index 100%
rename from src/devices/wimax/model/bs-scheduler-rtps.cc
rename to src/wimax/model/bs-scheduler-rtps.cc
diff --git a/src/devices/wimax/model/bs-scheduler-rtps.h b/src/wimax/model/bs-scheduler-rtps.h
similarity index 100%
rename from src/devices/wimax/model/bs-scheduler-rtps.h
rename to src/wimax/model/bs-scheduler-rtps.h
diff --git a/src/devices/wimax/model/bs-scheduler-simple.cc b/src/wimax/model/bs-scheduler-simple.cc
similarity index 100%
rename from src/devices/wimax/model/bs-scheduler-simple.cc
rename to src/wimax/model/bs-scheduler-simple.cc
diff --git a/src/devices/wimax/model/bs-scheduler-simple.h b/src/wimax/model/bs-scheduler-simple.h
similarity index 100%
rename from src/devices/wimax/model/bs-scheduler-simple.h
rename to src/wimax/model/bs-scheduler-simple.h
diff --git a/src/devices/wimax/model/bs-scheduler.cc b/src/wimax/model/bs-scheduler.cc
similarity index 100%
rename from src/devices/wimax/model/bs-scheduler.cc
rename to src/wimax/model/bs-scheduler.cc
diff --git a/src/devices/wimax/model/bs-scheduler.h b/src/wimax/model/bs-scheduler.h
similarity index 100%
rename from src/devices/wimax/model/bs-scheduler.h
rename to src/wimax/model/bs-scheduler.h
diff --git a/src/devices/wimax/model/bs-service-flow-manager.cc b/src/wimax/model/bs-service-flow-manager.cc
similarity index 100%
rename from src/devices/wimax/model/bs-service-flow-manager.cc
rename to src/wimax/model/bs-service-flow-manager.cc
diff --git a/src/devices/wimax/model/bs-service-flow-manager.h b/src/wimax/model/bs-service-flow-manager.h
similarity index 100%
rename from src/devices/wimax/model/bs-service-flow-manager.h
rename to src/wimax/model/bs-service-flow-manager.h
diff --git a/src/devices/wimax/model/bs-uplink-scheduler-mbqos.cc b/src/wimax/model/bs-uplink-scheduler-mbqos.cc
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler-mbqos.cc
rename to src/wimax/model/bs-uplink-scheduler-mbqos.cc
diff --git a/src/devices/wimax/model/bs-uplink-scheduler-mbqos.h b/src/wimax/model/bs-uplink-scheduler-mbqos.h
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler-mbqos.h
rename to src/wimax/model/bs-uplink-scheduler-mbqos.h
diff --git a/src/devices/wimax/model/bs-uplink-scheduler-rtps.cc b/src/wimax/model/bs-uplink-scheduler-rtps.cc
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler-rtps.cc
rename to src/wimax/model/bs-uplink-scheduler-rtps.cc
diff --git a/src/devices/wimax/model/bs-uplink-scheduler-rtps.h b/src/wimax/model/bs-uplink-scheduler-rtps.h
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler-rtps.h
rename to src/wimax/model/bs-uplink-scheduler-rtps.h
diff --git a/src/devices/wimax/model/bs-uplink-scheduler-simple.cc b/src/wimax/model/bs-uplink-scheduler-simple.cc
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler-simple.cc
rename to src/wimax/model/bs-uplink-scheduler-simple.cc
diff --git a/src/devices/wimax/model/bs-uplink-scheduler-simple.h b/src/wimax/model/bs-uplink-scheduler-simple.h
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler-simple.h
rename to src/wimax/model/bs-uplink-scheduler-simple.h
diff --git a/src/devices/wimax/model/bs-uplink-scheduler.cc b/src/wimax/model/bs-uplink-scheduler.cc
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler.cc
rename to src/wimax/model/bs-uplink-scheduler.cc
diff --git a/src/devices/wimax/model/bs-uplink-scheduler.h b/src/wimax/model/bs-uplink-scheduler.h
similarity index 100%
rename from src/devices/wimax/model/bs-uplink-scheduler.h
rename to src/wimax/model/bs-uplink-scheduler.h
diff --git a/src/devices/wimax/model/burst-profile-manager.cc b/src/wimax/model/burst-profile-manager.cc
similarity index 100%
rename from src/devices/wimax/model/burst-profile-manager.cc
rename to src/wimax/model/burst-profile-manager.cc
diff --git a/src/devices/wimax/model/burst-profile-manager.h b/src/wimax/model/burst-profile-manager.h
similarity index 100%
rename from src/devices/wimax/model/burst-profile-manager.h
rename to src/wimax/model/burst-profile-manager.h
diff --git a/src/devices/wimax/model/bvec.h b/src/wimax/model/bvec.h
similarity index 100%
rename from src/devices/wimax/model/bvec.h
rename to src/wimax/model/bvec.h
diff --git a/src/devices/wimax/model/cid-factory.cc b/src/wimax/model/cid-factory.cc
similarity index 100%
rename from src/devices/wimax/model/cid-factory.cc
rename to src/wimax/model/cid-factory.cc
diff --git a/src/devices/wimax/model/cid-factory.h b/src/wimax/model/cid-factory.h
similarity index 100%
rename from src/devices/wimax/model/cid-factory.h
rename to src/wimax/model/cid-factory.h
diff --git a/src/devices/wimax/model/cid.cc b/src/wimax/model/cid.cc
similarity index 100%
rename from src/devices/wimax/model/cid.cc
rename to src/wimax/model/cid.cc
diff --git a/src/devices/wimax/model/cid.h b/src/wimax/model/cid.h
similarity index 100%
rename from src/devices/wimax/model/cid.h
rename to src/wimax/model/cid.h
diff --git a/src/devices/wimax/model/connection-manager.cc b/src/wimax/model/connection-manager.cc
similarity index 100%
rename from src/devices/wimax/model/connection-manager.cc
rename to src/wimax/model/connection-manager.cc
diff --git a/src/devices/wimax/model/connection-manager.h b/src/wimax/model/connection-manager.h
similarity index 100%
rename from src/devices/wimax/model/connection-manager.h
rename to src/wimax/model/connection-manager.h
diff --git a/src/devices/wimax/model/crc8.cc b/src/wimax/model/crc8.cc
similarity index 100%
rename from src/devices/wimax/model/crc8.cc
rename to src/wimax/model/crc8.cc
diff --git a/src/devices/wimax/model/crc8.h b/src/wimax/model/crc8.h
similarity index 100%
rename from src/devices/wimax/model/crc8.h
rename to src/wimax/model/crc8.h
diff --git a/src/devices/wimax/model/cs-parameters.cc b/src/wimax/model/cs-parameters.cc
similarity index 100%
rename from src/devices/wimax/model/cs-parameters.cc
rename to src/wimax/model/cs-parameters.cc
diff --git a/src/devices/wimax/model/cs-parameters.h b/src/wimax/model/cs-parameters.h
similarity index 100%
rename from src/devices/wimax/model/cs-parameters.h
rename to src/wimax/model/cs-parameters.h
diff --git a/src/devices/wimax/model/default-traces.h b/src/wimax/model/default-traces.h
similarity index 100%
rename from src/devices/wimax/model/default-traces.h
rename to src/wimax/model/default-traces.h
diff --git a/src/devices/wimax/model/dl-mac-messages.cc b/src/wimax/model/dl-mac-messages.cc
similarity index 100%
rename from src/devices/wimax/model/dl-mac-messages.cc
rename to src/wimax/model/dl-mac-messages.cc
diff --git a/src/devices/wimax/model/dl-mac-messages.h b/src/wimax/model/dl-mac-messages.h
similarity index 100%
rename from src/devices/wimax/model/dl-mac-messages.h
rename to src/wimax/model/dl-mac-messages.h
diff --git a/src/devices/wimax/model/ipcs-classifier-record.cc b/src/wimax/model/ipcs-classifier-record.cc
similarity index 100%
rename from src/devices/wimax/model/ipcs-classifier-record.cc
rename to src/wimax/model/ipcs-classifier-record.cc
diff --git a/src/devices/wimax/model/ipcs-classifier-record.h b/src/wimax/model/ipcs-classifier-record.h
similarity index 100%
rename from src/devices/wimax/model/ipcs-classifier-record.h
rename to src/wimax/model/ipcs-classifier-record.h
diff --git a/src/devices/wimax/model/ipcs-classifier.cc b/src/wimax/model/ipcs-classifier.cc
similarity index 100%
rename from src/devices/wimax/model/ipcs-classifier.cc
rename to src/wimax/model/ipcs-classifier.cc
diff --git a/src/devices/wimax/model/ipcs-classifier.h b/src/wimax/model/ipcs-classifier.h
similarity index 100%
rename from src/devices/wimax/model/ipcs-classifier.h
rename to src/wimax/model/ipcs-classifier.h
diff --git a/src/devices/wimax/model/mac-messages.cc b/src/wimax/model/mac-messages.cc
similarity index 100%
rename from src/devices/wimax/model/mac-messages.cc
rename to src/wimax/model/mac-messages.cc
diff --git a/src/devices/wimax/model/mac-messages.h b/src/wimax/model/mac-messages.h
similarity index 100%
rename from src/devices/wimax/model/mac-messages.h
rename to src/wimax/model/mac-messages.h
diff --git a/src/devices/wimax/model/ofdm-downlink-frame-prefix.cc b/src/wimax/model/ofdm-downlink-frame-prefix.cc
similarity index 100%
rename from src/devices/wimax/model/ofdm-downlink-frame-prefix.cc
rename to src/wimax/model/ofdm-downlink-frame-prefix.cc
diff --git a/src/devices/wimax/model/ofdm-downlink-frame-prefix.h b/src/wimax/model/ofdm-downlink-frame-prefix.h
similarity index 100%
rename from src/devices/wimax/model/ofdm-downlink-frame-prefix.h
rename to src/wimax/model/ofdm-downlink-frame-prefix.h
diff --git a/src/devices/wimax/model/send-params.cc b/src/wimax/model/send-params.cc
similarity index 100%
rename from src/devices/wimax/model/send-params.cc
rename to src/wimax/model/send-params.cc
diff --git a/src/devices/wimax/model/send-params.h b/src/wimax/model/send-params.h
similarity index 100%
rename from src/devices/wimax/model/send-params.h
rename to src/wimax/model/send-params.h
diff --git a/src/devices/wimax/model/service-flow-manager.cc b/src/wimax/model/service-flow-manager.cc
similarity index 100%
rename from src/devices/wimax/model/service-flow-manager.cc
rename to src/wimax/model/service-flow-manager.cc
diff --git a/src/devices/wimax/model/service-flow-manager.h b/src/wimax/model/service-flow-manager.h
similarity index 100%
rename from src/devices/wimax/model/service-flow-manager.h
rename to src/wimax/model/service-flow-manager.h
diff --git a/src/devices/wimax/model/service-flow-record.cc b/src/wimax/model/service-flow-record.cc
similarity index 100%
rename from src/devices/wimax/model/service-flow-record.cc
rename to src/wimax/model/service-flow-record.cc
diff --git a/src/devices/wimax/model/service-flow-record.h b/src/wimax/model/service-flow-record.h
similarity index 100%
rename from src/devices/wimax/model/service-flow-record.h
rename to src/wimax/model/service-flow-record.h
diff --git a/src/devices/wimax/model/service-flow.cc b/src/wimax/model/service-flow.cc
similarity index 100%
rename from src/devices/wimax/model/service-flow.cc
rename to src/wimax/model/service-flow.cc
diff --git a/src/devices/wimax/model/service-flow.h b/src/wimax/model/service-flow.h
similarity index 100%
rename from src/devices/wimax/model/service-flow.h
rename to src/wimax/model/service-flow.h
diff --git a/src/devices/wimax/model/simple-ofdm-send-param.cc b/src/wimax/model/simple-ofdm-send-param.cc
similarity index 100%
rename from src/devices/wimax/model/simple-ofdm-send-param.cc
rename to src/wimax/model/simple-ofdm-send-param.cc
diff --git a/src/devices/wimax/model/simple-ofdm-send-param.h b/src/wimax/model/simple-ofdm-send-param.h
similarity index 100%
rename from src/devices/wimax/model/simple-ofdm-send-param.h
rename to src/wimax/model/simple-ofdm-send-param.h
diff --git a/src/devices/wimax/model/simple-ofdm-wimax-channel.cc b/src/wimax/model/simple-ofdm-wimax-channel.cc
similarity index 100%
rename from src/devices/wimax/model/simple-ofdm-wimax-channel.cc
rename to src/wimax/model/simple-ofdm-wimax-channel.cc
diff --git a/src/devices/wimax/model/simple-ofdm-wimax-channel.h b/src/wimax/model/simple-ofdm-wimax-channel.h
similarity index 100%
rename from src/devices/wimax/model/simple-ofdm-wimax-channel.h
rename to src/wimax/model/simple-ofdm-wimax-channel.h
diff --git a/src/devices/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc
similarity index 100%
rename from src/devices/wimax/model/simple-ofdm-wimax-phy.cc
rename to src/wimax/model/simple-ofdm-wimax-phy.cc
diff --git a/src/devices/wimax/model/simple-ofdm-wimax-phy.h b/src/wimax/model/simple-ofdm-wimax-phy.h
similarity index 100%
rename from src/devices/wimax/model/simple-ofdm-wimax-phy.h
rename to src/wimax/model/simple-ofdm-wimax-phy.h
diff --git a/src/devices/wimax/model/snr-to-block-error-rate-manager.cc b/src/wimax/model/snr-to-block-error-rate-manager.cc
similarity index 100%
rename from src/devices/wimax/model/snr-to-block-error-rate-manager.cc
rename to src/wimax/model/snr-to-block-error-rate-manager.cc
diff --git a/src/devices/wimax/model/snr-to-block-error-rate-manager.h b/src/wimax/model/snr-to-block-error-rate-manager.h
similarity index 100%
rename from src/devices/wimax/model/snr-to-block-error-rate-manager.h
rename to src/wimax/model/snr-to-block-error-rate-manager.h
diff --git a/src/devices/wimax/model/snr-to-block-error-rate-record.cc b/src/wimax/model/snr-to-block-error-rate-record.cc
similarity index 100%
rename from src/devices/wimax/model/snr-to-block-error-rate-record.cc
rename to src/wimax/model/snr-to-block-error-rate-record.cc
diff --git a/src/devices/wimax/model/snr-to-block-error-rate-record.h b/src/wimax/model/snr-to-block-error-rate-record.h
similarity index 100%
rename from src/devices/wimax/model/snr-to-block-error-rate-record.h
rename to src/wimax/model/snr-to-block-error-rate-record.h
diff --git a/src/devices/wimax/model/ss-link-manager.cc b/src/wimax/model/ss-link-manager.cc
similarity index 100%
rename from src/devices/wimax/model/ss-link-manager.cc
rename to src/wimax/model/ss-link-manager.cc
diff --git a/src/devices/wimax/model/ss-link-manager.h b/src/wimax/model/ss-link-manager.h
similarity index 100%
rename from src/devices/wimax/model/ss-link-manager.h
rename to src/wimax/model/ss-link-manager.h
diff --git a/src/devices/wimax/model/ss-manager.cc b/src/wimax/model/ss-manager.cc
similarity index 100%
rename from src/devices/wimax/model/ss-manager.cc
rename to src/wimax/model/ss-manager.cc
diff --git a/src/devices/wimax/model/ss-manager.h b/src/wimax/model/ss-manager.h
similarity index 100%
rename from src/devices/wimax/model/ss-manager.h
rename to src/wimax/model/ss-manager.h
diff --git a/src/devices/wimax/model/ss-net-device.cc b/src/wimax/model/ss-net-device.cc
similarity index 100%
rename from src/devices/wimax/model/ss-net-device.cc
rename to src/wimax/model/ss-net-device.cc
diff --git a/src/devices/wimax/model/ss-net-device.h b/src/wimax/model/ss-net-device.h
similarity index 100%
rename from src/devices/wimax/model/ss-net-device.h
rename to src/wimax/model/ss-net-device.h
diff --git a/src/devices/wimax/model/ss-record.cc b/src/wimax/model/ss-record.cc
similarity index 100%
rename from src/devices/wimax/model/ss-record.cc
rename to src/wimax/model/ss-record.cc
diff --git a/src/devices/wimax/model/ss-record.h b/src/wimax/model/ss-record.h
similarity index 100%
rename from src/devices/wimax/model/ss-record.h
rename to src/wimax/model/ss-record.h
diff --git a/src/devices/wimax/model/ss-scheduler.cc b/src/wimax/model/ss-scheduler.cc
similarity index 100%
rename from src/devices/wimax/model/ss-scheduler.cc
rename to src/wimax/model/ss-scheduler.cc
diff --git a/src/devices/wimax/model/ss-scheduler.h b/src/wimax/model/ss-scheduler.h
similarity index 100%
rename from src/devices/wimax/model/ss-scheduler.h
rename to src/wimax/model/ss-scheduler.h
diff --git a/src/devices/wimax/model/ss-service-flow-manager.cc b/src/wimax/model/ss-service-flow-manager.cc
similarity index 100%
rename from src/devices/wimax/model/ss-service-flow-manager.cc
rename to src/wimax/model/ss-service-flow-manager.cc
diff --git a/src/devices/wimax/model/ss-service-flow-manager.h b/src/wimax/model/ss-service-flow-manager.h
similarity index 100%
rename from src/devices/wimax/model/ss-service-flow-manager.h
rename to src/wimax/model/ss-service-flow-manager.h
diff --git a/src/devices/wimax/model/ul-job.cc b/src/wimax/model/ul-job.cc
similarity index 100%
rename from src/devices/wimax/model/ul-job.cc
rename to src/wimax/model/ul-job.cc
diff --git a/src/devices/wimax/model/ul-job.h b/src/wimax/model/ul-job.h
similarity index 100%
rename from src/devices/wimax/model/ul-job.h
rename to src/wimax/model/ul-job.h
diff --git a/src/devices/wimax/model/ul-mac-messages.cc b/src/wimax/model/ul-mac-messages.cc
similarity index 100%
rename from src/devices/wimax/model/ul-mac-messages.cc
rename to src/wimax/model/ul-mac-messages.cc
diff --git a/src/devices/wimax/model/ul-mac-messages.h b/src/wimax/model/ul-mac-messages.h
similarity index 100%
rename from src/devices/wimax/model/ul-mac-messages.h
rename to src/wimax/model/ul-mac-messages.h
diff --git a/src/devices/wimax/model/wimax-channel.cc b/src/wimax/model/wimax-channel.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-channel.cc
rename to src/wimax/model/wimax-channel.cc
diff --git a/src/devices/wimax/model/wimax-channel.h b/src/wimax/model/wimax-channel.h
similarity index 100%
rename from src/devices/wimax/model/wimax-channel.h
rename to src/wimax/model/wimax-channel.h
diff --git a/src/devices/wimax/model/wimax-connection.cc b/src/wimax/model/wimax-connection.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-connection.cc
rename to src/wimax/model/wimax-connection.cc
diff --git a/src/devices/wimax/model/wimax-connection.h b/src/wimax/model/wimax-connection.h
similarity index 100%
rename from src/devices/wimax/model/wimax-connection.h
rename to src/wimax/model/wimax-connection.h
diff --git a/src/devices/wimax/model/wimax-mac-header.cc b/src/wimax/model/wimax-mac-header.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-mac-header.cc
rename to src/wimax/model/wimax-mac-header.cc
diff --git a/src/devices/wimax/model/wimax-mac-header.h b/src/wimax/model/wimax-mac-header.h
similarity index 100%
rename from src/devices/wimax/model/wimax-mac-header.h
rename to src/wimax/model/wimax-mac-header.h
diff --git a/src/devices/wimax/model/wimax-mac-queue.cc b/src/wimax/model/wimax-mac-queue.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-mac-queue.cc
rename to src/wimax/model/wimax-mac-queue.cc
diff --git a/src/devices/wimax/model/wimax-mac-queue.h b/src/wimax/model/wimax-mac-queue.h
similarity index 100%
rename from src/devices/wimax/model/wimax-mac-queue.h
rename to src/wimax/model/wimax-mac-queue.h
diff --git a/src/devices/wimax/model/wimax-mac-to-mac-header.cc b/src/wimax/model/wimax-mac-to-mac-header.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-mac-to-mac-header.cc
rename to src/wimax/model/wimax-mac-to-mac-header.cc
diff --git a/src/devices/wimax/model/wimax-mac-to-mac-header.h b/src/wimax/model/wimax-mac-to-mac-header.h
similarity index 100%
rename from src/devices/wimax/model/wimax-mac-to-mac-header.h
rename to src/wimax/model/wimax-mac-to-mac-header.h
diff --git a/src/devices/wimax/model/wimax-net-device.cc b/src/wimax/model/wimax-net-device.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-net-device.cc
rename to src/wimax/model/wimax-net-device.cc
diff --git a/src/devices/wimax/model/wimax-net-device.h b/src/wimax/model/wimax-net-device.h
similarity index 100%
rename from src/devices/wimax/model/wimax-net-device.h
rename to src/wimax/model/wimax-net-device.h
diff --git a/src/devices/wimax/model/wimax-phy.cc b/src/wimax/model/wimax-phy.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-phy.cc
rename to src/wimax/model/wimax-phy.cc
diff --git a/src/devices/wimax/model/wimax-phy.h b/src/wimax/model/wimax-phy.h
similarity index 100%
rename from src/devices/wimax/model/wimax-phy.h
rename to src/wimax/model/wimax-phy.h
diff --git a/src/devices/wimax/model/wimax-tlv.cc b/src/wimax/model/wimax-tlv.cc
similarity index 100%
rename from src/devices/wimax/model/wimax-tlv.cc
rename to src/wimax/model/wimax-tlv.cc
diff --git a/src/devices/wimax/model/wimax-tlv.h b/src/wimax/model/wimax-tlv.h
similarity index 100%
rename from src/devices/wimax/model/wimax-tlv.h
rename to src/wimax/model/wimax-tlv.h
diff --git a/src/devices/wimax/test/mac-messages-test.cc b/src/wimax/test/mac-messages-test.cc
similarity index 100%
rename from src/devices/wimax/test/mac-messages-test.cc
rename to src/wimax/test/mac-messages-test.cc
diff --git a/src/devices/wimax/test/phy-test.cc b/src/wimax/test/phy-test.cc
similarity index 100%
rename from src/devices/wimax/test/phy-test.cc
rename to src/wimax/test/phy-test.cc
diff --git a/src/devices/wimax/test/qos-test.cc b/src/wimax/test/qos-test.cc
similarity index 100%
rename from src/devices/wimax/test/qos-test.cc
rename to src/wimax/test/qos-test.cc
diff --git a/src/devices/wimax/test/ss-mac-test.cc b/src/wimax/test/ss-mac-test.cc
similarity index 100%
rename from src/devices/wimax/test/ss-mac-test.cc
rename to src/wimax/test/ss-mac-test.cc
diff --git a/src/devices/wimax/test/wimax-fragmentation-test.cc b/src/wimax/test/wimax-fragmentation-test.cc
similarity index 100%
rename from src/devices/wimax/test/wimax-fragmentation-test.cc
rename to src/wimax/test/wimax-fragmentation-test.cc
diff --git a/src/devices/wimax/test/wimax-service-flow-test.cc b/src/wimax/test/wimax-service-flow-test.cc
similarity index 100%
rename from src/devices/wimax/test/wimax-service-flow-test.cc
rename to src/wimax/test/wimax-service-flow-test.cc
diff --git a/src/devices/wimax/test/wimax-tlv-test.cc b/src/wimax/test/wimax-tlv-test.cc
similarity index 100%
rename from src/devices/wimax/test/wimax-tlv-test.cc
rename to src/wimax/test/wimax-tlv-test.cc
diff --git a/src/devices/wimax/wscript b/src/wimax/wscript
similarity index 100%
rename from src/devices/wimax/wscript
rename to src/wimax/wscript
diff --git a/src/wscript b/src/wscript
index aada8bb82..f10426179 100644
--- a/src/wscript
+++ b/src/wscript
@@ -23,23 +23,23 @@ all_modules = (
     'contrib',
     'internet',
     'propagation',
-    'devices/point-to-point',
-    'devices/csma',
-    'devices/emu',
-    'devices/bridge',
-    'devices/tap-bridge',
-    'devices/virtual-net-device',
+    'point-to-point',
+    'csma',
+    'emu',
+    'bridge',
+    'tap-bridge',
+    'virtual-net-device',
     'applications',
-    'routing/nix-vector-routing',
-    'routing/olsr',
-    'routing/aodv',
-    'routing/dsdv',
-    'routing/click',
+    'nix-vector-routing',
+    'olsr',
+    'aodv',
+    'dsdv',
+    'click',
     'mobility',
-    'devices/wifi',
+    'wifi',
     'helper',
     'contrib/stats',
-    'devices/uan',
+    'uan',
     'spectrum',
     'mesh',   
     'dot11s',
@@ -50,8 +50,8 @@ all_modules = (
     'test/nsctcp',
     'test/ns3wifi',
     'contrib/flow-monitor',
-    'devices/wimax',
-    'devices/lte',
+    'wimax',
+    'lte',
     'mpi',
     'contrib/topology-read',
     'contrib/energy',
@@ -60,7 +60,7 @@ all_modules = (
 
 def set_options(opt):
     opt.sub_options('core')
-    opt.sub_options('routing/click')
+    opt.sub_options('click')
 
     opt.add_option('--enable-rpath',
                    help=("Link programs with rpath"
@@ -75,13 +75,13 @@ def set_options(opt):
 
 def configure(conf):
     conf.sub_config('core')
-    conf.sub_config('devices/emu')
-    conf.sub_config('devices/tap-bridge')
+    conf.sub_config('emu')
+    conf.sub_config('tap-bridge')
     conf.sub_config('contrib')
     conf.sub_config('internet')
     conf.sub_config('helper')
     conf.sub_config('test')
-    conf.sub_config('routing/click')
+    conf.sub_config('click')
 
     blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant()))
     conf.env.append_value('NS3_MODULE_PATH', blddir)
diff --git a/test.py b/test.py
index 86cd369d5..d8c97a4a6 100755
--- a/test.py
+++ b/test.py
@@ -91,18 +91,18 @@ core_nsc_missing_skip_tests = [
 # hardcoded.
 #
 example_tests = [
-    ("src/devices/bridge/examples/csma-bridge", "True", "True"),
-    ("src/devices/bridge/examples/csma-bridge-one-hop", "True", "True"),
-    ("src/devices/csma/examples/csma-broadcast", "True", "True"),
-    ("src/devices/csma/examples/csma-multicast", "True", "True"),
-    ("src/devices/csma/examples/csma-one-subnet", "True", "True"),
-    ("src/devices/csma/examples/csma-packet-socket", "True", "True"),
-    ("src/devices/csma/examples/csma-ping", "True", "True"),
-    ("src/devices/csma/examples/csma-raw-ip-socket", "True", "True"),
-    ("src/devices/csma/examples/csma-star", "True", "True"),
+    ("src/bridge/examples/csma-bridge", "True", "True"),
+    ("src/bridge/examples/csma-bridge-one-hop", "True", "True"),
+    ("src/csma/examples/csma-broadcast", "True", "True"),
+    ("src/csma/examples/csma-multicast", "True", "True"),
+    ("src/csma/examples/csma-one-subnet", "True", "True"),
+    ("src/csma/examples/csma-packet-socket", "True", "True"),
+    ("src/csma/examples/csma-ping", "True", "True"),
+    ("src/csma/examples/csma-raw-ip-socket", "True", "True"),
+    ("src/csma/examples/csma-star", "True", "True"),
 
-    ("src/devices/emu/examples/emu-ping", "False", "True"),
-    ("src/devices/emu/examples/emu-udp-echo", "False", "True"),
+    ("src/emu/examples/emu-ping", "False", "True"),
+    ("src/emu/examples/emu-udp-echo", "False", "True"),
 
     ("examples/energy/energy-model-example", "True", "True"),
 
@@ -124,14 +124,14 @@ example_tests = [
     ("examples/routing/global-injection-slash32", "True", "True"),
     ("examples/routing/global-routing-slash32", "True", "True"),
     ("examples/routing/mixed-global-routing", "True", "True"),
-    ("src/routing/nix-vector-routing/examples/nix-simple", "True", "True"),
-    ("src/routing/nix-vector-routing/examples/nms-p2p-nix", "False", "True"), # Takes too long to run
+    ("src/nix-vector-routing/examples/nix-simple", "True", "True"),
+    ("src/nix-vector-routing/examples/nms-p2p-nix", "False", "True"), # Takes too long to run
     ("examples/routing/simple-alternate-routing", "True", "True"),
     ("examples/routing/simple-global-routing", "True", "True"),
-    ("src/routing/olsr/examples/simple-point-to-point-olsr", "True", "True"),
+    ("src/olsr/examples/simple-point-to-point-olsr", "True", "True"),
     ("examples/routing/simple-routing-ping6", "True", "True"),
     ("examples/routing/static-routing-slash32", "True", "True"),
-    ("src/routing/aodv/examples/aodv", "True", "True"),
+    ("src/aodv/examples/aodv", "True", "True"),
 
     ("src/spectrum/examples/adhoc-aloha-ideal-phy", "True", "True"),
     ("src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven", "True", "True"),
@@ -149,7 +149,7 @@ example_tests = [
     ("examples/topology-read/topology-read --input=../../examples/topology-read/Inet_small_toposample.txt", "True", "True"),
     ("examples/topology-read/topology-read --format=Rocketfuel --input=../../examples/topology-read/RocketFuel_toposample_1239_weights.txt", "True", "True"),
 
-    ("src/devices/virtual-net-device/examples/virtual-net-device", "True", "True"),
+    ("src/virtual-net-device/examples/virtual-net-device", "True", "True"),
 
     ("examples/tutorial/first", "True", "True"),
     ("examples/tutorial/hello-simulator", "True", "True"),
@@ -179,11 +179,11 @@ example_tests = [
     ("examples/wireless/wifi-simple-interference", "True", "True"),
     ("examples/wireless/wifi-wired-bridging", "True", "True"),
 
-    ("src/routing/click/examples/nsclick-simple-lan", "ENABLE_CLICK == True", "True"),
+    ("src/click/examples/nsclick-simple-lan", "ENABLE_CLICK == True", "True"),
 
-    ("src/devices/wimax/examples/wimax-simple", "True", "True"),
-    ("src/devices/wimax/examples/wimax-ipv4", "True", "True"),
-    ("src/devices/wimax/examples/wimax-multicast", "True", "True"),
+    ("src/wimax/examples/wimax-simple", "True", "True"),
+    ("src/wimax/examples/wimax-ipv4", "True", "True"),
+    ("src/wimax/examples/wimax-multicast", "True", "True"),
 ]
 
 #
@@ -195,7 +195,7 @@ example_tests = [
 # hardcoded.
 #
 python_tests = [
-    ("src/devices/bridge/examples/csma-bridge.py", "True"),
+    ("src/bridge/examples/csma-bridge.py", "True"),
 
     ("src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py", "True"),