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/float_range/model.js b/IPython/html/static/notebook/js/widgets/model_float_range.js
similarity index 100%
rename from IPython/html/widgets/float_range/model.js
rename to IPython/html/static/notebook/js/widgets/model_float_range.js
diff --git a/IPython/html/widgets/int_range/model.js b/IPython/html/static/notebook/js/widgets/model_int_range.js
similarity index 100%
rename from IPython/html/widgets/int_range/model.js
rename to IPython/html/static/notebook/js/widgets/model_int_range.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/container/view.js b/IPython/html/static/notebook/js/widgets/view_container.js
similarity index 100%
rename from IPython/html/widgets/container/view.js
rename to IPython/html/static/notebook/js/widgets/view_container.js
diff --git a/IPython/html/widgets/float_range/view_slider.js b/IPython/html/static/notebook/js/widgets/view_float_range_slider.js
similarity index 100%
rename from IPython/html/widgets/float_range/view_slider.js
rename to IPython/html/static/notebook/js/widgets/view_float_range_slider.js
diff --git a/IPython/html/widgets/float_range/view_text.js b/IPython/html/static/notebook/js/widgets/view_float_range_text.js
similarity index 100%
rename from IPython/html/widgets/float_range/view_text.js
rename to IPython/html/static/notebook/js/widgets/view_float_range_text.js
diff --git a/IPython/html/widgets/int_range/view_slider.js b/IPython/html/static/notebook/js/widgets/view_int_range_slider.js
similarity index 100%
rename from IPython/html/widgets/int_range/view_slider.js
rename to IPython/html/static/notebook/js/widgets/view_int_range_slider.js
diff --git a/IPython/html/widgets/int_range/view_text.js b/IPython/html/static/notebook/js/widgets/view_int_range_text.js
similarity index 100%
rename from IPython/html/widgets/int_range/view_text.js
rename to IPython/html/static/notebook/js/widgets/view_int_range_text.js
diff --git a/IPython/html/widgets/selection/view_dropdown.js b/IPython/html/static/notebook/js/widgets/view_selection_dropdown.js
similarity index 100%
rename from IPython/html/widgets/selection/view_dropdown.js
rename to IPython/html/static/notebook/js/widgets/view_selection_dropdown.js
diff --git a/IPython/html/widgets/selection/view_radiobutton.js b/IPython/html/static/notebook/js/widgets/view_selection_radiobutton.js
similarity index 100%
rename from IPython/html/widgets/selection/view_radiobutton.js
rename to IPython/html/static/notebook/js/widgets/view_selection_radiobutton.js
diff --git a/IPython/html/widgets/string/view_textarea.js b/IPython/html/static/notebook/js/widgets/view_string_textarea.js
similarity index 100%
rename from IPython/html/widgets/string/view_textarea.js
rename to IPython/html/static/notebook/js/widgets/view_string_textarea.js
diff --git a/IPython/html/widgets/string/view_textbox.js b/IPython/html/static/notebook/js/widgets/view_string_textbox.js
similarity index 100%
rename from IPython/html/widgets/string/view_textbox.js
rename to IPython/html/static/notebook/js/widgets/view_string_textbox.js
diff --git a/IPython/html/widgets/__init__.py b/IPython/html/widgets/__init__.py
index af17d03..6c17d75 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/container/__init__.py b/IPython/html/widgets/container/__init__.py
deleted file mode 100644
index e6de208..0000000
--- a/IPython/html/widgets/container/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from widget import ContainerWidget
\ No newline at end of file
diff --git a/IPython/html/widgets/float_range/widget.py b/IPython/html/widgets/float_range.py
similarity index 100%
rename from IPython/html/widgets/float_range/widget.py
rename to IPython/html/widgets/float_range.py
diff --git a/IPython/html/widgets/float_range/__init__.py b/IPython/html/widgets/float_range/__init__.py
deleted file mode 100644
index a987e6f..0000000
--- a/IPython/html/widgets/float_range/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from widget import FloatRangeWidget
\ No newline at end of file
diff --git a/IPython/html/widgets/int_range/widget.py b/IPython/html/widgets/int_range.py
similarity index 100%
rename from IPython/html/widgets/int_range/widget.py
rename to IPython/html/widgets/int_range.py
diff --git a/IPython/html/widgets/int_range/__init__.py b/IPython/html/widgets/int_range/__init__.py
deleted file mode 100644
index ad95056..0000000
--- a/IPython/html/widgets/int_range/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from widget import IntRangeWidget
\ No newline at end of file
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/selection/__init__.py b/IPython/html/widgets/selection/__init__.py
deleted file mode 100644
index 6d2fc06..0000000
--- a/IPython/html/widgets/selection/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from widget import SelectionWidget
\ No newline at end of file
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
diff --git a/IPython/html/widgets/string/__init__.py b/IPython/html/widgets/string/__init__.py
deleted file mode 100644
index c423f7a..0000000
--- a/IPython/html/widgets/string/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from widget import StringWidget
\ No newline at end of file