diff --git a/doc/models/Makefile b/doc/models/Makefile
index a0b8d17a2..e609d8a57 100644
--- a/doc/models/Makefile
+++ b/doc/models/Makefile
@@ -357,14 +357,14 @@ SOURCEFIGS = \
 	$(SRC)/traffic-control/doc/multi-queue-aware-queue-disc.dia \
 	$(SRC)/traffic-control/doc/figures/collision_prob.jpeg \
 	$(SRC)/traffic-control/doc/figures/overlapped.jpeg \
-	$(SRC)/lr-wpan/doc/lr-wpan-arch.dia \
-	$(SRC)/lr-wpan/doc/lr-wpan-assocSequence.dia \
-	$(SRC)/lr-wpan/doc/lr-wpan-data-example.dia \
-	$(SRC)/lr-wpan/doc/lr-wpan-phy.dia \
-	$(SRC)/lr-wpan/doc/lr-wpan-primitives.dia \
-	$(SRC)/lr-wpan/doc/802-15-4-ber.eps \
-	$(SRC)/lr-wpan/doc/802-15-4-per-sens.eps \
-	$(SRC)/lr-wpan/doc/802-15-4-psr-distance.eps \
+	$(SRC)/lr-wpan/doc/figures/lr-wpan-arch.dia \
+	$(SRC)/lr-wpan/doc/figures/lr-wpan-assocSequence.dia \
+	$(SRC)/lr-wpan/doc/figures/lr-wpan-data-example.dia \
+	$(SRC)/lr-wpan/doc/figures/lr-wpan-phy.dia \
+	$(SRC)/lr-wpan/doc/figures/lr-wpan-primitives.dia \
+	$(SRC)/lr-wpan/doc/figures/802-15-4-ber.eps \
+	$(SRC)/lr-wpan/doc/figures/802-15-4-per-sens.eps \
+	$(SRC)/lr-wpan/doc/figures/802-15-4-psr-distance.eps \
 	$(SRC)/flow-monitor/doc/figures/flowmonitorArq.dia \
 	$(SRC)/energy/doc/figures/dischargeCurve.png \
 	$(SRC)/energy/doc/figures/energyFramework.dia \
diff --git a/src/lr-wpan/doc/802-15-4-ber.eps b/src/lr-wpan/doc/figures/802-15-4-ber.eps
similarity index 100%
rename from src/lr-wpan/doc/802-15-4-ber.eps
rename to src/lr-wpan/doc/figures/802-15-4-ber.eps
diff --git a/src/lr-wpan/doc/802-15-4-per-sens.eps b/src/lr-wpan/doc/figures/802-15-4-per-sens.eps
similarity index 100%
rename from src/lr-wpan/doc/802-15-4-per-sens.eps
rename to src/lr-wpan/doc/figures/802-15-4-per-sens.eps
diff --git a/src/lr-wpan/doc/802-15-4-psr-distance.eps b/src/lr-wpan/doc/figures/802-15-4-psr-distance.eps
similarity index 100%
rename from src/lr-wpan/doc/802-15-4-psr-distance.eps
rename to src/lr-wpan/doc/figures/802-15-4-psr-distance.eps
diff --git a/src/lr-wpan/doc/lr-wpan-arch.dia b/src/lr-wpan/doc/figures/lr-wpan-arch.dia
similarity index 100%
rename from src/lr-wpan/doc/lr-wpan-arch.dia
rename to src/lr-wpan/doc/figures/lr-wpan-arch.dia
diff --git a/src/lr-wpan/doc/lr-wpan-assocSequence.dia b/src/lr-wpan/doc/figures/lr-wpan-assocSequence.dia
similarity index 100%
rename from src/lr-wpan/doc/lr-wpan-assocSequence.dia
rename to src/lr-wpan/doc/figures/lr-wpan-assocSequence.dia
diff --git a/src/lr-wpan/doc/lr-wpan-data-example.dia b/src/lr-wpan/doc/figures/lr-wpan-data-example.dia
similarity index 100%
rename from src/lr-wpan/doc/lr-wpan-data-example.dia
rename to src/lr-wpan/doc/figures/lr-wpan-data-example.dia
diff --git a/src/lr-wpan/doc/lr-wpan-phy.dia b/src/lr-wpan/doc/figures/lr-wpan-phy.dia
similarity index 100%
rename from src/lr-wpan/doc/lr-wpan-phy.dia
rename to src/lr-wpan/doc/figures/lr-wpan-phy.dia
diff --git a/src/lr-wpan/doc/lr-wpan-primitives.dia b/src/lr-wpan/doc/figures/lr-wpan-primitives.dia
similarity index 100%
rename from src/lr-wpan/doc/lr-wpan-primitives.dia
rename to src/lr-wpan/doc/figures/lr-wpan-primitives.dia