diff --git a/awx/network_ui/static/network_ui/src/button.directive.js b/awx/network_ui/static/network_ui/src/button.directive.js
deleted file mode 100644
index 690c777dfd..0000000000
--- a/awx/network_ui/static/network_ui/src/button.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function button () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/button.html' };
-}
-exports.button = button;
diff --git a/awx/network_ui/static/network_ui/src/configuration.directive.js b/awx/network_ui/static/network_ui/src/configuration.directive.js
deleted file mode 100644
index c936889a5d..0000000000
--- a/awx/network_ui/static/network_ui/src/configuration.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function configuration () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/configuration.html' };
-}
-exports.configuration = configuration;
diff --git a/awx/network_ui/static/network_ui/src/cursor.directive.js b/awx/network_ui/static/network_ui/src/cursor.directive.js
deleted file mode 100644
index 70455003ed..0000000000
--- a/awx/network_ui/static/network_ui/src/cursor.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function cursor () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/cursor.html' };
-}
-exports.cursor = cursor;
diff --git a/awx/network_ui/static/network_ui/src/debug.directive.js b/awx/network_ui/static/network_ui/src/debug.directive.js
deleted file mode 100644
index 1fa8a1d83a..0000000000
--- a/awx/network_ui/static/network_ui/src/debug.directive.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function debug () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/debug.html' };
-}
-
-exports.debug = debug;
diff --git a/awx/network_ui/static/network_ui/src/default.directive.js b/awx/network_ui/static/network_ui/src/default.directive.js
deleted file mode 100644
index 9062472f6c..0000000000
--- a/awx/network_ui/static/network_ui/src/default.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function defaultd () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/default.html' };
-}
-exports.defaultd = defaultd;
diff --git a/awx/network_ui/static/network_ui/src/device.detail.directive.js b/awx/network_ui/static/network_ui/src/device.detail.directive.js
deleted file mode 100644
index 121f783bd1..0000000000
--- a/awx/network_ui/static/network_ui/src/device.detail.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function deviceDetail () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/device_detail.html' };
-}
-exports.deviceDetail = deviceDetail;
diff --git a/awx/network_ui/static/network_ui/src/group.directive.js b/awx/network_ui/static/network_ui/src/group.directive.js
deleted file mode 100644
index 1c19abb34c..0000000000
--- a/awx/network_ui/static/network_ui/src/group.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function group () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/group.html' };
-}
-exports.group = group;
diff --git a/awx/network_ui/static/network_ui/src/host.directive.js b/awx/network_ui/static/network_ui/src/host.directive.js
deleted file mode 100644
index 8c788f7522..0000000000
--- a/awx/network_ui/static/network_ui/src/host.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function host () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/host.html' };
-}
-exports.host = host;
diff --git a/awx/network_ui/static/network_ui/src/layer.directive.js b/awx/network_ui/static/network_ui/src/layer.directive.js
deleted file mode 100644
index 2cc8921d2b..0000000000
--- a/awx/network_ui/static/network_ui/src/layer.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function layer () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/layer.html' };
-}
-exports.layer = layer;
diff --git a/awx/network_ui/static/network_ui/src/link.directive.js b/awx/network_ui/static/network_ui/src/link.directive.js
deleted file mode 100644
index 6831d94239..0000000000
--- a/awx/network_ui/static/network_ui/src/link.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function link () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/link.html' };
-}
-exports.link = link;
diff --git a/awx/network_ui/static/network_ui/src/map.directive.js b/awx/network_ui/static/network_ui/src/map.directive.js
deleted file mode 100644
index e8d1634304..0000000000
--- a/awx/network_ui/static/network_ui/src/map.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function map () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/map.html' };
-}
-exports.map = map;
diff --git a/awx/network_ui/static/network_ui/src/network.ui.directive.js b/awx/network_ui/static/network_ui/src/network.ui.directive.js
deleted file mode 100644
index 6a5760815f..0000000000
--- a/awx/network_ui/static/network_ui/src/network.ui.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function awxNetworkUI () {
-  return { restrict: 'E', templateUrl: '/static/network_ui/widgets/network_ui.html' };
-}
-exports.awxNetworkUI = awxNetworkUI;
diff --git a/awx/network_ui/static/network_ui/src/process.directive.js b/awx/network_ui/static/network_ui/src/process.directive.js
deleted file mode 100644
index 8ffad19e84..0000000000
--- a/awx/network_ui/static/network_ui/src/process.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function process () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/process.html' };
-}
-exports.process = process;
diff --git a/awx/network_ui/static/network_ui/src/quadrants.directive.js b/awx/network_ui/static/network_ui/src/quadrants.directive.js
deleted file mode 100644
index dd498aff01..0000000000
--- a/awx/network_ui/static/network_ui/src/quadrants.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function quadrants () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/quadrants.html' };
-}
-exports.quadrants = quadrants;
diff --git a/awx/network_ui/static/network_ui/src/rack.directive.js b/awx/network_ui/static/network_ui/src/rack.directive.js
deleted file mode 100644
index 3d04bf99ff..0000000000
--- a/awx/network_ui/static/network_ui/src/rack.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function rack () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/rack.html' };
-}
-exports.rack = rack;
diff --git a/awx/network_ui/static/network_ui/src/rack.icon.directive.js b/awx/network_ui/static/network_ui/src/rack.icon.directive.js
deleted file mode 100644
index f041ac1cf9..0000000000
--- a/awx/network_ui/static/network_ui/src/rack.icon.directive.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-function rackIcon () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/rack_icon.html' };
-}
-exports.rackIcon = rackIcon;
diff --git a/awx/network_ui/static/network_ui/src/router.directive.js b/awx/network_ui/static/network_ui/src/router.directive.js
deleted file mode 100644
index 2cf69f6cfa..0000000000
--- a/awx/network_ui/static/network_ui/src/router.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function router () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/router.html' };
-}
-exports.router = router;
diff --git a/awx/network_ui/static/network_ui/src/site.directive.js b/awx/network_ui/static/network_ui/src/site.directive.js
deleted file mode 100644
index 11dbcbf10f..0000000000
--- a/awx/network_ui/static/network_ui/src/site.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function site () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/site.html' };
-}
-exports.site = site;
diff --git a/awx/network_ui/static/network_ui/src/site.icon.directive.js b/awx/network_ui/static/network_ui/src/site.icon.directive.js
deleted file mode 100644
index f054e49e6b..0000000000
--- a/awx/network_ui/static/network_ui/src/site.icon.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function siteIcon () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/site_icon.html' };
-}
-exports.siteIcon = siteIcon;
diff --git a/awx/network_ui/static/network_ui/src/status.light.directive.js b/awx/network_ui/static/network_ui/src/status.light.directive.js
deleted file mode 100644
index f69051f44f..0000000000
--- a/awx/network_ui/static/network_ui/src/status.light.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function statusLight () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/status_light.html' };
-}
-exports.statusLight = statusLight;
diff --git a/awx/network_ui/static/network_ui/src/stencil.directive.js b/awx/network_ui/static/network_ui/src/stencil.directive.js
deleted file mode 100644
index e0d691734f..0000000000
--- a/awx/network_ui/static/network_ui/src/stencil.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function stencil () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/stencil.html' };
-}
-exports.stencil = stencil;
diff --git a/awx/network_ui/static/network_ui/src/stream.directive.js b/awx/network_ui/static/network_ui/src/stream.directive.js
deleted file mode 100644
index db1cb26127..0000000000
--- a/awx/network_ui/static/network_ui/src/stream.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function stream () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/stream.html' };
-}
-exports.stream = stream;
diff --git a/awx/network_ui/static/network_ui/src/switch.directive.js b/awx/network_ui/static/network_ui/src/switch.directive.js
deleted file mode 100644
index 924e0dda7b..0000000000
--- a/awx/network_ui/static/network_ui/src/switch.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function switchd () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/switch.html' };
-}
-exports.switchd = switchd;
diff --git a/awx/network_ui/static/network_ui/src/tables.ui.directive.js b/awx/network_ui/static/network_ui/src/tables.ui.directive.js
deleted file mode 100644
index f560823096..0000000000
--- a/awx/network_ui/static/network_ui/src/tables.ui.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function awxTablesUI () {
-  return { restrict: 'E', templateUrl: '/static/network_ui/widgets/tables_ui.html' };
-}
-exports.awxTablesUI = awxTablesUI;
diff --git a/awx/network_ui/static/network_ui/src/task.status.directive.js b/awx/network_ui/static/network_ui/src/task.status.directive.js
deleted file mode 100644
index 36a78d3949..0000000000
--- a/awx/network_ui/static/network_ui/src/task.status.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function taskStatus () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/task_status.html' };
-}
-exports.taskStatus = taskStatus;
diff --git a/awx/network_ui/static/network_ui/src/touch.directive.js b/awx/network_ui/static/network_ui/src/touch.directive.js
deleted file mode 100644
index 4d75146b0f..0000000000
--- a/awx/network_ui/static/network_ui/src/touch.directive.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (c) 2017 Red Hat, Inc. */
-
-function touch () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/touch.html' };
-}
-exports.touch = touch;
diff --git a/awx/ui/build/webpack.base.js b/awx/ui/build/webpack.base.js
index e7e5d54676..2a9f7aa105 100644
--- a/awx/ui/build/webpack.base.js
+++ b/awx/ui/build/webpack.base.js
@@ -22,6 +22,7 @@ const SRC_PATH = path.join(CLIENT_PATH, 'src');
 const STATIC_PATH = path.join(UI_PATH, 'static');
 const TEST_PATH = path.join(UI_PATH, 'test');
 const THEME_PATH = path.join(LIB_PATH, 'theme');
+const NETWORK_UI_PATH = path.join(SRC_PATH, 'network-ui');
 
 const APP_ENTRY = path.join(SRC_PATH, 'app.js');
 const VENDOR_ENTRY = path.join(SRC_PATH, 'vendor.js');
@@ -97,6 +98,15 @@ const base = {
                     /src\//
                 ]
             },
+            {
+                test: /\.svg$/,
+                use: ['ngtemplate-loader', 'html-loader'],
+                include: [
+                    /lib\/components\//,
+                    /features\//,
+                    /src\//
+                ]
+            },
             {
                 test: /\.json$/,
                 loader: 'json-loader',
@@ -187,6 +197,7 @@ const base = {
             '~test': TEST_PATH,
             '~theme': THEME_PATH,
             '~ui': UI_PATH,
+            '~network-ui': NETWORK_UI_PATH,
             d3$: '~node_modules/d3/d3.min.js',
             'codemirror.jsonlint$': '~node_modules/codemirror/addon/lint/json-lint.js',
             jquery: '~node_modules/jquery/dist/jquery.js',
diff --git a/awx/ui/client/lib/theme/index.less b/awx/ui/client/lib/theme/index.less
index 04fbf92fc2..9a9f564840 100644
--- a/awx/ui/client/lib/theme/index.less
+++ b/awx/ui/client/lib/theme/index.less
@@ -175,4 +175,4 @@
  * Network Visualization Style
  *
  */
-@import '../../src/network_ui/style.less';
+@import '../../src/network-ui/style.less';
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index d2374041a9..1b0ce7bb3f 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -10,7 +10,6 @@ if ($basePath) {
 }
 
 import start from './app.start';
-// import networkUI from './../network_ui/static/network_ui/src/main.js';
 import portalMode from './portal-mode/main';
 import systemTracking from './system-tracking/main';
 import inventoriesHosts from './inventories-hosts/main';
@@ -47,7 +46,7 @@ import atLibComponents from '~components';
 import atLibModels from '~models';
 import atLibServices from '~services';
 
-import network_ui from './network_ui/main';
+import networkUI from '~network-ui/main';
 
 start.bootstrap(() => {
     angular.bootstrap(document.body, ['awApp']);
@@ -100,7 +99,7 @@ angular
         projects.name,
         scheduler.name,
         instanceGroups.name,
-        network_ui.tower.name,
+        networkUI.tower.name,
 
         'Utilities',
         'templates',
diff --git a/awx/ui/client/src/network-ui/button.directive.js b/awx/ui/client/src/network-ui/button.directive.js
new file mode 100644
index 0000000000..d8b35aa06d
--- /dev/null
+++ b/awx/ui/client/src/network-ui/button.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/button.partial.svg');
+
+function button () {
+  return { restrict: 'A', templateUrl};
+}
+exports.button = button;
diff --git a/awx/network_ui/static/network_ui/src/button.js b/awx/ui/client/src/network-ui/button.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/button.js
rename to awx/ui/client/src/network-ui/button.js
diff --git a/awx/network_ui/static/network_ui/widgets/button.html b/awx/ui/client/src/network-ui/button.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/button.html
rename to awx/ui/client/src/network-ui/button.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/buttons.js b/awx/ui/client/src/network-ui/buttons.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/buttons.js
rename to awx/ui/client/src/network-ui/buttons.js
diff --git a/awx/network_ui/static/network_ui/src/chevron.left.directive.js b/awx/ui/client/src/network-ui/chevron.left.directive.js
similarity index 67%
rename from awx/network_ui/static/network_ui/src/chevron.left.directive.js
rename to awx/ui/client/src/network-ui/chevron.left.directive.js
index fd349619ed..2dbb45950c 100644
--- a/awx/network_ui/static/network_ui/src/chevron.left.directive.js
+++ b/awx/ui/client/src/network-ui/chevron.left.directive.js
@@ -1,9 +1,11 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/chevron_left.partial.svg');
+
 function chevronLeft () {
   return {
       restrict: 'A',
-      templateUrl: '/static/network_ui/widgets/chevron_left.svg',
+      templateUrl,
       scope: {
           actionIcon: '='
       }
diff --git a/awx/network_ui/static/network_ui/src/chevron.right.directive.js b/awx/ui/client/src/network-ui/chevron.right.directive.js
similarity index 68%
rename from awx/network_ui/static/network_ui/src/chevron.right.directive.js
rename to awx/ui/client/src/network-ui/chevron.right.directive.js
index f24aa46923..995d511f2c 100644
--- a/awx/network_ui/static/network_ui/src/chevron.right.directive.js
+++ b/awx/ui/client/src/network-ui/chevron.right.directive.js
@@ -1,9 +1,11 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/chevron_right.partial.svg');
+
 function chevronRight () {
   return {
       restrict: 'A',
-      templateUrl: '/static/network_ui/widgets/chevron_right.svg',
+      templateUrl,
       scope: {
           actionIcon: '='
       }
diff --git a/awx/network_ui/static/network_ui/widgets/chevron_left.svg b/awx/ui/client/src/network-ui/chevron_left.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/chevron_left.svg
rename to awx/ui/client/src/network-ui/chevron_left.partial.svg
diff --git a/awx/network_ui/static/network_ui/widgets/chevron_right.svg b/awx/ui/client/src/network-ui/chevron_right.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/chevron_right.svg
rename to awx/ui/client/src/network-ui/chevron_right.partial.svg
diff --git a/awx/ui/client/src/network-ui/configuration.directive.js b/awx/ui/client/src/network-ui/configuration.directive.js
new file mode 100644
index 0000000000..7fb8b0725e
--- /dev/null
+++ b/awx/ui/client/src/network-ui/configuration.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/configuration.partial.svg');
+
+function configuration () {
+  return { restrict: 'A', templateUrl};
+}
+exports.configuration = configuration;
diff --git a/awx/network_ui/static/network_ui/widgets/configuration.html b/awx/ui/client/src/network-ui/configuration.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/configuration.html
rename to awx/ui/client/src/network-ui/configuration.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/context.menu.button.directive.js b/awx/ui/client/src/network-ui/context.menu.button.directive.js
similarity index 71%
rename from awx/network_ui/static/network_ui/src/context.menu.button.directive.js
rename to awx/ui/client/src/network-ui/context.menu.button.directive.js
index 29a7949b6d..8e984109cf 100644
--- a/awx/network_ui/static/network_ui/src/context.menu.button.directive.js
+++ b/awx/ui/client/src/network-ui/context.menu.button.directive.js
@@ -1,9 +1,11 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/context_menu_button.partial.svg');
+
 function contextMenuButton () {
   return {
       restrict: 'A',
-      templateUrl: '/static/network_ui/widgets/context_menu_button.svg',
+      templateUrl,
       scope: {
           contextMenuButton: '=',
           contextMenu: '='
diff --git a/awx/network_ui/static/network_ui/src/context.menu.directive.js b/awx/ui/client/src/network-ui/context.menu.directive.js
similarity index 68%
rename from awx/network_ui/static/network_ui/src/context.menu.directive.js
rename to awx/ui/client/src/network-ui/context.menu.directive.js
index 4f817372b1..bf92043d34 100644
--- a/awx/network_ui/static/network_ui/src/context.menu.directive.js
+++ b/awx/ui/client/src/network-ui/context.menu.directive.js
@@ -1,9 +1,11 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/context_menu.partial.svg');
+
 function contextMenu () {
   return {
       restrict: 'A',
-      templateUrl: '/static/network_ui/widgets/context_menu.svg',
+      templateUrl,
       scope: {
           contextMenu: '='
       }
diff --git a/awx/network_ui/static/network_ui/widgets/context_menu.svg b/awx/ui/client/src/network-ui/context_menu.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/context_menu.svg
rename to awx/ui/client/src/network-ui/context_menu.partial.svg
diff --git a/awx/network_ui/static/network_ui/widgets/context_menu_button.svg b/awx/ui/client/src/network-ui/context_menu_button.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/context_menu_button.svg
rename to awx/ui/client/src/network-ui/context_menu_button.partial.svg
diff --git a/awx/ui/client/src/network-ui/cursor.directive.js b/awx/ui/client/src/network-ui/cursor.directive.js
new file mode 100644
index 0000000000..340640efb0
--- /dev/null
+++ b/awx/ui/client/src/network-ui/cursor.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/cursor.partial.svg');
+
+function cursor () {
+  return { restrict: 'A', templateUrl};
+}
+exports.cursor = cursor;
diff --git a/awx/network_ui/static/network_ui/widgets/cursor.html b/awx/ui/client/src/network-ui/cursor.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/cursor.html
rename to awx/ui/client/src/network-ui/cursor.partial.svg
diff --git a/awx/ui/client/src/network-ui/debug.directive.js b/awx/ui/client/src/network-ui/debug.directive.js
new file mode 100644
index 0000000000..9b58302787
--- /dev/null
+++ b/awx/ui/client/src/network-ui/debug.directive.js
@@ -0,0 +1,9 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/debug.partial.svg');
+
+function debug () {
+  return { restrict: 'A', templateUrl};
+}
+
+exports.debug = debug;
diff --git a/awx/network_ui/static/network_ui/widgets/debug.html b/awx/ui/client/src/network-ui/debug.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/debug.html
rename to awx/ui/client/src/network-ui/debug.partial.svg
diff --git a/awx/ui/client/src/network-ui/default.directive.js b/awx/ui/client/src/network-ui/default.directive.js
new file mode 100644
index 0000000000..16c469f188
--- /dev/null
+++ b/awx/ui/client/src/network-ui/default.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/default.partial.svg');
+
+function defaultd () {
+  return { restrict: 'A', templateUrl};
+}
+exports.defaultd = defaultd;
diff --git a/awx/network_ui/static/network_ui/widgets/default.html b/awx/ui/client/src/network-ui/default.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/default.html
rename to awx/ui/client/src/network-ui/default.partial.svg
diff --git a/awx/ui/client/src/network-ui/device.detail.directive.js b/awx/ui/client/src/network-ui/device.detail.directive.js
new file mode 100644
index 0000000000..e76b6eef75
--- /dev/null
+++ b/awx/ui/client/src/network-ui/device.detail.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/device_detail.partial.svg');
+
+function deviceDetail () {
+  return { restrict: 'A', templateUrl};
+}
+exports.deviceDetail = deviceDetail;
diff --git a/awx/network_ui/static/network_ui/src/device.detail.fsm.js b/awx/ui/client/src/network-ui/device.detail.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/device.detail.fsm.js
rename to awx/ui/client/src/network-ui/device.detail.fsm.js
diff --git a/awx/network_ui/static/network_ui/widgets/device_detail.html b/awx/ui/client/src/network-ui/device_detail.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/device_detail.html
rename to awx/ui/client/src/network-ui/device_detail.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/fsm.js b/awx/ui/client/src/network-ui/fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/fsm.js
rename to awx/ui/client/src/network-ui/fsm.js
diff --git a/awx/ui/client/src/network-ui/group.directive.js b/awx/ui/client/src/network-ui/group.directive.js
new file mode 100644
index 0000000000..82adb59cae
--- /dev/null
+++ b/awx/ui/client/src/network-ui/group.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/group.partial.svg');
+
+function group () {
+  return { restrict: 'A', templateUrl};
+}
+exports.group = group;
diff --git a/awx/network_ui/static/network_ui/src/group.js b/awx/ui/client/src/network-ui/group.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/group.js
rename to awx/ui/client/src/network-ui/group.js
diff --git a/awx/network_ui/static/network_ui/widgets/group.html b/awx/ui/client/src/network-ui/group.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/group.html
rename to awx/ui/client/src/network-ui/group.partial.svg
diff --git a/awx/ui/client/src/network-ui/host.directive.js b/awx/ui/client/src/network-ui/host.directive.js
new file mode 100644
index 0000000000..aa0b13d3c4
--- /dev/null
+++ b/awx/ui/client/src/network-ui/host.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/host.partial.svg');
+
+function host () {
+  return { restrict: 'A', templateUrl};
+}
+exports.host = host;
diff --git a/awx/network_ui/static/network_ui/widgets/host.html b/awx/ui/client/src/network-ui/host.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/host.html
rename to awx/ui/client/src/network-ui/host.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/hotkeys.fsm.js b/awx/ui/client/src/network-ui/hotkeys.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/hotkeys.fsm.js
rename to awx/ui/client/src/network-ui/hotkeys.fsm.js
diff --git a/awx/network_ui/static/network_ui/src/inventory.toolbox.clip.path.directive.js b/awx/ui/client/src/network-ui/inventory.toolbox.clip.path.directive.js
similarity index 53%
rename from awx/network_ui/static/network_ui/src/inventory.toolbox.clip.path.directive.js
rename to awx/ui/client/src/network-ui/inventory.toolbox.clip.path.directive.js
index 98ff1be96e..22166ed389 100644
--- a/awx/network_ui/static/network_ui/src/inventory.toolbox.clip.path.directive.js
+++ b/awx/ui/client/src/network-ui/inventory.toolbox.clip.path.directive.js
@@ -1,6 +1,8 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/inventory_toolbox_clip_path.partial.svg');
+
 function inventoryToolboxClipPath () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/inventory_toolbox_clip_path.html' };
+  return { restrict: 'A', templateUrl};
 }
 exports.inventoryToolboxClipPath = inventoryToolboxClipPath;
diff --git a/awx/network_ui/static/network_ui/src/inventory.toolbox.directive.js b/awx/ui/client/src/network-ui/inventory.toolbox.directive.js
similarity index 50%
rename from awx/network_ui/static/network_ui/src/inventory.toolbox.directive.js
rename to awx/ui/client/src/network-ui/inventory.toolbox.directive.js
index 130082f413..d3cfa8b65e 100644
--- a/awx/network_ui/static/network_ui/src/inventory.toolbox.directive.js
+++ b/awx/ui/client/src/network-ui/inventory.toolbox.directive.js
@@ -1,6 +1,8 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/inventory_toolbox.partial.svg');
+
 function inventoryToolbox () {
-  return { restrict: 'A', templateUrl: '/static/network_ui/widgets/inventory_toolbox.html' };
+  return { restrict: 'A', templateUrl};
 }
 exports.inventoryToolbox = inventoryToolbox;
diff --git a/awx/network_ui/static/network_ui/widgets/inventory_toolbox.html b/awx/ui/client/src/network-ui/inventory_toolbox.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/inventory_toolbox.html
rename to awx/ui/client/src/network-ui/inventory_toolbox.partial.svg
diff --git a/awx/network_ui/static/network_ui/widgets/inventory_toolbox_clip_path.html b/awx/ui/client/src/network-ui/inventory_toolbox_clip_path.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/inventory_toolbox_clip_path.html
rename to awx/ui/client/src/network-ui/inventory_toolbox_clip_path.partial.svg
diff --git a/awx/ui/client/src/network-ui/layer.directive.js b/awx/ui/client/src/network-ui/layer.directive.js
new file mode 100644
index 0000000000..0a1a9953e4
--- /dev/null
+++ b/awx/ui/client/src/network-ui/layer.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/layer.partial.svg');
+
+function layer () {
+  return { restrict: 'A', templateUrl};
+}
+exports.layer = layer;
diff --git a/awx/network_ui/static/network_ui/widgets/layer.html b/awx/ui/client/src/network-ui/layer.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/layer.html
rename to awx/ui/client/src/network-ui/layer.partial.svg
diff --git a/awx/ui/client/src/network-ui/link.directive.js b/awx/ui/client/src/network-ui/link.directive.js
new file mode 100644
index 0000000000..446f56b14f
--- /dev/null
+++ b/awx/ui/client/src/network-ui/link.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/link.partial.svg');
+
+function link () {
+  return { restrict: 'A', templateUrl};
+}
+exports.link = link;
diff --git a/awx/network_ui/static/network_ui/src/link.js b/awx/ui/client/src/network-ui/link.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/link.js
rename to awx/ui/client/src/network-ui/link.js
diff --git a/awx/network_ui/static/network_ui/widgets/link.html b/awx/ui/client/src/network-ui/link.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/link.html
rename to awx/ui/client/src/network-ui/link.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/main.js b/awx/ui/client/src/network-ui/main.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/main.js
rename to awx/ui/client/src/network-ui/main.js
diff --git a/awx/ui/client/src/network-ui/map.directive.js b/awx/ui/client/src/network-ui/map.directive.js
new file mode 100644
index 0000000000..2f9673e358
--- /dev/null
+++ b/awx/ui/client/src/network-ui/map.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/map.partial.svg');
+
+function map () {
+  return { restrict: 'A', templateUrl};
+}
+exports.map = map;
diff --git a/awx/network_ui/static/network_ui/widgets/map.html b/awx/ui/client/src/network-ui/map.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/map.html
rename to awx/ui/client/src/network-ui/map.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/messages.js b/awx/ui/client/src/network-ui/messages.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/messages.js
rename to awx/ui/client/src/network-ui/messages.js
diff --git a/awx/network_ui/static/network_ui/src/mode.fsm.js b/awx/ui/client/src/network-ui/mode.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/mode.fsm.js
rename to awx/ui/client/src/network-ui/mode.fsm.js
diff --git a/awx/network_ui/static/network_ui/src/models.js b/awx/ui/client/src/network-ui/models.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/models.js
rename to awx/ui/client/src/network-ui/models.js
diff --git a/awx/network_ui/static/network_ui/src/move.js b/awx/ui/client/src/network-ui/move.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/move.js
rename to awx/ui/client/src/network-ui/move.js
diff --git a/awx/network_ui/static/network_ui/src/network.ui.app.js b/awx/ui/client/src/network-ui/network.ui.app.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/network.ui.app.js
rename to awx/ui/client/src/network-ui/network.ui.app.js
diff --git a/awx/network_ui/static/network_ui/src/network.ui.controller.js b/awx/ui/client/src/network-ui/network.ui.controller.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/network.ui.controller.js
rename to awx/ui/client/src/network-ui/network.ui.controller.js
diff --git a/awx/ui/client/src/network-ui/network.ui.directive.js b/awx/ui/client/src/network-ui/network.ui.directive.js
new file mode 100644
index 0000000000..af53c59677
--- /dev/null
+++ b/awx/ui/client/src/network-ui/network.ui.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/network_ui.partial.svg');
+
+function awxNetworkUI () {
+  return { restrict: 'E', templateUrl};
+}
+exports.awxNetworkUI = awxNetworkUI;
diff --git a/awx/network_ui/static/network_ui/src/network.widgets.app.js b/awx/ui/client/src/network-ui/network.widgets.app.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/network.widgets.app.js
rename to awx/ui/client/src/network-ui/network.widgets.app.js
diff --git a/awx/network_ui/static/network_ui/src/network.widgets.controller.js b/awx/ui/client/src/network-ui/network.widgets.controller.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/network.widgets.controller.js
rename to awx/ui/client/src/network-ui/network.widgets.controller.js
diff --git a/awx/network_ui/static/network_ui/src/network.widgets.directive.js b/awx/ui/client/src/network-ui/network.widgets.directive.js
similarity index 51%
rename from awx/network_ui/static/network_ui/src/network.widgets.directive.js
rename to awx/ui/client/src/network-ui/network.widgets.directive.js
index 001e009606..4bd78130fc 100644
--- a/awx/network_ui/static/network_ui/src/network.widgets.directive.js
+++ b/awx/ui/client/src/network-ui/network.widgets.directive.js
@@ -1,6 +1,8 @@
 /* Copyright (c) 2017 Red Hat, Inc. */
 
+const templateUrl = require('~network-ui/network_widgets.partial.svg');
+
 function awxNetworkWidgets () {
-  return { restrict: 'E', templateUrl: '/static/network_ui/widgets/network_widgets.html' };
+  return { restrict: 'E', templateUrl};
 }
 exports.awxNetworkWidgets = awxNetworkWidgets;
diff --git a/awx/network_ui/static/network_ui/widgets/network_ui.html b/awx/ui/client/src/network-ui/network_ui.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/network_ui.html
rename to awx/ui/client/src/network-ui/network_ui.partial.svg
diff --git a/awx/network_ui/static/network_ui/widgets/network_widgets.html b/awx/ui/client/src/network-ui/network_widgets.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/network_widgets.html
rename to awx/ui/client/src/network-ui/network_widgets.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/ngTouch.js b/awx/ui/client/src/network-ui/ngTouch.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/ngTouch.js
rename to awx/ui/client/src/network-ui/ngTouch.js
diff --git a/awx/network_ui/static/network_ui/src/null.fsm.js b/awx/ui/client/src/network-ui/null.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/null.fsm.js
rename to awx/ui/client/src/network-ui/null.fsm.js
diff --git a/awx/ui/client/src/network-ui/process.directive.js b/awx/ui/client/src/network-ui/process.directive.js
new file mode 100644
index 0000000000..bc6ef22046
--- /dev/null
+++ b/awx/ui/client/src/network-ui/process.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/process.partial.svg');
+
+function process () {
+  return { restrict: 'A', templateUrl};
+}
+exports.process = process;
diff --git a/awx/network_ui/static/network_ui/widgets/process.html b/awx/ui/client/src/network-ui/process.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/process.html
rename to awx/ui/client/src/network-ui/process.partial.svg
diff --git a/awx/ui/client/src/network-ui/quadrants.directive.js b/awx/ui/client/src/network-ui/quadrants.directive.js
new file mode 100644
index 0000000000..85874c9f21
--- /dev/null
+++ b/awx/ui/client/src/network-ui/quadrants.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/quadrants.partial.svg');
+
+function quadrants () {
+  return { restrict: 'A', templateUrl};
+}
+exports.quadrants = quadrants;
diff --git a/awx/network_ui/static/network_ui/widgets/quadrants.html b/awx/ui/client/src/network-ui/quadrants.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/quadrants.html
rename to awx/ui/client/src/network-ui/quadrants.partial.svg
diff --git a/awx/ui/client/src/network-ui/rack.directive.js b/awx/ui/client/src/network-ui/rack.directive.js
new file mode 100644
index 0000000000..cc619c63f3
--- /dev/null
+++ b/awx/ui/client/src/network-ui/rack.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/rack.partial.svg');
+
+function rack () {
+  return { restrict: 'A', templateUrl};
+}
+exports.rack = rack;
diff --git a/awx/network_ui/static/network_ui/src/rack.fsm.js b/awx/ui/client/src/network-ui/rack.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/rack.fsm.js
rename to awx/ui/client/src/network-ui/rack.fsm.js
diff --git a/awx/ui/client/src/network-ui/rack.icon.directive.js b/awx/ui/client/src/network-ui/rack.icon.directive.js
new file mode 100644
index 0000000000..ce3bdef666
--- /dev/null
+++ b/awx/ui/client/src/network-ui/rack.icon.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/rack_icon.partial.svg');
+
+function rackIcon () {
+  return { restrict: 'A', templateUrl};
+}
+exports.rackIcon = rackIcon;
diff --git a/awx/network_ui/static/network_ui/widgets/rack.html b/awx/ui/client/src/network-ui/rack.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/rack.html
rename to awx/ui/client/src/network-ui/rack.partial.svg
diff --git a/awx/network_ui/static/network_ui/widgets/rack_icon.html b/awx/ui/client/src/network-ui/rack_icon.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/rack_icon.html
rename to awx/ui/client/src/network-ui/rack_icon.partial.svg
diff --git a/awx/ui/client/src/network-ui/router.directive.js b/awx/ui/client/src/network-ui/router.directive.js
new file mode 100644
index 0000000000..22059d930d
--- /dev/null
+++ b/awx/ui/client/src/network-ui/router.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/router.partial.svg');
+
+function router () {
+  return { restrict: 'A', templateUrl};
+}
+exports.router = router;
diff --git a/awx/network_ui/static/network_ui/widgets/router.html b/awx/ui/client/src/network-ui/router.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/router.html
rename to awx/ui/client/src/network-ui/router.partial.svg
diff --git a/awx/ui/client/src/network-ui/site.directive.js b/awx/ui/client/src/network-ui/site.directive.js
new file mode 100644
index 0000000000..8382bf1b47
--- /dev/null
+++ b/awx/ui/client/src/network-ui/site.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/site.partial.svg');
+
+function site () {
+  return { restrict: 'A', templateUrl};
+}
+exports.site = site;
diff --git a/awx/network_ui/static/network_ui/src/site.fsm.js b/awx/ui/client/src/network-ui/site.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/site.fsm.js
rename to awx/ui/client/src/network-ui/site.fsm.js
diff --git a/awx/ui/client/src/network-ui/site.icon.directive.js b/awx/ui/client/src/network-ui/site.icon.directive.js
new file mode 100644
index 0000000000..3c95aa9411
--- /dev/null
+++ b/awx/ui/client/src/network-ui/site.icon.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/site_icon.partial.svg');
+
+function siteIcon () {
+  return { restrict: 'A', templateUrl};
+}
+exports.siteIcon = siteIcon;
diff --git a/awx/network_ui/static/network_ui/widgets/site.html b/awx/ui/client/src/network-ui/site.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/site.html
rename to awx/ui/client/src/network-ui/site.partial.svg
diff --git a/awx/network_ui/static/network_ui/widgets/site_icon.html b/awx/ui/client/src/network-ui/site_icon.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/site_icon.html
rename to awx/ui/client/src/network-ui/site_icon.partial.svg
diff --git a/awx/ui/client/src/network-ui/status.light.directive.js b/awx/ui/client/src/network-ui/status.light.directive.js
new file mode 100644
index 0000000000..e2b4ededff
--- /dev/null
+++ b/awx/ui/client/src/network-ui/status.light.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/status_light.partial.svg');
+
+function statusLight () {
+  return { restrict: 'A', templateUrl};
+}
+exports.statusLight = statusLight;
diff --git a/awx/network_ui/static/network_ui/widgets/status_light.html b/awx/ui/client/src/network-ui/status_light.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/status_light.html
rename to awx/ui/client/src/network-ui/status_light.partial.svg
diff --git a/awx/ui/client/src/network-ui/stencil.directive.js b/awx/ui/client/src/network-ui/stencil.directive.js
new file mode 100644
index 0000000000..175126cb6f
--- /dev/null
+++ b/awx/ui/client/src/network-ui/stencil.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/stencil.partial.svg');
+
+function stencil () {
+  return { restrict: 'A', templateUrl};
+}
+exports.stencil = stencil;
diff --git a/awx/network_ui/static/network_ui/widgets/stencil.html b/awx/ui/client/src/network-ui/stencil.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/stencil.html
rename to awx/ui/client/src/network-ui/stencil.partial.svg
diff --git a/awx/ui/client/src/network-ui/stream.directive.js b/awx/ui/client/src/network-ui/stream.directive.js
new file mode 100644
index 0000000000..a28cd14f0e
--- /dev/null
+++ b/awx/ui/client/src/network-ui/stream.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/stream.partial.svg');
+
+function stream () {
+  return { restrict: 'A', templateUrl};
+}
+exports.stream = stream;
diff --git a/awx/network_ui/static/network_ui/src/stream.fsm.js b/awx/ui/client/src/network-ui/stream.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/stream.fsm.js
rename to awx/ui/client/src/network-ui/stream.fsm.js
diff --git a/awx/network_ui/static/network_ui/widgets/stream.html b/awx/ui/client/src/network-ui/stream.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/stream.html
rename to awx/ui/client/src/network-ui/stream.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/style.less b/awx/ui/client/src/network-ui/style.less
similarity index 100%
rename from awx/network_ui/static/network_ui/src/style.less
rename to awx/ui/client/src/network-ui/style.less
diff --git a/awx/network_ui/static/network_ui/src/svg-crowbar.js b/awx/ui/client/src/network-ui/svg-crowbar.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/svg-crowbar.js
rename to awx/ui/client/src/network-ui/svg-crowbar.js
diff --git a/awx/ui/client/src/network-ui/switch.directive.js b/awx/ui/client/src/network-ui/switch.directive.js
new file mode 100644
index 0000000000..a9fbb48a8d
--- /dev/null
+++ b/awx/ui/client/src/network-ui/switch.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/switch.partial.svg');
+
+function switchd () {
+  return { restrict: 'A', templateUrl};
+}
+exports.switchd = switchd;
diff --git a/awx/network_ui/static/network_ui/widgets/switch.html b/awx/ui/client/src/network-ui/switch.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/switch.html
rename to awx/ui/client/src/network-ui/switch.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/tables.ui.app.js b/awx/ui/client/src/network-ui/tables.ui.app.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/tables.ui.app.js
rename to awx/ui/client/src/network-ui/tables.ui.app.js
diff --git a/awx/network_ui/static/network_ui/src/tables.ui.controller.js b/awx/ui/client/src/network-ui/tables.ui.controller.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/tables.ui.controller.js
rename to awx/ui/client/src/network-ui/tables.ui.controller.js
diff --git a/awx/ui/client/src/network-ui/tables.ui.directive.js b/awx/ui/client/src/network-ui/tables.ui.directive.js
new file mode 100644
index 0000000000..d85e5366eb
--- /dev/null
+++ b/awx/ui/client/src/network-ui/tables.ui.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/tables_ui.partial.svg');
+
+function awxTablesUI () {
+  return { restrict: 'E', templateUrl};
+}
+exports.awxTablesUI = awxTablesUI;
diff --git a/awx/network_ui/static/network_ui/widgets/tables_ui.html b/awx/ui/client/src/network-ui/tables_ui.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/tables_ui.html
rename to awx/ui/client/src/network-ui/tables_ui.partial.svg
diff --git a/awx/ui/client/src/network-ui/task.status.directive.js b/awx/ui/client/src/network-ui/task.status.directive.js
new file mode 100644
index 0000000000..d442fd8da5
--- /dev/null
+++ b/awx/ui/client/src/network-ui/task.status.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/task_status.partial.svg');
+
+function taskStatus () {
+  return { restrict: 'A', templateUrl};
+}
+exports.taskStatus = taskStatus;
diff --git a/awx/network_ui/static/network_ui/widgets/task_status.html b/awx/ui/client/src/network-ui/task_status.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/task_status.html
rename to awx/ui/client/src/network-ui/task_status.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/time.js b/awx/ui/client/src/network-ui/time.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/time.js
rename to awx/ui/client/src/network-ui/time.js
diff --git a/awx/network_ui/static/network_ui/src/toolbox.fsm.js b/awx/ui/client/src/network-ui/toolbox.fsm.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/toolbox.fsm.js
rename to awx/ui/client/src/network-ui/toolbox.fsm.js
diff --git a/awx/ui/client/src/network-ui/touch.directive.js b/awx/ui/client/src/network-ui/touch.directive.js
new file mode 100644
index 0000000000..6bcb5ce3a2
--- /dev/null
+++ b/awx/ui/client/src/network-ui/touch.directive.js
@@ -0,0 +1,8 @@
+/* Copyright (c) 2017 Red Hat, Inc. */
+
+const templateUrl = require('~network-ui/touch.partial.svg');
+
+function touch () {
+  return { restrict: 'A', templateUrl};
+}
+exports.touch = touch;
diff --git a/awx/network_ui/static/network_ui/widgets/touch.html b/awx/ui/client/src/network-ui/touch.partial.svg
similarity index 100%
rename from awx/network_ui/static/network_ui/widgets/touch.html
rename to awx/ui/client/src/network-ui/touch.partial.svg
diff --git a/awx/network_ui/static/network_ui/src/tower.app.js b/awx/ui/client/src/network-ui/tower.app.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/tower.app.js
rename to awx/ui/client/src/network-ui/tower.app.js
diff --git a/awx/network_ui/static/network_ui/src/util.js b/awx/ui/client/src/network-ui/util.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/util.js
rename to awx/ui/client/src/network-ui/util.js
diff --git a/awx/network_ui/static/network_ui/src/view.js b/awx/ui/client/src/network-ui/view.js
similarity index 100%
rename from awx/network_ui/static/network_ui/src/view.js
rename to awx/ui/client/src/network-ui/view.js