diff --git a/examples/wscript b/examples/wscript
index 4d5c04bd1..5bdca27db 100644
--- a/examples/wscript
+++ b/examples/wscript
@@ -183,14 +183,6 @@ def build(bld):
       ['csma', 'internet-stack'])
     obj.source = 'radvd-two-prefix.cc'
 
-    obj = bld.create_ns3_program('test-dumbbell',
-      ['point-to-point', 'internet-stack'])
-    obj.source = 'test-dumbbell.cc'
-
-    obj = bld.create_ns3_program('test-grid',
-      ['point-to-point', 'internet-stack'])
-    obj.source = 'test-grid.cc'
-
     env = bld.env_of_name('default')
     if env['ENABLE_EMU']:
         obj = bld.create_ns3_program('emu-udp-echo', ['emu', 'internet-stack'])
diff --git a/src/helper/animation-interface.cc b/src/contrib/net-anim/animation-interface.cc
similarity index 100%
rename from src/helper/animation-interface.cc
rename to src/contrib/net-anim/animation-interface.cc
diff --git a/src/helper/animation-interface.h b/src/contrib/net-anim/animation-interface.h
similarity index 100%
rename from src/helper/animation-interface.h
rename to src/contrib/net-anim/animation-interface.h
diff --git a/src/helper/node-location.cc b/src/contrib/net-anim/node-location.cc
similarity index 100%
rename from src/helper/node-location.cc
rename to src/contrib/net-anim/node-location.cc
diff --git a/src/helper/node-location.h b/src/contrib/net-anim/node-location.h
similarity index 100%
rename from src/helper/node-location.h
rename to src/contrib/net-anim/node-location.h
diff --git a/src/helper/point-to-point-dumbbell-helper.cc b/src/contrib/net-anim/point-to-point-dumbbell-helper.cc
similarity index 98%
rename from src/helper/point-to-point-dumbbell-helper.cc
rename to src/contrib/net-anim/point-to-point-dumbbell-helper.cc
index 10d649ed2..43fddf35f 100644
--- a/src/helper/point-to-point-dumbbell-helper.cc
+++ b/src/contrib/net-anim/point-to-point-dumbbell-helper.cc
@@ -26,9 +26,9 @@
 #include <netinet/in.h>
 
 // ns3 includes
-#include "animation-interface.h"
-#include "point-to-point-dumbbell-helper.h"
-#include "node-location.h"
+#include "ns3/animation-interface.h"
+#include "ns3/point-to-point-dumbbell-helper.h"
+#include "ns3/node-location.h"
 
 #include "ns3/node-list.h"
 #include "ns3/point-to-point-net-device.h"
diff --git a/src/helper/point-to-point-dumbbell-helper.h b/src/contrib/net-anim/point-to-point-dumbbell-helper.h
similarity index 100%
rename from src/helper/point-to-point-dumbbell-helper.h
rename to src/contrib/net-anim/point-to-point-dumbbell-helper.h
diff --git a/src/helper/point-to-point-grid-helper.cc b/src/contrib/net-anim/point-to-point-grid-helper.cc
similarity index 97%
rename from src/helper/point-to-point-grid-helper.cc
rename to src/contrib/net-anim/point-to-point-grid-helper.cc
index d2d6933d8..511f83687 100644
--- a/src/helper/point-to-point-grid-helper.cc
+++ b/src/contrib/net-anim/point-to-point-grid-helper.cc
@@ -16,11 +16,11 @@
  * Author: Josh Pelkey <jpelkey@gatech.edu>
  */
 
-#include "point-to-point-grid-helper.h"
-#include "animation-interface.h"
-#include "internet-stack-helper.h"
-#include "point-to-point-helper.h"
-#include "node-location.h"
+#include "ns3/point-to-point-grid-helper.h"
+#include "ns3/animation-interface.h"
+#include "ns3/internet-stack-helper.h"
+#include "ns3/point-to-point-helper.h"
+#include "ns3/node-location.h"
 #include "ns3/string.h"
 #include "ns3/vector.h"
 #include "ns3/log.h"
diff --git a/src/helper/point-to-point-grid-helper.h b/src/contrib/net-anim/point-to-point-grid-helper.h
similarity index 100%
rename from src/helper/point-to-point-grid-helper.h
rename to src/contrib/net-anim/point-to-point-grid-helper.h
diff --git a/examples/test-dumbbell.cc b/src/contrib/net-anim/test-dumbbell.cc
similarity index 99%
rename from examples/test-dumbbell.cc
rename to src/contrib/net-anim/test-dumbbell.cc
index 3075dab01..8267e6a49 100644
--- a/examples/test-dumbbell.cc
+++ b/src/contrib/net-anim/test-dumbbell.cc
@@ -22,6 +22,7 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/net-anim-module.h"
 
 using namespace ns3;
 
diff --git a/examples/test-grid.cc b/src/contrib/net-anim/test-grid.cc
similarity index 99%
rename from examples/test-grid.cc
rename to src/contrib/net-anim/test-grid.cc
index 7b17910a2..a97747e8a 100644
--- a/examples/test-grid.cc
+++ b/src/contrib/net-anim/test-grid.cc
@@ -22,6 +22,7 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/net-anim-module.h"
 
 using namespace ns3;
 
diff --git a/src/contrib/net-anim/wscript b/src/contrib/net-anim/wscript
new file mode 100644
index 000000000..0e0c8dd30
--- /dev/null
+++ b/src/contrib/net-anim/wscript
@@ -0,0 +1,25 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    obj = bld.create_ns3_module('net-anim')
+    obj.source = [
+        'point-to-point-dumbbell-helper.cc',
+        'point-to-point-grid-helper.cc',
+        'animation-interface.cc',
+        'node-location.cc'
+       ]
+
+    headers = bld.new_task_gen('ns3header')
+    headers.module = 'net-anim'
+    headers.source = [
+        'point-to-point-dumbbell-helper.h',
+        'point-to-point-grid-helper.h',
+        'animation-interface.h',
+        'node-location.h'
+       ]
+
+    obj = bld.create_ns3_program('test-dumbbell', ['net-anim', 'point-to-point', 'internet-stack'])
+    obj.source = 'test-dumbbell.cc'
+
+    obj = bld.create_ns3_program('test-grid', ['net-anim', 'point-to-point', 'internet-stack'])
+    obj.source = 'test-grid.cc'
diff --git a/src/helper/wscript b/src/helper/wscript
index edf95f21f..1d6ddd850 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -39,10 +39,6 @@ def build(bld):
         'ipv6-list-routing-helper.cc',
         'ipv6-routing-helper.cc',
         'ping6-helper.cc',
-        'animation-interface.cc',
-        'node-location.cc',
-        'point-to-point-dumbbell-helper.cc',
-        'point-to-point-grid-helper.cc',
         'flow-monitor-helper.cc',
         ]
 
@@ -87,10 +83,6 @@ def build(bld):
         'ipv6-routing-helper.h',
         'ping6-helper.h',
         'flow-monitor-helper.h',
-        'animation-interface.h',
-        'node-location.h',
-        'point-to-point-dumbbell-helper.h',
-        'point-to-point-grid-helper.h',
         ]
 
     env = bld.env_of_name('default')
diff --git a/src/wscript b/src/wscript
index a76ff20ce..35a164e6a 100644
--- a/src/wscript
+++ b/src/wscript
@@ -45,6 +45,7 @@ all_modules = (
     'test/ns3tcp',
     'test/ns3wifi',
     'contrib/flow-monitor',
+    'contrib/net-anim',
     )
 
 def set_options(opt):