diff --git a/plugins/ip-faces/ndn-ip-face-stack.cpp b/model/ip-faces/ndn-ip-face-stack.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-face-stack.cpp
rename to model/ip-faces/ndn-ip-face-stack.cpp
diff --git a/plugins/ip-faces/ndn-ip-face-stack.hpp b/model/ip-faces/ndn-ip-face-stack.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-face-stack.hpp
rename to model/ip-faces/ndn-ip-face-stack.hpp
diff --git a/plugins/ip-faces/ndn-ip-faces-helper.cpp b/model/ip-faces/ndn-ip-faces-helper.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-faces-helper.cpp
rename to model/ip-faces/ndn-ip-faces-helper.cpp
diff --git a/plugins/ip-faces/ndn-ip-faces-helper.hpp b/model/ip-faces/ndn-ip-faces-helper.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-faces-helper.hpp
rename to model/ip-faces/ndn-ip-faces-helper.hpp
diff --git a/plugins/ip-faces/ndn-tcp-face.cpp b/model/ip-faces/ndn-tcp-face.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-tcp-face.cpp
rename to model/ip-faces/ndn-tcp-face.cpp
diff --git a/plugins/ip-faces/ndn-tcp-face.hpp b/model/ip-faces/ndn-tcp-face.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-tcp-face.hpp
rename to model/ip-faces/ndn-tcp-face.hpp
diff --git a/plugins/ip-faces/ndn-udp-face.cpp b/model/ip-faces/ndn-udp-face.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-udp-face.cpp
rename to model/ip-faces/ndn-udp-face.cpp
diff --git a/plugins/ip-faces/ndn-udp-face.hpp b/model/ip-faces/ndn-udp-face.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-udp-face.hpp
rename to model/ip-faces/ndn-udp-face.hpp
diff --git a/plugins/topology/annotated-topology-reader.cpp b/utils/topology/annotated-topology-reader.cpp
similarity index 100%
rename from plugins/topology/annotated-topology-reader.cpp
rename to utils/topology/annotated-topology-reader.cpp
diff --git a/plugins/topology/annotated-topology-reader.hpp b/utils/topology/annotated-topology-reader.hpp
similarity index 100%
rename from plugins/topology/annotated-topology-reader.hpp
rename to utils/topology/annotated-topology-reader.hpp
diff --git a/plugins/topology/rocketfuel-map-reader.cpp b/utils/topology/rocketfuel-map-reader.cpp
similarity index 100%
rename from plugins/topology/rocketfuel-map-reader.cpp
rename to utils/topology/rocketfuel-map-reader.cpp
diff --git a/plugins/topology/rocketfuel-map-reader.hpp b/utils/topology/rocketfuel-map-reader.hpp
similarity index 100%
rename from plugins/topology/rocketfuel-map-reader.hpp
rename to utils/topology/rocketfuel-map-reader.hpp
diff --git a/plugins/topology/rocketfuel-weights-reader.cpp b/utils/topology/rocketfuel-weights-reader.cpp
similarity index 100%
rename from plugins/topology/rocketfuel-weights-reader.cpp
rename to utils/topology/rocketfuel-weights-reader.cpp
diff --git a/plugins/topology/rocketfuel-weights-reader.hpp b/utils/topology/rocketfuel-weights-reader.hpp
similarity index 100%
rename from plugins/topology/rocketfuel-weights-reader.hpp
rename to utils/topology/rocketfuel-weights-reader.hpp