diff --git a/IPython/html/widgets/widget.js b/IPython/html/static/notebook/js/widget.js
similarity index 100%
rename from IPython/html/widgets/widget.js
rename to IPython/html/static/notebook/js/widget.js
diff --git a/IPython/html/widgets/container/model.js b/IPython/html/static/notebook/js/widgets/model_container.js
similarity index 100%
rename from IPython/html/widgets/container/model.js
rename to IPython/html/static/notebook/js/widgets/model_container.js
diff --git a/IPython/html/widgets/selection/model.js b/IPython/html/static/notebook/js/widgets/model_selection.js
similarity index 100%
rename from IPython/html/widgets/selection/model.js
rename to IPython/html/static/notebook/js/widgets/model_selection.js
diff --git a/IPython/html/widgets/string/model.js b/IPython/html/static/notebook/js/widgets/model_string.js
similarity index 100%
rename from IPython/html/widgets/string/model.js
rename to IPython/html/static/notebook/js/widgets/model_string.js
diff --git a/IPython/html/widgets/__init__.py b/IPython/html/widgets/__init__.py
index af17d03c0..6c17d7540 100644
--- a/IPython/html/widgets/__init__.py
+++ b/IPython/html/widgets/__init__.py
@@ -1,4 +1,4 @@
-from widget import Widget, init_widget_js
+from base import Widget, init_widget_js
 
 from container import ContainerWidget
 from float_range import FloatRangeWidget
diff --git a/IPython/html/widgets/widget.py b/IPython/html/widgets/base.py
similarity index 100%
rename from IPython/html/widgets/widget.py
rename to IPython/html/widgets/base.py
diff --git a/IPython/html/widgets/container/widget.py b/IPython/html/widgets/container.py
similarity index 100%
rename from IPython/html/widgets/container/widget.py
rename to IPython/html/widgets/container.py
diff --git a/IPython/html/widgets/selection/widget.py b/IPython/html/widgets/selection.py
similarity index 100%
rename from IPython/html/widgets/selection/widget.py
rename to IPython/html/widgets/selection.py
diff --git a/IPython/html/widgets/string/widget.py b/IPython/html/widgets/string.py
similarity index 100%
rename from IPython/html/widgets/string/widget.py
rename to IPython/html/widgets/string.py