diff --git a/tuskar_sat_ui/overrides/infrastructure/__init__.py b/tuskar_sat_ui/models.py
similarity index 100%
rename from tuskar_sat_ui/overrides/infrastructure/__init__.py
rename to tuskar_sat_ui/models.py
diff --git a/tuskar_sat_ui/overrides/__init__.py b/tuskar_sat_ui/overrides/__init__.py
deleted file mode 100644
index c299ef3..0000000
--- a/tuskar_sat_ui/overrides/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from tuskar_sat_ui.overrides.infrastructure import node_views
diff --git a/tuskar_sat_ui/overrides/infrastructure/node_views.py b/tuskar_sat_ui/overrides/infrastructure/node_views.py
deleted file mode 100644
index bc9f217..0000000
--- a/tuskar_sat_ui/overrides/infrastructure/node_views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from tuskar_ui.infrastructure.nodes import views as nodes_views
-
-nodes_views.DetailView.template_name = 'overrides/infrastructure/templates/nodes/details.html'
\ No newline at end of file
diff --git a/tuskar_sat_ui/overrides/static/infrastructure/js/angular/horizon.base64.js b/tuskar_sat_ui/static/infrastructure/js/angular/horizon.base64.js
similarity index 100%
rename from tuskar_sat_ui/overrides/static/infrastructure/js/angular/horizon.base64.js
rename to tuskar_sat_ui/static/infrastructure/js/angular/horizon.base64.js
diff --git a/tuskar_sat_ui/overrides/static/infrastructure/js/angular/horizon.node_errata.js b/tuskar_sat_ui/static/infrastructure/js/angular/horizon.node_errata.js
similarity index 100%
rename from tuskar_sat_ui/overrides/static/infrastructure/js/angular/horizon.node_errata.js
rename to tuskar_sat_ui/static/infrastructure/js/angular/horizon.node_errata.js
diff --git a/tuskar_sat_ui/overrides/infrastructure/templates/_scripts.html b/tuskar_sat_ui/templates/infrastructure/_scripts.html
similarity index 100%
rename from tuskar_sat_ui/overrides/infrastructure/templates/_scripts.html
rename to tuskar_sat_ui/templates/infrastructure/_scripts.html
diff --git a/tuskar_sat_ui/overrides/infrastructure/templates/nodes/details.html b/tuskar_sat_ui/templates/infrastructure/nodes/details.html
similarity index 100%
rename from tuskar_sat_ui/overrides/infrastructure/templates/nodes/details.html
rename to tuskar_sat_ui/templates/infrastructure/nodes/details.html