diff --git a/src/dot11s/helper/dot11s-installer.cc b/src/mesh/model/dot11s/helper/dot11s-installer.cc
similarity index 100%
rename from src/dot11s/helper/dot11s-installer.cc
rename to src/mesh/model/dot11s/helper/dot11s-installer.cc
diff --git a/src/dot11s/helper/dot11s-installer.h b/src/mesh/model/dot11s/helper/dot11s-installer.h
similarity index 100%
rename from src/dot11s/helper/dot11s-installer.h
rename to src/mesh/model/dot11s/helper/dot11s-installer.h
diff --git a/src/dot11s/model/airtime-metric.cc b/src/mesh/model/dot11s/model/airtime-metric.cc
similarity index 100%
rename from src/dot11s/model/airtime-metric.cc
rename to src/mesh/model/dot11s/model/airtime-metric.cc
diff --git a/src/dot11s/model/airtime-metric.h b/src/mesh/model/dot11s/model/airtime-metric.h
similarity index 100%
rename from src/dot11s/model/airtime-metric.h
rename to src/mesh/model/dot11s/model/airtime-metric.h
diff --git a/src/dot11s/model/dot11s-mac-header.cc b/src/mesh/model/dot11s/model/dot11s-mac-header.cc
similarity index 100%
rename from src/dot11s/model/dot11s-mac-header.cc
rename to src/mesh/model/dot11s/model/dot11s-mac-header.cc
diff --git a/src/dot11s/model/dot11s-mac-header.h b/src/mesh/model/dot11s/model/dot11s-mac-header.h
similarity index 100%
rename from src/dot11s/model/dot11s-mac-header.h
rename to src/mesh/model/dot11s/model/dot11s-mac-header.h
diff --git a/src/dot11s/model/dot11s.h b/src/mesh/model/dot11s/model/dot11s.h
similarity index 100%
rename from src/dot11s/model/dot11s.h
rename to src/mesh/model/dot11s/model/dot11s.h
diff --git a/src/dot11s/model/hwmp-protocol-mac.cc b/src/mesh/model/dot11s/model/hwmp-protocol-mac.cc
similarity index 100%
rename from src/dot11s/model/hwmp-protocol-mac.cc
rename to src/mesh/model/dot11s/model/hwmp-protocol-mac.cc
diff --git a/src/dot11s/model/hwmp-protocol-mac.h b/src/mesh/model/dot11s/model/hwmp-protocol-mac.h
similarity index 100%
rename from src/dot11s/model/hwmp-protocol-mac.h
rename to src/mesh/model/dot11s/model/hwmp-protocol-mac.h
diff --git a/src/dot11s/model/hwmp-protocol.cc b/src/mesh/model/dot11s/model/hwmp-protocol.cc
similarity index 100%
rename from src/dot11s/model/hwmp-protocol.cc
rename to src/mesh/model/dot11s/model/hwmp-protocol.cc
diff --git a/src/dot11s/model/hwmp-protocol.h b/src/mesh/model/dot11s/model/hwmp-protocol.h
similarity index 100%
rename from src/dot11s/model/hwmp-protocol.h
rename to src/mesh/model/dot11s/model/hwmp-protocol.h
diff --git a/src/dot11s/model/hwmp-rtable.cc b/src/mesh/model/dot11s/model/hwmp-rtable.cc
similarity index 100%
rename from src/dot11s/model/hwmp-rtable.cc
rename to src/mesh/model/dot11s/model/hwmp-rtable.cc
diff --git a/src/dot11s/model/hwmp-rtable.h b/src/mesh/model/dot11s/model/hwmp-rtable.h
similarity index 100%
rename from src/dot11s/model/hwmp-rtable.h
rename to src/mesh/model/dot11s/model/hwmp-rtable.h
diff --git a/src/dot11s/model/hwmp-tag.cc b/src/mesh/model/dot11s/model/hwmp-tag.cc
similarity index 100%
rename from src/dot11s/model/hwmp-tag.cc
rename to src/mesh/model/dot11s/model/hwmp-tag.cc
diff --git a/src/dot11s/model/hwmp-tag.h b/src/mesh/model/dot11s/model/hwmp-tag.h
similarity index 100%
rename from src/dot11s/model/hwmp-tag.h
rename to src/mesh/model/dot11s/model/hwmp-tag.h
diff --git a/src/dot11s/model/ie-dot11s-beacon-timing.cc b/src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-beacon-timing.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.cc
diff --git a/src/dot11s/model/ie-dot11s-beacon-timing.h b/src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-beacon-timing.h
rename to src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.h
diff --git a/src/dot11s/model/ie-dot11s-configuration.cc b/src/mesh/model/dot11s/model/ie-dot11s-configuration.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-configuration.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-configuration.cc
diff --git a/src/dot11s/model/ie-dot11s-configuration.h b/src/mesh/model/dot11s/model/ie-dot11s-configuration.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-configuration.h
rename to src/mesh/model/dot11s/model/ie-dot11s-configuration.h
diff --git a/src/dot11s/model/ie-dot11s-id.cc b/src/mesh/model/dot11s/model/ie-dot11s-id.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-id.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-id.cc
diff --git a/src/dot11s/model/ie-dot11s-id.h b/src/mesh/model/dot11s/model/ie-dot11s-id.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-id.h
rename to src/mesh/model/dot11s/model/ie-dot11s-id.h
diff --git a/src/dot11s/model/ie-dot11s-metric-report.cc b/src/mesh/model/dot11s/model/ie-dot11s-metric-report.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-metric-report.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-metric-report.cc
diff --git a/src/dot11s/model/ie-dot11s-metric-report.h b/src/mesh/model/dot11s/model/ie-dot11s-metric-report.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-metric-report.h
rename to src/mesh/model/dot11s/model/ie-dot11s-metric-report.h
diff --git a/src/dot11s/model/ie-dot11s-peer-management.cc b/src/mesh/model/dot11s/model/ie-dot11s-peer-management.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-peer-management.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-peer-management.cc
diff --git a/src/dot11s/model/ie-dot11s-peer-management.h b/src/mesh/model/dot11s/model/ie-dot11s-peer-management.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-peer-management.h
rename to src/mesh/model/dot11s/model/ie-dot11s-peer-management.h
diff --git a/src/dot11s/model/ie-dot11s-peering-protocol.cc b/src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-peering-protocol.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.cc
diff --git a/src/dot11s/model/ie-dot11s-peering-protocol.h b/src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-peering-protocol.h
rename to src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.h
diff --git a/src/dot11s/model/ie-dot11s-perr.cc b/src/mesh/model/dot11s/model/ie-dot11s-perr.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-perr.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-perr.cc
diff --git a/src/dot11s/model/ie-dot11s-perr.h b/src/mesh/model/dot11s/model/ie-dot11s-perr.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-perr.h
rename to src/mesh/model/dot11s/model/ie-dot11s-perr.h
diff --git a/src/dot11s/model/ie-dot11s-prep.cc b/src/mesh/model/dot11s/model/ie-dot11s-prep.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-prep.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-prep.cc
diff --git a/src/dot11s/model/ie-dot11s-prep.h b/src/mesh/model/dot11s/model/ie-dot11s-prep.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-prep.h
rename to src/mesh/model/dot11s/model/ie-dot11s-prep.h
diff --git a/src/dot11s/model/ie-dot11s-preq.cc b/src/mesh/model/dot11s/model/ie-dot11s-preq.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-preq.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-preq.cc
diff --git a/src/dot11s/model/ie-dot11s-preq.h b/src/mesh/model/dot11s/model/ie-dot11s-preq.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-preq.h
rename to src/mesh/model/dot11s/model/ie-dot11s-preq.h
diff --git a/src/dot11s/model/ie-dot11s-rann.cc b/src/mesh/model/dot11s/model/ie-dot11s-rann.cc
similarity index 100%
rename from src/dot11s/model/ie-dot11s-rann.cc
rename to src/mesh/model/dot11s/model/ie-dot11s-rann.cc
diff --git a/src/dot11s/model/ie-dot11s-rann.h b/src/mesh/model/dot11s/model/ie-dot11s-rann.h
similarity index 100%
rename from src/dot11s/model/ie-dot11s-rann.h
rename to src/mesh/model/dot11s/model/ie-dot11s-rann.h
diff --git a/src/dot11s/model/peer-link-frame.cc b/src/mesh/model/dot11s/model/peer-link-frame.cc
similarity index 100%
rename from src/dot11s/model/peer-link-frame.cc
rename to src/mesh/model/dot11s/model/peer-link-frame.cc
diff --git a/src/dot11s/model/peer-link-frame.h b/src/mesh/model/dot11s/model/peer-link-frame.h
similarity index 100%
rename from src/dot11s/model/peer-link-frame.h
rename to src/mesh/model/dot11s/model/peer-link-frame.h
diff --git a/src/dot11s/model/peer-link.cc b/src/mesh/model/dot11s/model/peer-link.cc
similarity index 100%
rename from src/dot11s/model/peer-link.cc
rename to src/mesh/model/dot11s/model/peer-link.cc
diff --git a/src/dot11s/model/peer-link.h b/src/mesh/model/dot11s/model/peer-link.h
similarity index 100%
rename from src/dot11s/model/peer-link.h
rename to src/mesh/model/dot11s/model/peer-link.h
diff --git a/src/dot11s/model/peer-management-protocol-mac.cc b/src/mesh/model/dot11s/model/peer-management-protocol-mac.cc
similarity index 100%
rename from src/dot11s/model/peer-management-protocol-mac.cc
rename to src/mesh/model/dot11s/model/peer-management-protocol-mac.cc
diff --git a/src/dot11s/model/peer-management-protocol-mac.h b/src/mesh/model/dot11s/model/peer-management-protocol-mac.h
similarity index 100%
rename from src/dot11s/model/peer-management-protocol-mac.h
rename to src/mesh/model/dot11s/model/peer-management-protocol-mac.h
diff --git a/src/dot11s/model/peer-management-protocol.cc b/src/mesh/model/dot11s/model/peer-management-protocol.cc
similarity index 100%
rename from src/dot11s/model/peer-management-protocol.cc
rename to src/mesh/model/dot11s/model/peer-management-protocol.cc
diff --git a/src/dot11s/model/peer-management-protocol.h b/src/mesh/model/dot11s/model/peer-management-protocol.h
similarity index 100%
rename from src/dot11s/model/peer-management-protocol.h
rename to src/mesh/model/dot11s/model/peer-management-protocol.h
diff --git a/src/dot11s/test/dot11s-test-suite.cc b/src/mesh/model/dot11s/test/dot11s-test-suite.cc
similarity index 100%
rename from src/dot11s/test/dot11s-test-suite.cc
rename to src/mesh/model/dot11s/test/dot11s-test-suite.cc
diff --git a/src/dot11s/test/hwmp-proactive-regression-test-0-1.pcap b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
diff --git a/src/dot11s/test/hwmp-proactive-regression-test-1-1.pcap b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
diff --git a/src/dot11s/test/hwmp-proactive-regression-test-2-1.pcap b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
diff --git a/src/dot11s/test/hwmp-proactive-regression-test-3-1.pcap b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
diff --git a/src/dot11s/test/hwmp-proactive-regression-test-4-1.pcap b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
diff --git a/src/dot11s/test/hwmp-proactive-regression.cc b/src/mesh/model/dot11s/test/hwmp-proactive-regression.cc
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression.cc
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression.cc
diff --git a/src/dot11s/test/hwmp-proactive-regression.h b/src/mesh/model/dot11s/test/hwmp-proactive-regression.h
similarity index 100%
rename from src/dot11s/test/hwmp-proactive-regression.h
rename to src/mesh/model/dot11s/test/hwmp-proactive-regression.h
diff --git a/src/dot11s/test/hwmp-reactive-regression-test-0-1.pcap b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
diff --git a/src/dot11s/test/hwmp-reactive-regression-test-1-1.pcap b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
diff --git a/src/dot11s/test/hwmp-reactive-regression-test-2-1.pcap b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
diff --git a/src/dot11s/test/hwmp-reactive-regression-test-3-1.pcap b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
diff --git a/src/dot11s/test/hwmp-reactive-regression-test-4-1.pcap b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
diff --git a/src/dot11s/test/hwmp-reactive-regression-test-5-1.pcap b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
diff --git a/src/dot11s/test/hwmp-reactive-regression.cc b/src/mesh/model/dot11s/test/hwmp-reactive-regression.cc
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression.cc
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression.cc
diff --git a/src/dot11s/test/hwmp-reactive-regression.h b/src/mesh/model/dot11s/test/hwmp-reactive-regression.h
similarity index 100%
rename from src/dot11s/test/hwmp-reactive-regression.h
rename to src/mesh/model/dot11s/test/hwmp-reactive-regression.h
diff --git a/src/dot11s/test/hwmp-simplest-regression-test-0-1.pcap b/src/mesh/model/dot11s/test/hwmp-simplest-regression-test-0-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-simplest-regression-test-0-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-simplest-regression-test-0-1.pcap
diff --git a/src/dot11s/test/hwmp-simplest-regression-test-1-1.pcap b/src/mesh/model/dot11s/test/hwmp-simplest-regression-test-1-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-simplest-regression-test-1-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-simplest-regression-test-1-1.pcap
diff --git a/src/dot11s/test/hwmp-simplest-regression.cc b/src/mesh/model/dot11s/test/hwmp-simplest-regression.cc
similarity index 100%
rename from src/dot11s/test/hwmp-simplest-regression.cc
rename to src/mesh/model/dot11s/test/hwmp-simplest-regression.cc
diff --git a/src/dot11s/test/hwmp-simplest-regression.h b/src/mesh/model/dot11s/test/hwmp-simplest-regression.h
similarity index 100%
rename from src/dot11s/test/hwmp-simplest-regression.h
rename to src/mesh/model/dot11s/test/hwmp-simplest-regression.h
diff --git a/src/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
diff --git a/src/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
diff --git a/src/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
diff --git a/src/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
similarity index 100%
rename from src/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
rename to src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
diff --git a/src/dot11s/test/hwmp-target-flags-regression.cc b/src/mesh/model/dot11s/test/hwmp-target-flags-regression.cc
similarity index 100%
rename from src/dot11s/test/hwmp-target-flags-regression.cc
rename to src/mesh/model/dot11s/test/hwmp-target-flags-regression.cc
diff --git a/src/dot11s/test/hwmp-target-flags-regression.h b/src/mesh/model/dot11s/test/hwmp-target-flags-regression.h
similarity index 100%
rename from src/dot11s/test/hwmp-target-flags-regression.h
rename to src/mesh/model/dot11s/test/hwmp-target-flags-regression.h
diff --git a/src/dot11s/test/pmp-regression-test-0-1.pcap b/src/mesh/model/dot11s/test/pmp-regression-test-0-1.pcap
similarity index 100%
rename from src/dot11s/test/pmp-regression-test-0-1.pcap
rename to src/mesh/model/dot11s/test/pmp-regression-test-0-1.pcap
diff --git a/src/dot11s/test/pmp-regression-test-1-1.pcap b/src/mesh/model/dot11s/test/pmp-regression-test-1-1.pcap
similarity index 100%
rename from src/dot11s/test/pmp-regression-test-1-1.pcap
rename to src/mesh/model/dot11s/test/pmp-regression-test-1-1.pcap
diff --git a/src/dot11s/test/pmp-regression.cc b/src/mesh/model/dot11s/test/pmp-regression.cc
similarity index 100%
rename from src/dot11s/test/pmp-regression.cc
rename to src/mesh/model/dot11s/test/pmp-regression.cc
diff --git a/src/dot11s/test/pmp-regression.h b/src/mesh/model/dot11s/test/pmp-regression.h
similarity index 100%
rename from src/dot11s/test/pmp-regression.h
rename to src/mesh/model/dot11s/test/pmp-regression.h
diff --git a/src/dot11s/test/regression.cc b/src/mesh/model/dot11s/test/regression.cc
similarity index 100%
rename from src/dot11s/test/regression.cc
rename to src/mesh/model/dot11s/test/regression.cc
diff --git a/src/dot11s/waf b/src/mesh/model/dot11s/waf
similarity index 100%
rename from src/dot11s/waf
rename to src/mesh/model/dot11s/waf
diff --git a/src/dot11s/wscript b/src/mesh/model/dot11s/wscript
similarity index 100%
rename from src/dot11s/wscript
rename to src/mesh/model/dot11s/wscript
diff --git a/src/flame/helper/flame-installer.cc b/src/mesh/model/flame/helper/flame-installer.cc
similarity index 100%
rename from src/flame/helper/flame-installer.cc
rename to src/mesh/model/flame/helper/flame-installer.cc
diff --git a/src/flame/helper/flame-installer.h b/src/mesh/model/flame/helper/flame-installer.h
similarity index 100%
rename from src/flame/helper/flame-installer.h
rename to src/mesh/model/flame/helper/flame-installer.h
diff --git a/src/flame/model/flame-header.cc b/src/mesh/model/flame/model/flame-header.cc
similarity index 100%
rename from src/flame/model/flame-header.cc
rename to src/mesh/model/flame/model/flame-header.cc
diff --git a/src/flame/model/flame-header.h b/src/mesh/model/flame/model/flame-header.h
similarity index 100%
rename from src/flame/model/flame-header.h
rename to src/mesh/model/flame/model/flame-header.h
diff --git a/src/flame/model/flame-protocol-mac.cc b/src/mesh/model/flame/model/flame-protocol-mac.cc
similarity index 100%
rename from src/flame/model/flame-protocol-mac.cc
rename to src/mesh/model/flame/model/flame-protocol-mac.cc
diff --git a/src/flame/model/flame-protocol-mac.h b/src/mesh/model/flame/model/flame-protocol-mac.h
similarity index 100%
rename from src/flame/model/flame-protocol-mac.h
rename to src/mesh/model/flame/model/flame-protocol-mac.h
diff --git a/src/flame/model/flame-protocol.cc b/src/mesh/model/flame/model/flame-protocol.cc
similarity index 100%
rename from src/flame/model/flame-protocol.cc
rename to src/mesh/model/flame/model/flame-protocol.cc
diff --git a/src/flame/model/flame-protocol.h b/src/mesh/model/flame/model/flame-protocol.h
similarity index 100%
rename from src/flame/model/flame-protocol.h
rename to src/mesh/model/flame/model/flame-protocol.h
diff --git a/src/flame/model/flame-rtable.cc b/src/mesh/model/flame/model/flame-rtable.cc
similarity index 100%
rename from src/flame/model/flame-rtable.cc
rename to src/mesh/model/flame/model/flame-rtable.cc
diff --git a/src/flame/model/flame-rtable.h b/src/mesh/model/flame/model/flame-rtable.h
similarity index 100%
rename from src/flame/model/flame-rtable.h
rename to src/mesh/model/flame/model/flame-rtable.h
diff --git a/src/flame/test/flame-regression-test-0-1.pcap b/src/mesh/model/flame/test/flame-regression-test-0-1.pcap
similarity index 100%
rename from src/flame/test/flame-regression-test-0-1.pcap
rename to src/mesh/model/flame/test/flame-regression-test-0-1.pcap
diff --git a/src/flame/test/flame-regression-test-1-1.pcap b/src/mesh/model/flame/test/flame-regression-test-1-1.pcap
similarity index 100%
rename from src/flame/test/flame-regression-test-1-1.pcap
rename to src/mesh/model/flame/test/flame-regression-test-1-1.pcap
diff --git a/src/flame/test/flame-regression-test-2-1.pcap b/src/mesh/model/flame/test/flame-regression-test-2-1.pcap
similarity index 100%
rename from src/flame/test/flame-regression-test-2-1.pcap
rename to src/mesh/model/flame/test/flame-regression-test-2-1.pcap
diff --git a/src/flame/test/flame-regression.cc b/src/mesh/model/flame/test/flame-regression.cc
similarity index 100%
rename from src/flame/test/flame-regression.cc
rename to src/mesh/model/flame/test/flame-regression.cc
diff --git a/src/flame/test/flame-regression.h b/src/mesh/model/flame/test/flame-regression.h
similarity index 100%
rename from src/flame/test/flame-regression.h
rename to src/mesh/model/flame/test/flame-regression.h
diff --git a/src/flame/test/flame-test-suite.cc b/src/mesh/model/flame/test/flame-test-suite.cc
similarity index 100%
rename from src/flame/test/flame-test-suite.cc
rename to src/mesh/model/flame/test/flame-test-suite.cc
diff --git a/src/flame/test/regression.cc b/src/mesh/model/flame/test/regression.cc
similarity index 100%
rename from src/flame/test/regression.cc
rename to src/mesh/model/flame/test/regression.cc
diff --git a/src/flame/wscript b/src/mesh/model/flame/wscript
similarity index 100%
rename from src/flame/wscript
rename to src/mesh/model/flame/wscript
diff --git a/src/wscript b/src/wscript
index 91edc3d8c..592c46e10 100644
--- a/src/wscript
+++ b/src/wscript
@@ -42,8 +42,8 @@ all_modules = (
     'uan',
     'spectrum',
     'mesh',   
-    'dot11s',
-    'flame',
+    'mesh/model/dot11s',
+    'mesh/model/flame',
     'test',
     'test/perf',
     'test/ns3tcp',