diff --git a/lib/assets/javascripts/cdb.js/.gitignore b/lib/assets/javascripts/cdb/.gitignore
similarity index 100%
rename from lib/assets/javascripts/cdb.js/.gitignore
rename to lib/assets/javascripts/cdb/.gitignore
diff --git a/lib/assets/javascripts/cdb.js/.travis.yml b/lib/assets/javascripts/cdb/.travis.yml
similarity index 100%
rename from lib/assets/javascripts/cdb.js/.travis.yml
rename to lib/assets/javascripts/cdb/.travis.yml
diff --git a/lib/assets/javascripts/cdb.js/CONTRIBUTING.md b/lib/assets/javascripts/cdb/CONTRIBUTING.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/CONTRIBUTING.md
rename to lib/assets/javascripts/cdb/CONTRIBUTING.md
diff --git a/lib/assets/javascripts/cdb.js/Gemfile b/lib/assets/javascripts/cdb/Gemfile
similarity index 100%
rename from lib/assets/javascripts/cdb.js/Gemfile
rename to lib/assets/javascripts/cdb/Gemfile
diff --git a/lib/assets/javascripts/cdb.js/Gruntfile.js b/lib/assets/javascripts/cdb/Gruntfile.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/Gruntfile.js
rename to lib/assets/javascripts/cdb/Gruntfile.js
diff --git a/lib/assets/javascripts/cdb.js/LICENSE b/lib/assets/javascripts/cdb/LICENSE
similarity index 100%
rename from lib/assets/javascripts/cdb.js/LICENSE
rename to lib/assets/javascripts/cdb/LICENSE
diff --git a/lib/assets/javascripts/cdb.js/Makefile b/lib/assets/javascripts/cdb/Makefile
similarity index 100%
rename from lib/assets/javascripts/cdb.js/Makefile
rename to lib/assets/javascripts/cdb/Makefile
diff --git a/lib/assets/javascripts/cdb.js/NEWS.md b/lib/assets/javascripts/cdb/NEWS.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/NEWS.md
rename to lib/assets/javascripts/cdb/NEWS.md
diff --git a/lib/assets/javascripts/cdb.js/README.md b/lib/assets/javascripts/cdb/README.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/README.md
rename to lib/assets/javascripts/cdb/README.md
diff --git a/lib/assets/javascripts/cdb.js/RELEASING.md b/lib/assets/javascripts/cdb/RELEASING.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/RELEASING.md
rename to lib/assets/javascripts/cdb/RELEASING.md
diff --git a/lib/assets/javascripts/cdb.js/UPGRADE.md b/lib/assets/javascripts/cdb/UPGRADE.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/UPGRADE.md
rename to lib/assets/javascripts/cdb/UPGRADE.md
diff --git a/lib/assets/javascripts/cdb.js/bower.json b/lib/assets/javascripts/cdb/bower.json
similarity index 100%
rename from lib/assets/javascripts/cdb.js/bower.json
rename to lib/assets/javascripts/cdb/bower.json
diff --git a/lib/assets/javascripts/cdb.js/bower.sh b/lib/assets/javascripts/cdb/bower.sh
similarity index 100%
rename from lib/assets/javascripts/cdb.js/bower.sh
rename to lib/assets/javascripts/cdb/bower.sh
diff --git a/lib/assets/javascripts/cdb.js/doc/API.md b/lib/assets/javascripts/cdb/doc/API.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/API.md
rename to lib/assets/javascripts/cdb/doc/API.md
diff --git a/lib/assets/javascripts/cdb.js/doc/api_methods.md b/lib/assets/javascripts/cdb/doc/api_methods.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/api_methods.md
rename to lib/assets/javascripts/cdb/doc/api_methods.md
diff --git a/lib/assets/javascripts/cdb.js/doc/core_api.md b/lib/assets/javascripts/cdb/doc/core_api.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/core_api.md
rename to lib/assets/javascripts/cdb/doc/core_api.md
diff --git a/lib/assets/javascripts/cdb.js/doc/events.md b/lib/assets/javascripts/cdb/doc/events.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/events.md
rename to lib/assets/javascripts/cdb/doc/events.md
diff --git a/lib/assets/javascripts/cdb.js/doc/getting_started.md b/lib/assets/javascripts/cdb/doc/getting_started.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/getting_started.md
rename to lib/assets/javascripts/cdb/doc/getting_started.md
diff --git a/lib/assets/javascripts/cdb.js/doc/layer_source_object.md b/lib/assets/javascripts/cdb/doc/layer_source_object.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/layer_source_object.md
rename to lib/assets/javascripts/cdb/doc/layer_source_object.md
diff --git a/lib/assets/javascripts/cdb.js/doc/metrics.md b/lib/assets/javascripts/cdb/doc/metrics.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/metrics.md
rename to lib/assets/javascripts/cdb/doc/metrics.md
diff --git a/lib/assets/javascripts/cdb.js/doc/raster_howto.md b/lib/assets/javascripts/cdb/doc/raster_howto.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/raster_howto.md
rename to lib/assets/javascripts/cdb/doc/raster_howto.md
diff --git a/lib/assets/javascripts/cdb.js/doc/sql.md b/lib/assets/javascripts/cdb/doc/sql.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/sql.md
rename to lib/assets/javascripts/cdb/doc/sql.md
diff --git a/lib/assets/javascripts/cdb.js/doc/static_maps.md b/lib/assets/javascripts/cdb/doc/static_maps.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/static_maps.md
rename to lib/assets/javascripts/cdb/doc/static_maps.md
diff --git a/lib/assets/javascripts/cdb.js/doc/ui_functions.md b/lib/assets/javascripts/cdb/doc/ui_functions.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/ui_functions.md
rename to lib/assets/javascripts/cdb/doc/ui_functions.md
diff --git a/lib/assets/javascripts/cdb.js/doc/versions.md b/lib/assets/javascripts/cdb/doc/versions.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/versions.md
rename to lib/assets/javascripts/cdb/doc/versions.md
diff --git a/lib/assets/javascripts/cdb.js/doc/vizjson_format.md b/lib/assets/javascripts/cdb/doc/vizjson_format.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/vizjson_format.md
rename to lib/assets/javascripts/cdb/doc/vizjson_format.md
diff --git a/lib/assets/javascripts/cdb.js/doc/vizjson_v3_format.md b/lib/assets/javascripts/cdb/doc/vizjson_v3_format.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/doc/vizjson_v3_format.md
rename to lib/assets/javascripts/cdb/doc/vizjson_v3_format.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/01-getting-started.md b/lib/assets/javascripts/cdb/docs/guides/01-getting-started.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/01-getting-started.md
rename to lib/assets/javascripts/cdb/docs/guides/01-getting-started.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/02-layer-source-object.md b/lib/assets/javascripts/cdb/docs/guides/02-layer-source-object.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/02-layer-source-object.md
rename to lib/assets/javascripts/cdb/docs/guides/02-layer-source-object.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/03-events.md b/lib/assets/javascripts/cdb/docs/guides/03-events.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/03-events.md
rename to lib/assets/javascripts/cdb/docs/guides/03-events.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/04-specific-UI-functions.md b/lib/assets/javascripts/cdb/docs/guides/04-specific-UI-functions.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/04-specific-UI-functions.md
rename to lib/assets/javascripts/cdb/docs/guides/04-specific-UI-functions.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/05-getting-data-with-sql.md b/lib/assets/javascripts/cdb/docs/guides/05-getting-data-with-sql.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/05-getting-data-with-sql.md
rename to lib/assets/javascripts/cdb/docs/guides/05-getting-data-with-sql.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/06-static-maps.md b/lib/assets/javascripts/cdb/docs/guides/06-static-maps.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/06-static-maps.md
rename to lib/assets/javascripts/cdb/docs/guides/06-static-maps.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/07-core-API-functionality.md b/lib/assets/javascripts/cdb/docs/guides/07-core-API-functionality.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/07-core-API-functionality.md
rename to lib/assets/javascripts/cdb/docs/guides/07-core-API-functionality.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/08-how-to-use-raster-with-carto-JS.md b/lib/assets/javascripts/cdb/docs/guides/08-how-to-use-raster-with-carto-JS.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/08-how-to-use-raster-with-carto-JS.md
rename to lib/assets/javascripts/cdb/docs/guides/08-how-to-use-raster-with-carto-JS.md
diff --git a/lib/assets/javascripts/cdb.js/docs/guides/09-metrics.md b/lib/assets/javascripts/cdb/docs/guides/09-metrics.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/guides/09-metrics.md
rename to lib/assets/javascripts/cdb/docs/guides/09-metrics.md
diff --git a/lib/assets/javascripts/cdb.js/docs/reference/01-API-methods.md b/lib/assets/javascripts/cdb/docs/reference/01-API-methods.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/reference/01-API-methods.md
rename to lib/assets/javascripts/cdb/docs/reference/01-API-methods.md
diff --git a/lib/assets/javascripts/cdb.js/docs/reference/02-vizjson-format.md b/lib/assets/javascripts/cdb/docs/reference/02-vizjson-format.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/reference/02-vizjson-format.md
rename to lib/assets/javascripts/cdb/docs/reference/02-vizjson-format.md
diff --git a/lib/assets/javascripts/cdb.js/docs/support/01-versions.md b/lib/assets/javascripts/cdb/docs/support/01-versions.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/support/01-versions.md
rename to lib/assets/javascripts/cdb/docs/support/01-versions.md
diff --git a/lib/assets/javascripts/cdb.js/docs/support/02-support-options.md b/lib/assets/javascripts/cdb/docs/support/02-support-options.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/support/02-support-options.md
rename to lib/assets/javascripts/cdb/docs/support/02-support-options.md
diff --git a/lib/assets/javascripts/cdb.js/docs/support/03-contribute.md b/lib/assets/javascripts/cdb/docs/support/03-contribute.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/docs/support/03-contribute.md
rename to lib/assets/javascripts/cdb/docs/support/03-contribute.md
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/css/reset.css b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/css/reset.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/css/reset.css
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/css/reset.css
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/css/style.css b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/css/style.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/css/style.css
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/css/style.css
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.eot b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.eot
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.eot
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.eot
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.svg b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.svg
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.svg
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.svg
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.ttf b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.ttf
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.ttf
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.ttf
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.woff b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.woff
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/fonts/roboto-regular-webfont.woff
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/fonts/roboto-regular-webfont.woff
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/leftBkg.png b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/leftBkg.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/leftBkg.png
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/leftBkg.png
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/legendBullets.png b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/legendBullets.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/legendBullets.png
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/legendBullets.png
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/overlay.png b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/overlay.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/overlay.png
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/overlay.png
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/title.png b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/title.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/title.png
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/title.png
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/videoButton.png b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/videoButton.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/img/videoButton.png
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/img/videoButton.png
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/index.html b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/index.html
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/index.html
diff --git a/lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/js/app.js b/lib/assets/javascripts/cdb/examples/TheHobbitLocations/js/app.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/TheHobbitLocations/js/app.js
rename to lib/assets/javascripts/cdb/examples/TheHobbitLocations/js/app.js
diff --git a/lib/assets/javascripts/cdb.js/examples/add_custom_searchbox.html b/lib/assets/javascripts/cdb/examples/add_custom_searchbox.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/add_custom_searchbox.html
rename to lib/assets/javascripts/cdb/examples/add_custom_searchbox.html
diff --git a/lib/assets/javascripts/cdb.js/examples/annotations.html b/lib/assets/javascripts/cdb/examples/annotations.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/annotations.html
rename to lib/assets/javascripts/cdb/examples/annotations.html
diff --git a/lib/assets/javascripts/cdb.js/examples/basemap.html b/lib/assets/javascripts/cdb/examples/basemap.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/basemap.html
rename to lib/assets/javascripts/cdb/examples/basemap.html
diff --git a/lib/assets/javascripts/cdb.js/examples/bing.html b/lib/assets/javascripts/cdb/examples/bing.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/bing.html
rename to lib/assets/javascripts/cdb/examples/bing.html
diff --git a/lib/assets/javascripts/cdb.js/examples/bounds.html b/lib/assets/javascripts/cdb/examples/bounds.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/bounds.html
rename to lib/assets/javascripts/cdb/examples/bounds.html
diff --git a/lib/assets/javascripts/cdb.js/examples/callback_layer.html b/lib/assets/javascripts/cdb/examples/callback_layer.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/callback_layer.html
rename to lib/assets/javascripts/cdb/examples/callback_layer.html
diff --git a/lib/assets/javascripts/cdb.js/examples/core.html b/lib/assets/javascripts/cdb/examples/core.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/core.html
rename to lib/assets/javascripts/cdb/examples/core.html
diff --git a/lib/assets/javascripts/cdb.js/examples/createLayer_custom_tooltip.html b/lib/assets/javascripts/cdb/examples/createLayer_custom_tooltip.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/createLayer_custom_tooltip.html
rename to lib/assets/javascripts/cdb/examples/createLayer_custom_tooltip.html
diff --git a/lib/assets/javascripts/cdb.js/examples/createLayer_noLegend.html b/lib/assets/javascripts/cdb/examples/createLayer_noLegend.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/createLayer_noLegend.html
rename to lib/assets/javascripts/cdb/examples/createLayer_noLegend.html
diff --git a/lib/assets/javascripts/cdb.js/examples/createLayer_refresh_time.html b/lib/assets/javascripts/cdb/examples/createLayer_refresh_time.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/createLayer_refresh_time.html
rename to lib/assets/javascripts/cdb/examples/createLayer_refresh_time.html
diff --git a/lib/assets/javascripts/cdb.js/examples/css/OLstyle.css b/lib/assets/javascripts/cdb/examples/css/OLstyle.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/css/OLstyle.css
rename to lib/assets/javascripts/cdb/examples/css/OLstyle.css
diff --git a/lib/assets/javascripts/cdb.js/examples/cursor_interaction.html b/lib/assets/javascripts/cdb/examples/cursor_interaction.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/cursor_interaction.html
rename to lib/assets/javascripts/cdb/examples/cursor_interaction.html
diff --git a/lib/assets/javascripts/cdb.js/examples/custom.html b/lib/assets/javascripts/cdb/examples/custom.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/custom.html
rename to lib/assets/javascripts/cdb/examples/custom.html
diff --git a/lib/assets/javascripts/cdb.js/examples/custom_infowindow.html b/lib/assets/javascripts/cdb/examples/custom_infowindow.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/custom_infowindow.html
rename to lib/assets/javascripts/cdb/examples/custom_infowindow.html
diff --git a/lib/assets/javascripts/cdb.js/examples/easy.html b/lib/assets/javascripts/cdb/examples/easy.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/easy.html
rename to lib/assets/javascripts/cdb/examples/easy.html
diff --git a/lib/assets/javascripts/cdb.js/examples/examples.json b/lib/assets/javascripts/cdb/examples/examples.json
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/examples.json
rename to lib/assets/javascripts/cdb/examples/examples.json
diff --git a/lib/assets/javascripts/cdb.js/examples/filters-template/data.json b/lib/assets/javascripts/cdb/examples/filters-template/data.json
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/filters-template/data.json
rename to lib/assets/javascripts/cdb/examples/filters-template/data.json
diff --git a/lib/assets/javascripts/cdb.js/examples/filters-template/index.html b/lib/assets/javascripts/cdb/examples/filters-template/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/filters-template/index.html
rename to lib/assets/javascripts/cdb/examples/filters-template/index.html
diff --git a/lib/assets/javascripts/cdb.js/examples/filters-template/main.css b/lib/assets/javascripts/cdb/examples/filters-template/main.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/filters-template/main.css
rename to lib/assets/javascripts/cdb/examples/filters-template/main.css
diff --git a/lib/assets/javascripts/cdb.js/examples/filters-template/main.js b/lib/assets/javascripts/cdb/examples/filters-template/main.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/filters-template/main.js
rename to lib/assets/javascripts/cdb/examples/filters-template/main.js
diff --git a/lib/assets/javascripts/cdb.js/examples/format.html b/lib/assets/javascripts/cdb/examples/format.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/format.html
rename to lib/assets/javascripts/cdb/examples/format.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_driving_directions_plus_sql_api.html b/lib/assets/javascripts/cdb/examples/gmaps/gmaps_driving_directions_plus_sql_api.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_driving_directions_plus_sql_api.html
rename to lib/assets/javascripts/cdb/examples/gmaps/gmaps_driving_directions_plus_sql_api.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_heatmap_plus_sql_api.html b/lib/assets/javascripts/cdb/examples/gmaps/gmaps_heatmap_plus_sql_api.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_heatmap_plus_sql_api.html
rename to lib/assets/javascripts/cdb/examples/gmaps/gmaps_heatmap_plus_sql_api.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_satellite.html b/lib/assets/javascripts/cdb/examples/gmaps/gmaps_satellite.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_satellite.html
rename to lib/assets/javascripts/cdb/examples/gmaps/gmaps_satellite.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_with_torque.html b/lib/assets/javascripts/cdb/examples/gmaps/gmaps_with_torque.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps/gmaps_with_torque.html
rename to lib/assets/javascripts/cdb/examples/gmaps/gmaps_with_torque.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps_driving_directions_plus_sql_api.html b/lib/assets/javascripts/cdb/examples/gmaps_driving_directions_plus_sql_api.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps_driving_directions_plus_sql_api.html
rename to lib/assets/javascripts/cdb/examples/gmaps_driving_directions_plus_sql_api.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps_force_basemap.html b/lib/assets/javascripts/cdb/examples/gmaps_force_basemap.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps_force_basemap.html
rename to lib/assets/javascripts/cdb/examples/gmaps_force_basemap.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps_heatmap_plus_sql_api.html b/lib/assets/javascripts/cdb/examples/gmaps_heatmap_plus_sql_api.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps_heatmap_plus_sql_api.html
rename to lib/assets/javascripts/cdb/examples/gmaps_heatmap_plus_sql_api.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps_satellite.html b/lib/assets/javascripts/cdb/examples/gmaps_satellite.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps_satellite.html
rename to lib/assets/javascripts/cdb/examples/gmaps_satellite.html
diff --git a/lib/assets/javascripts/cdb.js/examples/gmaps_with_torque.html b/lib/assets/javascripts/cdb/examples/gmaps_with_torque.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/gmaps_with_torque.html
rename to lib/assets/javascripts/cdb/examples/gmaps_with_torque.html
diff --git a/lib/assets/javascripts/cdb.js/examples/header_overlay.html b/lib/assets/javascripts/cdb/examples/header_overlay.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/header_overlay.html
rename to lib/assets/javascripts/cdb/examples/header_overlay.html
diff --git a/lib/assets/javascripts/cdb.js/examples/image.html b/lib/assets/javascripts/cdb/examples/image.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/image.html
rename to lib/assets/javascripts/cdb/examples/image.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/basemap.html b/lib/assets/javascripts/cdb/examples/images/basemap.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/basemap.html
rename to lib/assets/javascripts/cdb/examples/images/basemap.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/core.html b/lib/assets/javascripts/cdb/examples/images/core.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/core.html
rename to lib/assets/javascripts/cdb/examples/images/core.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/format.html b/lib/assets/javascripts/cdb/examples/images/format.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/format.html
rename to lib/assets/javascripts/cdb/examples/images/format.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/image.html b/lib/assets/javascripts/cdb/examples/images/image.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/image.html
rename to lib/assets/javascripts/cdb/examples/images/image.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/layer_definition.html b/lib/assets/javascripts/cdb/examples/images/layer_definition.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/layer_definition.html
rename to lib/assets/javascripts/cdb/examples/images/layer_definition.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/plain-color.html b/lib/assets/javascripts/cdb/examples/images/plain-color.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/plain-color.html
rename to lib/assets/javascripts/cdb/examples/images/plain-color.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/single-image.html b/lib/assets/javascripts/cdb/examples/images/single-image.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/single-image.html
rename to lib/assets/javascripts/cdb/examples/images/single-image.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/torque.html b/lib/assets/javascripts/cdb/examples/images/torque.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/torque.html
rename to lib/assets/javascripts/cdb/examples/images/torque.html
diff --git a/lib/assets/javascripts/cdb.js/examples/images/torque_step.html b/lib/assets/javascripts/cdb/examples/images/torque_step.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/images/torque_step.html
rename to lib/assets/javascripts/cdb/examples/images/torque_step.html
diff --git a/lib/assets/javascripts/cdb.js/examples/index.html b/lib/assets/javascripts/cdb/examples/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/index.html
rename to lib/assets/javascripts/cdb/examples/index.html
diff --git a/lib/assets/javascripts/cdb.js/examples/infowindow-on-hover.html b/lib/assets/javascripts/cdb/examples/infowindow-on-hover.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/infowindow-on-hover.html
rename to lib/assets/javascripts/cdb/examples/infowindow-on-hover.html
diff --git a/lib/assets/javascripts/cdb.js/examples/infowindow-with-different-positioning.html b/lib/assets/javascripts/cdb/examples/infowindow-with-different-positioning.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/infowindow-with-different-positioning.html
rename to lib/assets/javascripts/cdb/examples/infowindow-with-different-positioning.html
diff --git a/lib/assets/javascripts/cdb.js/examples/infowindow_with_graph.html b/lib/assets/javascripts/cdb/examples/infowindow_with_graph.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/infowindow_with_graph.html
rename to lib/assets/javascripts/cdb/examples/infowindow_with_graph.html
diff --git a/lib/assets/javascripts/cdb.js/examples/layer_definition.html b/lib/assets/javascripts/cdb/examples/layer_definition.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/layer_definition.html
rename to lib/assets/javascripts/cdb/examples/layer_definition.html
diff --git a/lib/assets/javascripts/cdb.js/examples/layer_selector.html b/lib/assets/javascripts/cdb/examples/layer_selector.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/layer_selector.html
rename to lib/assets/javascripts/cdb/examples/layer_selector.html
diff --git a/lib/assets/javascripts/cdb.js/examples/layer_selector_overlay.html b/lib/assets/javascripts/cdb/examples/layer_selector_overlay.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/layer_selector_overlay.html
rename to lib/assets/javascripts/cdb/examples/layer_selector_overlay.html
diff --git a/lib/assets/javascripts/cdb.js/examples/layer_toggle.html b/lib/assets/javascripts/cdb/examples/layer_toggle.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/layer_toggle.html
rename to lib/assets/javascripts/cdb/examples/layer_toggle.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet.html b/lib/assets/javascripts/cdb/examples/leaflet.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet.html
rename to lib/assets/javascripts/cdb/examples/leaflet.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_control_multilayer2.html b/lib/assets/javascripts/cdb/examples/leaflet_control_multilayer2.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_control_multilayer2.html
rename to lib/assets/javascripts/cdb/examples/leaflet_control_multilayer2.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_core_library.html b/lib/assets/javascripts/cdb/examples/leaflet_core_library.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_core_library.html
rename to lib/assets/javascripts/cdb/examples/leaflet_core_library.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_hover_features.html b/lib/assets/javascripts/cdb/examples/leaflet_hover_features.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_hover_features.html
rename to lib/assets/javascripts/cdb/examples/leaflet_hover_features.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_multilayer.html b/lib/assets/javascripts/cdb/examples/leaflet_multilayer.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_multilayer.html
rename to lib/assets/javascripts/cdb/examples/leaflet_multilayer.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_namedmap.html b/lib/assets/javascripts/cdb/examples/leaflet_namedmap.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_namedmap.html
rename to lib/assets/javascripts/cdb/examples/leaflet_namedmap.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_raster.html b/lib/assets/javascripts/cdb/examples/leaflet_raster.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_raster.html
rename to lib/assets/javascripts/cdb/examples/leaflet_raster.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_sandwich.html b/lib/assets/javascripts/cdb/examples/leaflet_sandwich.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_sandwich.html
rename to lib/assets/javascripts/cdb/examples/leaflet_sandwich.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_vector.html b/lib/assets/javascripts/cdb/examples/leaflet_vector.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_vector.html
rename to lib/assets/javascripts/cdb/examples/leaflet_vector.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_vector_hover.html b/lib/assets/javascripts/cdb/examples/leaflet_vector_hover.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_vector_hover.html
rename to lib/assets/javascripts/cdb/examples/leaflet_vector_hover.html
diff --git a/lib/assets/javascripts/cdb.js/examples/leaflet_vector_query_distance.html b/lib/assets/javascripts/cdb/examples/leaflet_vector_query_distance.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/leaflet_vector_query_distance.html
rename to lib/assets/javascripts/cdb/examples/leaflet_vector_query_distance.html
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/custom.html b/lib/assets/javascripts/cdb/examples/legends/custom.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/custom.html
rename to lib/assets/javascripts/cdb/examples/legends/custom.html
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/img/airport-24@2x.png b/lib/assets/javascripts/cdb/examples/legends/img/airport-24@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/img/airport-24@2x.png
rename to lib/assets/javascripts/cdb/examples/legends/img/airport-24@2x.png
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/img/heart-24@2x.png b/lib/assets/javascripts/cdb/examples/legends/img/heart-24@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/img/heart-24@2x.png
rename to lib/assets/javascripts/cdb/examples/legends/img/heart-24@2x.png
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/img/tennis-24@2x.png b/lib/assets/javascripts/cdb/examples/legends/img/tennis-24@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/img/tennis-24@2x.png
rename to lib/assets/javascripts/cdb/examples/legends/img/tennis-24@2x.png
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/img/town-hall-24@2x.png b/lib/assets/javascripts/cdb/examples/legends/img/town-hall-24@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/img/town-hall-24@2x.png
rename to lib/assets/javascripts/cdb/examples/legends/img/town-hall-24@2x.png
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/img/zoo-24@2x.png b/lib/assets/javascripts/cdb/examples/legends/img/zoo-24@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/img/zoo-24@2x.png
rename to lib/assets/javascripts/cdb/examples/legends/img/zoo-24@2x.png
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/index.html b/lib/assets/javascripts/cdb/examples/legends/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/index.html
rename to lib/assets/javascripts/cdb/examples/legends/index.html
diff --git a/lib/assets/javascripts/cdb.js/examples/legends/stacked.html b/lib/assets/javascripts/cdb/examples/legends/stacked.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/legends/stacked.html
rename to lib/assets/javascripts/cdb/examples/legends/stacked.html
diff --git a/lib/assets/javascripts/cdb.js/examples/map_dragging_disabled.html b/lib/assets/javascripts/cdb/examples/map_dragging_disabled.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/map_dragging_disabled.html
rename to lib/assets/javascripts/cdb/examples/map_dragging_disabled.html
diff --git a/lib/assets/javascripts/cdb.js/examples/mobile.html b/lib/assets/javascripts/cdb/examples/mobile.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/mobile.html
rename to lib/assets/javascripts/cdb/examples/mobile.html
diff --git a/lib/assets/javascripts/cdb.js/examples/modestmaps.html b/lib/assets/javascripts/cdb/examples/modestmaps.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/modestmaps.html
rename to lib/assets/javascripts/cdb/examples/modestmaps.html
diff --git a/lib/assets/javascripts/cdb.js/examples/named-maps-example.html b/lib/assets/javascripts/cdb/examples/named-maps-example.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/named-maps-example.html
rename to lib/assets/javascripts/cdb/examples/named-maps-example.html
diff --git a/lib/assets/javascripts/cdb.js/examples/named-maps-template.html b/lib/assets/javascripts/cdb/examples/named-maps-template.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/named-maps-template.html
rename to lib/assets/javascripts/cdb/examples/named-maps-template.html
diff --git a/lib/assets/javascripts/cdb.js/examples/new-infowindow.html b/lib/assets/javascripts/cdb/examples/new-infowindow.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/new-infowindow.html
rename to lib/assets/javascripts/cdb/examples/new-infowindow.html
diff --git a/lib/assets/javascripts/cdb.js/examples/odyssey_test.html b/lib/assets/javascripts/cdb/examples/odyssey_test.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/odyssey_test.html
rename to lib/assets/javascripts/cdb/examples/odyssey_test.html
diff --git a/lib/assets/javascripts/cdb.js/examples/openlayers.html b/lib/assets/javascripts/cdb/examples/openlayers.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/openlayers.html
rename to lib/assets/javascripts/cdb/examples/openlayers.html
diff --git a/lib/assets/javascripts/cdb.js/examples/openlayers3.html b/lib/assets/javascripts/cdb/examples/openlayers3.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/openlayers3.html
rename to lib/assets/javascripts/cdb/examples/openlayers3.html
diff --git a/lib/assets/javascripts/cdb.js/examples/plain-color.html b/lib/assets/javascripts/cdb/examples/plain-color.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/plain-color.html
rename to lib/assets/javascripts/cdb/examples/plain-color.html
diff --git a/lib/assets/javascripts/cdb.js/examples/search_with_pin.html b/lib/assets/javascripts/cdb/examples/search_with_pin.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/search_with_pin.html
rename to lib/assets/javascripts/cdb/examples/search_with_pin.html
diff --git a/lib/assets/javascripts/cdb.js/examples/single-image.html b/lib/assets/javascripts/cdb/examples/single-image.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/single-image.html
rename to lib/assets/javascripts/cdb/examples/single-image.html
diff --git a/lib/assets/javascripts/cdb.js/examples/slider.html b/lib/assets/javascripts/cdb/examples/slider.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider.html
rename to lib/assets/javascripts/cdb/examples/slider.html
diff --git a/lib/assets/javascripts/cdb.js/examples/slider/imgs/handle.gif b/lib/assets/javascripts/cdb/examples/slider/imgs/handle.gif
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider/imgs/handle.gif
rename to lib/assets/javascripts/cdb/examples/slider/imgs/handle.gif
diff --git a/lib/assets/javascripts/cdb.js/examples/slider/imgs/lt-small.png b/lib/assets/javascripts/cdb/examples/slider/imgs/lt-small.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider/imgs/lt-small.png
rename to lib/assets/javascripts/cdb/examples/slider/imgs/lt-small.png
diff --git a/lib/assets/javascripts/cdb.js/examples/slider/imgs/rt-small.png b/lib/assets/javascripts/cdb/examples/slider/imgs/rt-small.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider/imgs/rt-small.png
rename to lib/assets/javascripts/cdb/examples/slider/imgs/rt-small.png
diff --git a/lib/assets/javascripts/cdb.js/examples/slider/js/jquery.beforeafter-map-0.11-CDB.js b/lib/assets/javascripts/cdb/examples/slider/js/jquery.beforeafter-map-0.11-CDB.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider/js/jquery.beforeafter-map-0.11-CDB.js
rename to lib/assets/javascripts/cdb/examples/slider/js/jquery.beforeafter-map-0.11-CDB.js
diff --git a/lib/assets/javascripts/cdb.js/examples/slider/js/jquery.ui.touch-punch.min.js b/lib/assets/javascripts/cdb/examples/slider/js/jquery.ui.touch-punch.min.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider/js/jquery.ui.touch-punch.min.js
rename to lib/assets/javascripts/cdb/examples/slider/js/jquery.ui.touch-punch.min.js
diff --git a/lib/assets/javascripts/cdb.js/examples/slider/slider.html b/lib/assets/javascripts/cdb/examples/slider/slider.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/slider/slider.html
rename to lib/assets/javascripts/cdb/examples/slider/slider.html
diff --git a/lib/assets/javascripts/cdb.js/examples/stacked.html b/lib/assets/javascripts/cdb/examples/stacked.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/stacked.html
rename to lib/assets/javascripts/cdb/examples/stacked.html
diff --git a/lib/assets/javascripts/cdb.js/examples/sublayer.html b/lib/assets/javascripts/cdb/examples/sublayer.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/sublayer.html
rename to lib/assets/javascripts/cdb/examples/sublayer.html
diff --git a/lib/assets/javascripts/cdb.js/examples/time_slider.html b/lib/assets/javascripts/cdb/examples/time_slider.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/time_slider.html
rename to lib/assets/javascripts/cdb/examples/time_slider.html
diff --git a/lib/assets/javascripts/cdb.js/examples/torque.html b/lib/assets/javascripts/cdb/examples/torque.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/torque.html
rename to lib/assets/javascripts/cdb/examples/torque.html
diff --git a/lib/assets/javascripts/cdb.js/examples/torque_step.html b/lib/assets/javascripts/cdb/examples/torque_step.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/torque_step.html
rename to lib/assets/javascripts/cdb/examples/torque_step.html
diff --git a/lib/assets/javascripts/cdb.js/examples/torque_time_slider.html b/lib/assets/javascripts/cdb/examples/torque_time_slider.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/torque_time_slider.html
rename to lib/assets/javascripts/cdb/examples/torque_time_slider.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorial-google-driving-2.html b/lib/assets/javascripts/cdb/examples/tutorial-google-driving-2.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorial-google-driving-2.html
rename to lib/assets/javascripts/cdb/examples/tutorial-google-driving-2.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorial-google-driving.html b/lib/assets/javascripts/cdb/examples/tutorial-google-driving.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorial-google-driving.html
rename to lib/assets/javascripts/cdb/examples/tutorial-google-driving.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorial-google-heatmap-2.html b/lib/assets/javascripts/cdb/examples/tutorial-google-heatmap-2.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorial-google-heatmap-2.html
rename to lib/assets/javascripts/cdb/examples/tutorial-google-heatmap-2.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorial-google-heatmap.html b/lib/assets/javascripts/cdb/examples/tutorial-google-heatmap.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorial-google-heatmap.html
rename to lib/assets/javascripts/cdb/examples/tutorial-google-heatmap.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/named-maps-example.html b/lib/assets/javascripts/cdb/examples/tutorials/named-maps-example.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/named-maps-example.html
rename to lib/assets/javascripts/cdb/examples/tutorials/named-maps-example.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/named-maps-template.html b/lib/assets/javascripts/cdb/examples/tutorials/named-maps-template.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/named-maps-template.html
rename to lib/assets/javascripts/cdb/examples/tutorials/named-maps-template.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-1.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-1.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-1.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-1.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-2.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-2.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-2.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-2.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-driving-2.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-driving-2.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-driving-2.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-driving-2.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-driving.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-driving.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-driving.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-driving.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-heatmap-2.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-heatmap-2.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-heatmap-2.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-heatmap-2.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-heatmap.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-heatmap.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-google-heatmap.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-google-heatmap.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-query_by_distance-template.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-query_by_distance-template.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-query_by_distance-template.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-query_by_distance-template.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-query_by_distance.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-query_by_distance.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-query_by_distance.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-query_by_distance.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-toggle_map_view-template.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-toggle_map_view-template.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-toggle_map_view-template.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-toggle_map_view-template.html
diff --git a/lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-toggle_map_view.html b/lib/assets/javascripts/cdb/examples/tutorials/tutorial-toggle_map_view.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/tutorials/tutorial-toggle_map_view.html
rename to lib/assets/javascripts/cdb/examples/tutorials/tutorial-toggle_map_view.html
diff --git a/lib/assets/javascripts/cdb.js/examples/vendor/OpenLayers.js b/lib/assets/javascripts/cdb/examples/vendor/OpenLayers.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/examples/vendor/OpenLayers.js
rename to lib/assets/javascripts/cdb/examples/vendor/OpenLayers.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/README.md b/lib/assets/javascripts/cdb/grunt/README.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/README.md
rename to lib/assets/javascripts/cdb/grunt/README.md
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/autoprefixer.js b/lib/assets/javascripts/cdb/grunt/tasks/autoprefixer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/autoprefixer.js
rename to lib/assets/javascripts/cdb/grunt/tasks/autoprefixer.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/buildcontrol.js b/lib/assets/javascripts/cdb/grunt/tasks/buildcontrol.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/buildcontrol.js
rename to lib/assets/javascripts/cdb/grunt/tasks/buildcontrol.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/clean.js b/lib/assets/javascripts/cdb/grunt/tasks/clean.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/clean.js
rename to lib/assets/javascripts/cdb/grunt/tasks/clean.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/compass.js b/lib/assets/javascripts/cdb/grunt/tasks/compass.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/compass.js
rename to lib/assets/javascripts/cdb/grunt/tasks/compass.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/concat.js b/lib/assets/javascripts/cdb/grunt/tasks/concat.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/concat.js
rename to lib/assets/javascripts/cdb/grunt/tasks/concat.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/concurrent.js b/lib/assets/javascripts/cdb/grunt/tasks/concurrent.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/concurrent.js
rename to lib/assets/javascripts/cdb/grunt/tasks/concurrent.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/connect.js b/lib/assets/javascripts/cdb/grunt/tasks/connect.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/connect.js
rename to lib/assets/javascripts/cdb/grunt/tasks/connect.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/copy.js b/lib/assets/javascripts/cdb/grunt/tasks/copy.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/copy.js
rename to lib/assets/javascripts/cdb/grunt/tasks/copy.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/csslint.js b/lib/assets/javascripts/cdb/grunt/tasks/csslint.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/csslint.js
rename to lib/assets/javascripts/cdb/grunt/tasks/csslint.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/cssmin.js b/lib/assets/javascripts/cdb/grunt/tasks/cssmin.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/cssmin.js
rename to lib/assets/javascripts/cdb/grunt/tasks/cssmin.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/fastly.js b/lib/assets/javascripts/cdb/grunt/tasks/fastly.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/fastly.js
rename to lib/assets/javascripts/cdb/grunt/tasks/fastly.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/filerev.js b/lib/assets/javascripts/cdb/grunt/tasks/filerev.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/filerev.js
rename to lib/assets/javascripts/cdb/grunt/tasks/filerev.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/htmlmin.js b/lib/assets/javascripts/cdb/grunt/tasks/htmlmin.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/htmlmin.js
rename to lib/assets/javascripts/cdb/grunt/tasks/htmlmin.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/imagemin.js b/lib/assets/javascripts/cdb/grunt/tasks/imagemin.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/imagemin.js
rename to lib/assets/javascripts/cdb/grunt/tasks/imagemin.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/jasmine.js b/lib/assets/javascripts/cdb/grunt/tasks/jasmine.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/jasmine.js
rename to lib/assets/javascripts/cdb/grunt/tasks/jasmine.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/jshint.js b/lib/assets/javascripts/cdb/grunt/tasks/jshint.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/jshint.js
rename to lib/assets/javascripts/cdb/grunt/tasks/jshint.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/prompt.js b/lib/assets/javascripts/cdb/grunt/tasks/prompt.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/prompt.js
rename to lib/assets/javascripts/cdb/grunt/tasks/prompt.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/replace.js b/lib/assets/javascripts/cdb/grunt/tasks/replace.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/replace.js
rename to lib/assets/javascripts/cdb/grunt/tasks/replace.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/s3.js b/lib/assets/javascripts/cdb/grunt/tasks/s3.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/s3.js
rename to lib/assets/javascripts/cdb/grunt/tasks/s3.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/svgmin.js b/lib/assets/javascripts/cdb/grunt/tasks/svgmin.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/svgmin.js
rename to lib/assets/javascripts/cdb/grunt/tasks/svgmin.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/uglify.js b/lib/assets/javascripts/cdb/grunt/tasks/uglify.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/uglify.js
rename to lib/assets/javascripts/cdb/grunt/tasks/uglify.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/usemin.js b/lib/assets/javascripts/cdb/grunt/tasks/usemin.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/usemin.js
rename to lib/assets/javascripts/cdb/grunt/tasks/usemin.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/useminPrepare.js b/lib/assets/javascripts/cdb/grunt/tasks/useminPrepare.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/useminPrepare.js
rename to lib/assets/javascripts/cdb/grunt/tasks/useminPrepare.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/tasks/watch.js b/lib/assets/javascripts/cdb/grunt/tasks/watch.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/tasks/watch.js
rename to lib/assets/javascripts/cdb/grunt/tasks/watch.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/core_footer.js b/lib/assets/javascripts/cdb/grunt/templates/core_footer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/core_footer.js
rename to lib/assets/javascripts/cdb/grunt/templates/core_footer.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/core_header.js b/lib/assets/javascripts/cdb/grunt/templates/core_header.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/core_header.js
rename to lib/assets/javascripts/cdb/grunt/templates/core_header.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/odyssey_footer.js b/lib/assets/javascripts/cdb/grunt/templates/odyssey_footer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/odyssey_footer.js
rename to lib/assets/javascripts/cdb/grunt/templates/odyssey_footer.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/torque_footer.js b/lib/assets/javascripts/cdb/grunt/templates/torque_footer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/torque_footer.js
rename to lib/assets/javascripts/cdb/grunt/templates/torque_footer.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/torque_header.js b/lib/assets/javascripts/cdb/grunt/templates/torque_header.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/torque_header.js
rename to lib/assets/javascripts/cdb/grunt/templates/torque_header.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/underscore_no_conflict.js b/lib/assets/javascripts/cdb/grunt/templates/underscore_no_conflict.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/underscore_no_conflict.js
rename to lib/assets/javascripts/cdb/grunt/templates/underscore_no_conflict.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/version_header.js b/lib/assets/javascripts/cdb/grunt/templates/version_header.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/version_header.js
rename to lib/assets/javascripts/cdb/grunt/templates/version_header.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/wrapper_footer.js b/lib/assets/javascripts/cdb/grunt/templates/wrapper_footer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/wrapper_footer.js
rename to lib/assets/javascripts/cdb/grunt/templates/wrapper_footer.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/wrapper_header.js b/lib/assets/javascripts/cdb/grunt/templates/wrapper_header.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/wrapper_header.js
rename to lib/assets/javascripts/cdb/grunt/templates/wrapper_header.js
diff --git a/lib/assets/javascripts/cdb.js/grunt/templates/wrapper_middle.js b/lib/assets/javascripts/cdb/grunt/templates/wrapper_middle.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/grunt/templates/wrapper_middle.js
rename to lib/assets/javascripts/cdb/grunt/templates/wrapper_middle.js
diff --git a/lib/assets/javascripts/cdb.js/index.js b/lib/assets/javascripts/cdb/index.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/index.js
rename to lib/assets/javascripts/cdb/index.js
diff --git a/lib/assets/javascripts/cdb.js/package-lock.json b/lib/assets/javascripts/cdb/package-lock.json
similarity index 100%
rename from lib/assets/javascripts/cdb.js/package-lock.json
rename to lib/assets/javascripts/cdb/package-lock.json
diff --git a/lib/assets/javascripts/cdb.js/package.json b/lib/assets/javascripts/cdb/package.json
similarity index 100%
rename from lib/assets/javascripts/cdb.js/package.json
rename to lib/assets/javascripts/cdb/package.json
diff --git a/lib/assets/javascripts/cdb.js/scripts/cdn_invalidation.rb b/lib/assets/javascripts/cdb/scripts/cdn_invalidation.rb
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/cdn_invalidation.rb
rename to lib/assets/javascripts/cdb/scripts/cdn_invalidation.rb
diff --git a/lib/assets/javascripts/cdb.js/scripts/check_size.js b/lib/assets/javascripts/cdb/scripts/check_size.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/check_size.js
rename to lib/assets/javascripts/cdb/scripts/check_size.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/compress.js b/lib/assets/javascripts/cdb/scripts/compress.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/compress.js
rename to lib/assets/javascripts/cdb/scripts/compress.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/core_footer.js b/lib/assets/javascripts/cdb/scripts/core_footer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/core_footer.js
rename to lib/assets/javascripts/cdb/scripts/core_footer.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/core_header.js b/lib/assets/javascripts/cdb/scripts/core_header.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/core_header.js
rename to lib/assets/javascripts/cdb/scripts/core_header.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/get.js b/lib/assets/javascripts/cdb/scripts/get.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/get.js
rename to lib/assets/javascripts/cdb/scripts/get.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/mod.torque.footer.js b/lib/assets/javascripts/cdb/scripts/mod.torque.footer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/mod.torque.footer.js
rename to lib/assets/javascripts/cdb/scripts/mod.torque.footer.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/print_lzma.js b/lib/assets/javascripts/cdb/scripts/print_lzma.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/print_lzma.js
rename to lib/assets/javascripts/cdb/scripts/print_lzma.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/publish.js b/lib/assets/javascripts/cdb/scripts/publish.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/publish.js
rename to lib/assets/javascripts/cdb/scripts/publish.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/release.js b/lib/assets/javascripts/cdb/scripts/release.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/release.js
rename to lib/assets/javascripts/cdb/scripts/release.js
diff --git a/lib/assets/javascripts/cdb.js/scripts/wrapper.js b/lib/assets/javascripts/cdb/scripts/wrapper.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/scripts/wrapper.js
rename to lib/assets/javascripts/cdb/scripts/wrapper.js
diff --git a/lib/assets/javascripts/cdb.js/secrets.example.json b/lib/assets/javascripts/cdb/secrets.example.json
similarity index 100%
rename from lib/assets/javascripts/cdb.js/secrets.example.json
rename to lib/assets/javascripts/cdb/secrets.example.json
diff --git a/lib/assets/javascripts/cdb.js/src/api/core_lib.js b/lib/assets/javascripts/cdb/src/api/core_lib.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/api/core_lib.js
rename to lib/assets/javascripts/cdb/src/api/core_lib.js
diff --git a/lib/assets/javascripts/cdb.js/src/api/layers.js b/lib/assets/javascripts/cdb/src/api/layers.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/api/layers.js
rename to lib/assets/javascripts/cdb/src/api/layers.js
diff --git a/lib/assets/javascripts/cdb.js/src/api/sql.js b/lib/assets/javascripts/cdb/src/api/sql.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/api/sql.js
rename to lib/assets/javascripts/cdb/src/api/sql.js
diff --git a/lib/assets/javascripts/cdb.js/src/api/tiles.js b/lib/assets/javascripts/cdb/src/api/tiles.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/api/tiles.js
rename to lib/assets/javascripts/cdb/src/api/tiles.js
diff --git a/lib/assets/javascripts/cdb.js/src/api/vis.js b/lib/assets/javascripts/cdb/src/api/vis.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/api/vis.js
rename to lib/assets/javascripts/cdb/src/api/vis.js
diff --git a/lib/assets/javascripts/cdb.js/src/cartodb.js b/lib/assets/javascripts/cdb/src/cartodb.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/cartodb.js
rename to lib/assets/javascripts/cdb/src/cartodb.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/config.js b/lib/assets/javascripts/cdb/src/core/config.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/config.js
rename to lib/assets/javascripts/cdb/src/core/config.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/decorator.js b/lib/assets/javascripts/cdb/src/core/decorator.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/decorator.js
rename to lib/assets/javascripts/cdb/src/core/decorator.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/loader.js b/lib/assets/javascripts/cdb/src/core/loader.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/loader.js
rename to lib/assets/javascripts/cdb/src/core/loader.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/log.js b/lib/assets/javascripts/cdb/src/core/log.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/log.js
rename to lib/assets/javascripts/cdb/src/core/log.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/model.js b/lib/assets/javascripts/cdb/src/core/model.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/model.js
rename to lib/assets/javascripts/cdb/src/core/model.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/profiler.js b/lib/assets/javascripts/cdb/src/core/profiler.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/profiler.js
rename to lib/assets/javascripts/cdb/src/core/profiler.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/sanitize.js b/lib/assets/javascripts/cdb/src/core/sanitize.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/sanitize.js
rename to lib/assets/javascripts/cdb/src/core/sanitize.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/template.js b/lib/assets/javascripts/cdb/src/core/template.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/template.js
rename to lib/assets/javascripts/cdb/src/core/template.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/util.js b/lib/assets/javascripts/cdb/src/core/util.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/util.js
rename to lib/assets/javascripts/cdb/src/core/util.js
diff --git a/lib/assets/javascripts/cdb.js/src/core/view.js b/lib/assets/javascripts/cdb/src/core/view.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/core/view.js
rename to lib/assets/javascripts/cdb/src/core/view.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/common.js b/lib/assets/javascripts/cdb/src/geo/common.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/common.js
rename to lib/assets/javascripts/cdb/src/geo/common.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geocoder.js b/lib/assets/javascripts/cdb/src/geo/geocoder.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geocoder.js
rename to lib/assets/javascripts/cdb/src/geo/geocoder.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geocoders/mapbox_geocoder.js b/lib/assets/javascripts/cdb/src/geo/geocoders/mapbox_geocoder.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geocoders/mapbox_geocoder.js
rename to lib/assets/javascripts/cdb/src/geo/geocoders/mapbox_geocoder.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geocoders/mapzen_geocoder.js b/lib/assets/javascripts/cdb/src/geo/geocoders/mapzen_geocoder.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geocoders/mapzen_geocoder.js
rename to lib/assets/javascripts/cdb/src/geo/geocoders/mapzen_geocoder.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geocoders/nokia_geocoder.js b/lib/assets/javascripts/cdb/src/geo/geocoders/nokia_geocoder.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geocoders/nokia_geocoder.js
rename to lib/assets/javascripts/cdb/src/geo/geocoders/nokia_geocoder.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geocoders/tomtom_geocoder.js b/lib/assets/javascripts/cdb/src/geo/geocoders/tomtom_geocoder.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geocoders/tomtom_geocoder.js
rename to lib/assets/javascripts/cdb/src/geo/geocoders/tomtom_geocoder.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geocoders/yahoo_geocoder.js b/lib/assets/javascripts/cdb/src/geo/geocoders/yahoo_geocoder.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geocoders/yahoo_geocoder.js
rename to lib/assets/javascripts/cdb/src/geo/geocoders/yahoo_geocoder.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/geometry.js b/lib/assets/javascripts/cdb/src/geo/geometry.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/geometry.js
rename to lib/assets/javascripts/cdb/src/geo/geometry.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps.geometry.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps.geometry.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps.geometry.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps.geometry.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_base.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_base.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_base.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_base.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_baselayer.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_baselayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_baselayer.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_baselayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_cartodb_layer.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_cartodb_layer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_cartodb_layer.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_cartodb_layer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_cartodb_layergroup.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_cartodb_layergroup.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_cartodb_layergroup.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_cartodb_layergroup.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_plainlayer.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_plainlayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_plainlayer.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_plainlayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_tiledlayer.js b/lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_tiledlayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/gmaps_tiledlayer.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/gmaps_tiledlayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/gmaps/torque.js b/lib/assets/javascripts/cdb/src/geo/gmaps/torque.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/gmaps/torque.js
rename to lib/assets/javascripts/cdb/src/geo/gmaps/torque.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/layer_definition.js b/lib/assets/javascripts/cdb/src/geo/layer_definition.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/layer_definition.js
rename to lib/assets/javascripts/cdb/src/geo/layer_definition.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet.geometry.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet.geometry.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet.geometry.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet.geometry.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_base.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_base.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_base.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_base.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_cartodb_layer.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_cartodb_layer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_cartodb_layer.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_cartodb_layer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_cartodb_layergroup.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_cartodb_layergroup.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_cartodb_layergroup.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_cartodb_layergroup.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_gmaps_tiledlayer.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_gmaps_tiledlayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_gmaps_tiledlayer.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_gmaps_tiledlayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_plainlayer.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_plainlayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_plainlayer.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_plainlayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_tiledlayer.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_tiledlayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_tiledlayer.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_tiledlayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_wmslayer.js b/lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_wmslayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/leaflet_wmslayer.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/leaflet_wmslayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/leaflet/torque.js b/lib/assets/javascripts/cdb/src/geo/leaflet/torque.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/leaflet/torque.js
rename to lib/assets/javascripts/cdb/src/geo/leaflet/torque.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/map.js b/lib/assets/javascripts/cdb/src/geo/map.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/map.js
rename to lib/assets/javascripts/cdb/src/geo/map.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/sublayer.js b/lib/assets/javascripts/cdb/src/geo/sublayer.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/sublayer.js
rename to lib/assets/javascripts/cdb/src/geo/sublayer.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/annotation.js b/lib/assets/javascripts/cdb/src/geo/ui/annotation.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/annotation.js
rename to lib/assets/javascripts/cdb/src/geo/ui/annotation.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/fullscreen.js b/lib/assets/javascripts/cdb/src/geo/ui/fullscreen.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/fullscreen.js
rename to lib/assets/javascripts/cdb/src/geo/ui/fullscreen.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/header.js b/lib/assets/javascripts/cdb/src/geo/ui/header.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/header.js
rename to lib/assets/javascripts/cdb/src/geo/ui/header.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/image.js b/lib/assets/javascripts/cdb/src/geo/ui/image.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/image.js
rename to lib/assets/javascripts/cdb/src/geo/ui/image.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/infobox.js b/lib/assets/javascripts/cdb/src/geo/ui/infobox.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/infobox.js
rename to lib/assets/javascripts/cdb/src/geo/ui/infobox.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/infowindow.js b/lib/assets/javascripts/cdb/src/geo/ui/infowindow.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/infowindow.js
rename to lib/assets/javascripts/cdb/src/geo/ui/infowindow.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/layer_selector.js b/lib/assets/javascripts/cdb/src/geo/ui/layer_selector.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/layer_selector.js
rename to lib/assets/javascripts/cdb/src/geo/ui/layer_selector.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/legend.js b/lib/assets/javascripts/cdb/src/geo/ui/legend.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/legend.js
rename to lib/assets/javascripts/cdb/src/geo/ui/legend.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/mobile.js b/lib/assets/javascripts/cdb/src/geo/ui/mobile.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/mobile.js
rename to lib/assets/javascripts/cdb/src/geo/ui/mobile.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/search.js b/lib/assets/javascripts/cdb/src/geo/ui/search.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/search.js
rename to lib/assets/javascripts/cdb/src/geo/ui/search.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/share.js b/lib/assets/javascripts/cdb/src/geo/ui/share.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/share.js
rename to lib/assets/javascripts/cdb/src/geo/ui/share.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/slides_controller.js b/lib/assets/javascripts/cdb/src/geo/ui/slides_controller.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/slides_controller.js
rename to lib/assets/javascripts/cdb/src/geo/ui/slides_controller.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/switcher.js b/lib/assets/javascripts/cdb/src/geo/ui/switcher.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/switcher.js
rename to lib/assets/javascripts/cdb/src/geo/ui/switcher.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/text.js b/lib/assets/javascripts/cdb/src/geo/ui/text.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/text.js
rename to lib/assets/javascripts/cdb/src/geo/ui/text.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/tiles_loader.js b/lib/assets/javascripts/cdb/src/geo/ui/tiles_loader.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/tiles_loader.js
rename to lib/assets/javascripts/cdb/src/geo/ui/tiles_loader.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/time_slider.js b/lib/assets/javascripts/cdb/src/geo/ui/time_slider.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/time_slider.js
rename to lib/assets/javascripts/cdb/src/geo/ui/time_slider.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/tooltip.js b/lib/assets/javascripts/cdb/src/geo/ui/tooltip.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/tooltip.js
rename to lib/assets/javascripts/cdb/src/geo/ui/tooltip.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/zoom.js b/lib/assets/javascripts/cdb/src/geo/ui/zoom.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/zoom.js
rename to lib/assets/javascripts/cdb/src/geo/ui/zoom.js
diff --git a/lib/assets/javascripts/cdb.js/src/geo/ui/zoom_info.js b/lib/assets/javascripts/cdb/src/geo/ui/zoom_info.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/geo/ui/zoom_info.js
rename to lib/assets/javascripts/cdb/src/geo/ui/zoom_info.js
diff --git a/lib/assets/javascripts/cdb.js/src/loader.js b/lib/assets/javascripts/cdb/src/loader.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/loader.js
rename to lib/assets/javascripts/cdb/src/loader.js
diff --git a/lib/assets/javascripts/cdb.js/src/ui/common/dialog.js b/lib/assets/javascripts/cdb/src/ui/common/dialog.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/ui/common/dialog.js
rename to lib/assets/javascripts/cdb/src/ui/common/dialog.js
diff --git a/lib/assets/javascripts/cdb.js/src/ui/common/dropdown.js b/lib/assets/javascripts/cdb/src/ui/common/dropdown.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/ui/common/dropdown.js
rename to lib/assets/javascripts/cdb/src/ui/common/dropdown.js
diff --git a/lib/assets/javascripts/cdb.js/src/ui/common/notification.js b/lib/assets/javascripts/cdb/src/ui/common/notification.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/ui/common/notification.js
rename to lib/assets/javascripts/cdb/src/ui/common/notification.js
diff --git a/lib/assets/javascripts/cdb.js/src/ui/common/share.js b/lib/assets/javascripts/cdb/src/ui/common/share.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/ui/common/share.js
rename to lib/assets/javascripts/cdb/src/ui/common/share.js
diff --git a/lib/assets/javascripts/cdb.js/src/ui/common/table.js b/lib/assets/javascripts/cdb/src/ui/common/table.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/ui/common/table.js
rename to lib/assets/javascripts/cdb/src/ui/common/table.js
diff --git a/lib/assets/javascripts/cdb.js/src/ui/common/tabpane.js b/lib/assets/javascripts/cdb/src/ui/common/tabpane.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/ui/common/tabpane.js
rename to lib/assets/javascripts/cdb/src/ui/common/tabpane.js
diff --git a/lib/assets/javascripts/cdb.js/src/vis/image.js b/lib/assets/javascripts/cdb/src/vis/image.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/vis/image.js
rename to lib/assets/javascripts/cdb/src/vis/image.js
diff --git a/lib/assets/javascripts/cdb.js/src/vis/layers.js b/lib/assets/javascripts/cdb/src/vis/layers.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/vis/layers.js
rename to lib/assets/javascripts/cdb/src/vis/layers.js
diff --git a/lib/assets/javascripts/cdb.js/src/vis/overlays.js b/lib/assets/javascripts/cdb/src/vis/overlays.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/vis/overlays.js
rename to lib/assets/javascripts/cdb/src/vis/overlays.js
diff --git a/lib/assets/javascripts/cdb.js/src/vis/vis.js b/lib/assets/javascripts/cdb/src/vis/vis.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/src/vis/vis.js
rename to lib/assets/javascripts/cdb/src/vis/vis.js
diff --git a/lib/assets/javascripts/cdb.js/test/SpecRunner-src.html b/lib/assets/javascripts/cdb/test/SpecRunner-src.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/SpecRunner-src.html
rename to lib/assets/javascripts/cdb/test/SpecRunner-src.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/geo/google_maps.html b/lib/assets/javascripts/cdb/test/demos/geo/google_maps.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/geo/google_maps.html
rename to lib/assets/javascripts/cdb/test/demos/geo/google_maps.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/geo/infowindow.tmpl b/lib/assets/javascripts/cdb/test/demos/geo/infowindow.tmpl
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/geo/infowindow.tmpl
rename to lib/assets/javascripts/cdb/test/demos/geo/infowindow.tmpl
diff --git a/lib/assets/javascripts/cdb.js/test/demos/geo/map.html b/lib/assets/javascripts/cdb/test/demos/geo/map.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/geo/map.html
rename to lib/assets/javascripts/cdb/test/demos/geo/map.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/index.html b/lib/assets/javascripts/cdb/test/demos/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/index.html
rename to lib/assets/javascripts/cdb/test/demos/index.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/profiler.html b/lib/assets/javascripts/cdb/test/demos/profiler.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/profiler.html
rename to lib/assets/javascripts/cdb/test/demos/profiler.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/script.html b/lib/assets/javascripts/cdb/test/demos/script.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/script.html
rename to lib/assets/javascripts/cdb/test/demos/script.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/scroll_map.html b/lib/assets/javascripts/cdb/test/demos/scroll_map.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/scroll_map.html
rename to lib/assets/javascripts/cdb/test/demos/scroll_map.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/template.html b/lib/assets/javascripts/cdb/test/demos/template.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/template.html
rename to lib/assets/javascripts/cdb/test/demos/template.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/ui/common/dialog.html b/lib/assets/javascripts/cdb/test/demos/ui/common/dialog.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/ui/common/dialog.html
rename to lib/assets/javascripts/cdb/test/demos/ui/common/dialog.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/ui/common/notification.html b/lib/assets/javascripts/cdb/test/demos/ui/common/notification.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/ui/common/notification.html
rename to lib/assets/javascripts/cdb/test/demos/ui/common/notification.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/ui/common/settings.html b/lib/assets/javascripts/cdb/test/demos/ui/common/settings.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/ui/common/settings.html
rename to lib/assets/javascripts/cdb/test/demos/ui/common/settings.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/ui/common/table.html b/lib/assets/javascripts/cdb/test/demos/ui/common/table.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/ui/common/table.html
rename to lib/assets/javascripts/cdb/test/demos/ui/common/table.html
diff --git a/lib/assets/javascripts/cdb.js/test/demos/vis.html b/lib/assets/javascripts/cdb/test/demos/vis.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/demos/vis.html
rename to lib/assets/javascripts/cdb/test/demos/vis.html
diff --git a/lib/assets/javascripts/cdb.js/test/lib/sinon-1.3.4.js b/lib/assets/javascripts/cdb/test/lib/sinon-1.3.4.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/lib/sinon-1.3.4.js
rename to lib/assets/javascripts/cdb/test/lib/sinon-1.3.4.js
diff --git a/lib/assets/javascripts/cdb.js/test/lib/sinon-ie.js b/lib/assets/javascripts/cdb/test/lib/sinon-ie.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/lib/sinon-ie.js
rename to lib/assets/javascripts/cdb/test/lib/sinon-ie.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/SpecHelper.js b/lib/assets/javascripts/cdb/test/spec/SpecHelper.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/SpecHelper.js
rename to lib/assets/javascripts/cdb/test/spec/SpecHelper.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/api/layers.spec.js b/lib/assets/javascripts/cdb/test/spec/api/layers.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/api/layers.spec.js
rename to lib/assets/javascripts/cdb/test/spec/api/layers.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/api/layers/cartodb.spec.js b/lib/assets/javascripts/cdb/test/spec/api/layers/cartodb.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/api/layers/cartodb.spec.js
rename to lib/assets/javascripts/cdb/test/spec/api/layers/cartodb.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/api/sql.spec.js b/lib/assets/javascripts/cdb/test/spec/api/sql.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/api/sql.spec.js
rename to lib/assets/javascripts/cdb/test/spec/api/sql.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/config.spec.js b/lib/assets/javascripts/cdb/test/spec/core/config.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/config.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/config.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/decorators.spec.js b/lib/assets/javascripts/cdb/test/spec/core/decorators.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/decorators.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/decorators.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/image.spec.js b/lib/assets/javascripts/cdb/test/spec/core/image.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/image.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/image.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/log.spec.js b/lib/assets/javascripts/cdb/test/spec/core/log.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/log.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/log.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/model.spec.js b/lib/assets/javascripts/cdb/test/spec/core/model.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/model.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/model.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/sanitize.spec.js b/lib/assets/javascripts/cdb/test/spec/core/sanitize.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/sanitize.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/sanitize.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/template.spec.js b/lib/assets/javascripts/cdb/test/spec/core/template.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/template.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/template.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/util.spec.js b/lib/assets/javascripts/cdb/test/spec/core/util.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/util.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/util.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/core/view.spec.js b/lib/assets/javascripts/cdb/test/spec/core/view.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/core/view.spec.js
rename to lib/assets/javascripts/cdb/test/spec/core/view.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/common.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/common.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/common.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/common.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/geometry.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/geometry.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/geometry.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/geometry.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/gmaps/gmaps.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/gmaps/gmaps.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/gmaps/gmaps.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/gmaps/gmaps.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/hide.js b/lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/hide.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/hide.js
rename to lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/hide.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/interaction.js b/lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/interaction.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/interaction.js
rename to lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/interaction.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/opacity.js b/lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/opacity.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/opacity.js
rename to lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/opacity.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/show.js b/lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/show.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/gmaps_cartodb_layer/show.js
rename to lib/assets/javascripts/cdb/test/spec/geo/gmaps_cartodb_layer/show.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/layer_definition.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/layer_definition.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/layer_definition.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/layer_definition.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/leaflet/leaflet.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/leaflet/leaflet.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/leaflet/leaflet.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/leaflet/leaflet.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/map.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/map.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/map.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/map.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/overlays/annotation.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/overlays/annotation.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/overlays/annotation.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/overlays/annotation.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/sublayer.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/sublayer.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/sublayer.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/sublayer.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/header.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/header.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/header.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/header.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/infobox.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/infobox.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/infobox.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/infobox.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/infowindow.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/infowindow.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/infowindow.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/infowindow.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/layer_selector.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/layer_selector.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/layer_selector.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/layer_selector.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/legend.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/legend.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/legend.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/legend.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/mobile.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/mobile.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/mobile.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/mobile.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/search.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/search.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/search.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/search.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/time_slider.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/time_slider.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/time_slider.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/time_slider.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/geo/ui/tooltip.spec.js b/lib/assets/javascripts/cdb/test/spec/geo/ui/tooltip.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/geo/ui/tooltip.spec.js
rename to lib/assets/javascripts/cdb/test/spec/geo/ui/tooltip.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/ui/common/dialog.spec.js b/lib/assets/javascripts/cdb/test/spec/ui/common/dialog.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/ui/common/dialog.spec.js
rename to lib/assets/javascripts/cdb/test/spec/ui/common/dialog.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/ui/common/dropdown.spec.js b/lib/assets/javascripts/cdb/test/spec/ui/common/dropdown.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/ui/common/dropdown.spec.js
rename to lib/assets/javascripts/cdb/test/spec/ui/common/dropdown.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/ui/common/notification.spec.js b/lib/assets/javascripts/cdb/test/spec/ui/common/notification.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/ui/common/notification.spec.js
rename to lib/assets/javascripts/cdb/test/spec/ui/common/notification.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/ui/common/table.spec.js b/lib/assets/javascripts/cdb/test/spec/ui/common/table.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/ui/common/table.spec.js
rename to lib/assets/javascripts/cdb/test/spec/ui/common/table.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/ui/common/tabpane.spec.js b/lib/assets/javascripts/cdb/test/spec/ui/common/tabpane.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/ui/common/tabpane.spec.js
rename to lib/assets/javascripts/cdb/test/spec/ui/common/tabpane.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/vis/layers.spec.js b/lib/assets/javascripts/cdb/test/spec/vis/layers.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/vis/layers.spec.js
rename to lib/assets/javascripts/cdb/test/spec/vis/layers.spec.js
diff --git a/lib/assets/javascripts/cdb.js/test/spec/vis/vis.spec.js b/lib/assets/javascripts/cdb/test/spec/vis/vis.spec.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/test/spec/vis/vis.spec.js
rename to lib/assets/javascripts/cdb/test/spec/vis/vis.spec.js
diff --git a/lib/assets/javascripts/cdb.js/themes/css/ie/dummy.css b/lib/assets/javascripts/cdb/themes/css/ie/dummy.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/ie/dummy.css
rename to lib/assets/javascripts/cdb/themes/css/ie/dummy.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/layers-2x.png b/lib/assets/javascripts/cdb/themes/css/images/layers-2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/layers-2x.png
rename to lib/assets/javascripts/cdb/themes/css/images/layers-2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/layers.png b/lib/assets/javascripts/cdb/themes/css/images/layers.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/layers.png
rename to lib/assets/javascripts/cdb/themes/css/images/layers.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/marker-icon-2x.png b/lib/assets/javascripts/cdb/themes/css/images/marker-icon-2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/marker-icon-2x.png
rename to lib/assets/javascripts/cdb/themes/css/images/marker-icon-2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/marker-icon.png b/lib/assets/javascripts/cdb/themes/css/images/marker-icon.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/marker-icon.png
rename to lib/assets/javascripts/cdb/themes/css/images/marker-icon.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/marker-shadow.png b/lib/assets/javascripts/cdb/themes/css/images/marker-shadow.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/marker-shadow.png
rename to lib/assets/javascripts/cdb/themes/css/images/marker-shadow.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/zoom-in.png b/lib/assets/javascripts/cdb/themes/css/images/zoom-in.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/zoom-in.png
rename to lib/assets/javascripts/cdb/themes/css/images/zoom-in.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/images/zoom-out.png b/lib/assets/javascripts/cdb/themes/css/images/zoom-out.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/images/zoom-out.png
rename to lib/assets/javascripts/cdb/themes/css/images/zoom-out.png
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-dark.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-dark.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-dark.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-dark.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-default.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-default.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-default.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-default.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-blue.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-blue.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-blue.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-blue.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-default.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-default.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-default.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-default.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-green.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-green.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-green.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-green.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-orange.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-orange.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-orange.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-orange.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-with-image.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-with-image.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-with-image.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-with-image.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-yellow.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-yellow.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-header-yellow.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-header-yellow.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-light.css b/lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-light.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/infowindow/cartodb-infowindow-light.css
rename to lib/assets/javascripts/cdb/themes/css/infowindow/cartodb-infowindow-light.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/map/cartodb-map-light.css b/lib/assets/javascripts/cdb/themes/css/map/cartodb-map-light.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/map/cartodb-map-light.css
rename to lib/assets/javascripts/cdb/themes/css/map/cartodb-map-light.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/map/cartodb-slider.css b/lib/assets/javascripts/cdb/themes/css/map/cartodb-slider.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/map/cartodb-slider.css
rename to lib/assets/javascripts/cdb/themes/css/map/cartodb-slider.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/map/leaflet.css b/lib/assets/javascripts/cdb/themes/css/map/leaflet.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/map/leaflet.css
rename to lib/assets/javascripts/cdb/themes/css/map/leaflet.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/tooltip/cartodb-tooltip-dark.css b/lib/assets/javascripts/cdb/themes/css/tooltip/cartodb-tooltip-dark.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/tooltip/cartodb-tooltip-dark.css
rename to lib/assets/javascripts/cdb/themes/css/tooltip/cartodb-tooltip-dark.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/tooltip/cartodb-tooltip-default.css b/lib/assets/javascripts/cdb/themes/css/tooltip/cartodb-tooltip-default.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/tooltip/cartodb-tooltip-default.css
rename to lib/assets/javascripts/cdb/themes/css/tooltip/cartodb-tooltip-default.css
diff --git a/lib/assets/javascripts/cdb.js/themes/css/tooltip/cartodb-tooltip-light.css b/lib/assets/javascripts/cdb/themes/css/tooltip/cartodb-tooltip-light.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/css/tooltip/cartodb-tooltip-light.css
rename to lib/assets/javascripts/cdb/themes/css/tooltip/cartodb-tooltip-light.css
diff --git a/lib/assets/javascripts/cdb.js/themes/img/bg-attribution-button.png b/lib/assets/javascripts/cdb/themes/img/bg-attribution-button.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/bg-attribution-button.png
rename to lib/assets/javascripts/cdb/themes/img/bg-attribution-button.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/bubbles.png b/lib/assets/javascripts/cdb/themes/img/bubbles.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/bubbles.png
rename to lib/assets/javascripts/cdb/themes/img/bubbles.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/burguer.png b/lib/assets/javascripts/cdb/themes/img/burguer.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/burguer.png
rename to lib/assets/javascripts/cdb/themes/img/burguer.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/burguer@2x.png b/lib/assets/javascripts/cdb/themes/img/burguer@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/burguer@2x.png
rename to lib/assets/javascripts/cdb/themes/img/burguer@2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/dark.png b/lib/assets/javascripts/cdb/themes/img/dark.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/dark.png
rename to lib/assets/javascripts/cdb/themes/img/dark.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/dark_bubbles.png b/lib/assets/javascripts/cdb/themes/img/dark_bubbles.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/dark_bubbles.png
rename to lib/assets/javascripts/cdb/themes/img/dark_bubbles.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/dark_loader.gif b/lib/assets/javascripts/cdb/themes/img/dark_loader.gif
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/dark_loader.gif
rename to lib/assets/javascripts/cdb/themes/img/dark_loader.gif
diff --git a/lib/assets/javascripts/cdb.js/themes/img/dark_loader@2x.gif b/lib/assets/javascripts/cdb/themes/img/dark_loader@2x.gif
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/dark_loader@2x.gif
rename to lib/assets/javascripts/cdb/themes/img/dark_loader@2x.gif
diff --git a/lib/assets/javascripts/cdb.js/themes/img/facebook.png b/lib/assets/javascripts/cdb/themes/img/facebook.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/facebook.png
rename to lib/assets/javascripts/cdb/themes/img/facebook.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/fullscreen.png b/lib/assets/javascripts/cdb/themes/img/fullscreen.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/fullscreen.png
rename to lib/assets/javascripts/cdb/themes/img/fullscreen.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/fullscreen_mobile.png b/lib/assets/javascripts/cdb/themes/img/fullscreen_mobile.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/fullscreen_mobile.png
rename to lib/assets/javascripts/cdb/themes/img/fullscreen_mobile.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/handle.png b/lib/assets/javascripts/cdb/themes/img/handle.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/handle.png
rename to lib/assets/javascripts/cdb/themes/img/handle.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/handle@2x.png b/lib/assets/javascripts/cdb/themes/img/handle@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/handle@2x.png
rename to lib/assets/javascripts/cdb/themes/img/handle@2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/headers.png b/lib/assets/javascripts/cdb/themes/img/headers.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/headers.png
rename to lib/assets/javascripts/cdb/themes/img/headers.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/image_not_found.png b/lib/assets/javascripts/cdb/themes/img/image_not_found.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/image_not_found.png
rename to lib/assets/javascripts/cdb/themes/img/image_not_found.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/light.png b/lib/assets/javascripts/cdb/themes/img/light.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/light.png
rename to lib/assets/javascripts/cdb/themes/img/light.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/link.png b/lib/assets/javascripts/cdb/themes/img/link.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/link.png
rename to lib/assets/javascripts/cdb/themes/img/link.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/loader.gif b/lib/assets/javascripts/cdb/themes/img/loader.gif
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/loader.gif
rename to lib/assets/javascripts/cdb/themes/img/loader.gif
diff --git a/lib/assets/javascripts/cdb.js/themes/img/loader@2x.gif b/lib/assets/javascripts/cdb/themes/img/loader@2x.gif
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/loader@2x.gif
rename to lib/assets/javascripts/cdb/themes/img/loader@2x.gif
diff --git a/lib/assets/javascripts/cdb.js/themes/img/mobile_zoom.png b/lib/assets/javascripts/cdb/themes/img/mobile_zoom.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/mobile_zoom.png
rename to lib/assets/javascripts/cdb/themes/img/mobile_zoom.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/other.png b/lib/assets/javascripts/cdb/themes/img/other.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/other.png
rename to lib/assets/javascripts/cdb/themes/img/other.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/other@2x.png b/lib/assets/javascripts/cdb/themes/img/other@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/other@2x.png
rename to lib/assets/javascripts/cdb/themes/img/other@2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/shadow.png b/lib/assets/javascripts/cdb/themes/img/shadow.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/shadow.png
rename to lib/assets/javascripts/cdb/themes/img/shadow.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/share.png b/lib/assets/javascripts/cdb/themes/img/share.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/share.png
rename to lib/assets/javascripts/cdb/themes/img/share.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/share@2x.png b/lib/assets/javascripts/cdb/themes/img/share@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/share@2x.png
rename to lib/assets/javascripts/cdb/themes/img/share@2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/slide_left.png b/lib/assets/javascripts/cdb/themes/img/slide_left.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/slide_left.png
rename to lib/assets/javascripts/cdb/themes/img/slide_left.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/slide_left@2x.png b/lib/assets/javascripts/cdb/themes/img/slide_left@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/slide_left@2x.png
rename to lib/assets/javascripts/cdb/themes/img/slide_left@2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/slide_right.png b/lib/assets/javascripts/cdb/themes/img/slide_right.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/slide_right.png
rename to lib/assets/javascripts/cdb/themes/img/slide_right.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/slide_right@2x.png b/lib/assets/javascripts/cdb/themes/img/slide_right@2x.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/slide_right@2x.png
rename to lib/assets/javascripts/cdb/themes/img/slide_right@2x.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/slider.png b/lib/assets/javascripts/cdb/themes/img/slider.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/slider.png
rename to lib/assets/javascripts/cdb/themes/img/slider.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/toggle_aside.png b/lib/assets/javascripts/cdb/themes/img/toggle_aside.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/toggle_aside.png
rename to lib/assets/javascripts/cdb/themes/img/toggle_aside.png
diff --git a/lib/assets/javascripts/cdb.js/themes/img/twitter.png b/lib/assets/javascripts/cdb/themes/img/twitter.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/themes/img/twitter.png
rename to lib/assets/javascripts/cdb/themes/img/twitter.png
diff --git a/lib/assets/javascripts/cdb.js/vendor/GeoJSON.js b/lib/assets/javascripts/cdb/vendor/GeoJSON.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/GeoJSON.js
rename to lib/assets/javascripts/cdb/vendor/GeoJSON.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/backbone.js b/lib/assets/javascripts/cdb/vendor/backbone.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/backbone.js
rename to lib/assets/javascripts/cdb/vendor/backbone.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/html-css-sanitizer-bundle.js b/lib/assets/javascripts/cdb/vendor/html-css-sanitizer-bundle.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/html-css-sanitizer-bundle.js
rename to lib/assets/javascripts/cdb/vendor/html-css-sanitizer-bundle.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/jquery.min.js b/lib/assets/javascripts/cdb/vendor/jquery.min.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/jquery.min.js
rename to lib/assets/javascripts/cdb/vendor/jquery.min.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/jscrollpane.js b/lib/assets/javascripts/cdb/vendor/jscrollpane.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/jscrollpane.js
rename to lib/assets/javascripts/cdb/vendor/jscrollpane.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/json2.js b/lib/assets/javascripts/cdb/vendor/json2.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/json2.js
rename to lib/assets/javascripts/cdb/vendor/json2.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/leaflet.js b/lib/assets/javascripts/cdb/vendor/leaflet.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/leaflet.js
rename to lib/assets/javascripts/cdb/vendor/leaflet.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/lzma.js b/lib/assets/javascripts/cdb/vendor/lzma.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/lzma.js
rename to lib/assets/javascripts/cdb/vendor/lzma.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/carto.js b/lib/assets/javascripts/cdb/vendor/mod/carto.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/carto.js
rename to lib/assets/javascripts/cdb/vendor/mod/carto.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.core.js b/lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.core.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.core.js
rename to lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.core.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.mouse.js b/lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.mouse.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.mouse.js
rename to lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.mouse.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.slider.js b/lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.slider.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.slider.js
rename to lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.slider.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.widget.js b/lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.widget.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/jquery-ui/jquery.ui.widget.js
rename to lib/assets/javascripts/cdb/vendor/mod/jquery-ui/jquery.ui.widget.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/odyssey.js b/lib/assets/javascripts/cdb/vendor/mod/odyssey.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/odyssey.js
rename to lib/assets/javascripts/cdb/vendor/mod/odyssey.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/torque.cartodb.js b/lib/assets/javascripts/cdb/vendor/mod/torque.cartodb.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/torque.cartodb.js
rename to lib/assets/javascripts/cdb/vendor/mod/torque.cartodb.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mod/torque.uncompressed.js b/lib/assets/javascripts/cdb/vendor/mod/torque.uncompressed.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mod/torque.uncompressed.js
rename to lib/assets/javascripts/cdb/vendor/mod/torque.uncompressed.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mousewheel.js b/lib/assets/javascripts/cdb/vendor/mousewheel.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mousewheel.js
rename to lib/assets/javascripts/cdb/vendor/mousewheel.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mustache.js b/lib/assets/javascripts/cdb/vendor/mustache.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mustache.js
rename to lib/assets/javascripts/cdb/vendor/mustache.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/mwheelIntent.js b/lib/assets/javascripts/cdb/vendor/mwheelIntent.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/mwheelIntent.js
rename to lib/assets/javascripts/cdb/vendor/mwheelIntent.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/reqwest.min.js b/lib/assets/javascripts/cdb/vendor/reqwest.min.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/reqwest.min.js
rename to lib/assets/javascripts/cdb/vendor/reqwest.min.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/spin.js b/lib/assets/javascripts/cdb/vendor/spin.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/spin.js
rename to lib/assets/javascripts/cdb/vendor/spin.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/underscore-min.js b/lib/assets/javascripts/cdb/vendor/underscore-min.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/underscore-min.js
rename to lib/assets/javascripts/cdb/vendor/underscore-min.js
diff --git a/lib/assets/javascripts/cdb.js/vendor/wax.cartodb.js b/lib/assets/javascripts/cdb/vendor/wax.cartodb.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/vendor/wax.cartodb.js
rename to lib/assets/javascripts/cdb/vendor/wax.cartodb.js
diff --git a/lib/assets/javascripts/cdb.js/www/404.html b/lib/assets/javascripts/cdb/www/404.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/404.html
rename to lib/assets/javascripts/cdb/www/404.html
diff --git a/lib/assets/javascripts/cdb.js/www/README.md b/lib/assets/javascripts/cdb/www/README.md
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/README.md
rename to lib/assets/javascripts/cdb/www/README.md
diff --git a/lib/assets/javascripts/cdb.js/www/_scss/main.scss b/lib/assets/javascripts/cdb/www/_scss/main.scss
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/_scss/main.scss
rename to lib/assets/javascripts/cdb/www/_scss/main.scss
diff --git a/lib/assets/javascripts/cdb.js/www/_scss/vendor/codemirror.scss b/lib/assets/javascripts/cdb/www/_scss/vendor/codemirror.scss
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/_scss/vendor/codemirror.scss
rename to lib/assets/javascripts/cdb/www/_scss/vendor/codemirror.scss
diff --git a/lib/assets/javascripts/cdb.js/www/css/main.css b/lib/assets/javascripts/cdb/www/css/main.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/css/main.css
rename to lib/assets/javascripts/cdb/www/css/main.css
diff --git a/lib/assets/javascripts/cdb.js/www/css/vendor/codemirror.css b/lib/assets/javascripts/cdb/www/css/vendor/codemirror.css
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/css/vendor/codemirror.css
rename to lib/assets/javascripts/cdb/www/css/vendor/codemirror.css
diff --git a/lib/assets/javascripts/cdb.js/www/examples/index.html b/lib/assets/javascripts/cdb/www/examples/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/examples/index.html
rename to lib/assets/javascripts/cdb/www/examples/index.html
diff --git a/lib/assets/javascripts/cdb.js/www/img/cbdbui-lib/menu.png b/lib/assets/javascripts/cdb/www/img/cbdbui-lib/menu.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/img/cbdbui-lib/menu.png
rename to lib/assets/javascripts/cdb/www/img/cbdbui-lib/menu.png
diff --git a/lib/assets/javascripts/cdb.js/www/img/cbdbui-lib/menu.svg b/lib/assets/javascripts/cdb/www/img/cbdbui-lib/menu.svg
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/img/cbdbui-lib/menu.svg
rename to lib/assets/javascripts/cdb/www/img/cbdbui-lib/menu.svg
diff --git a/lib/assets/javascripts/cdb.js/www/img/favicon.ico b/lib/assets/javascripts/cdb/www/img/favicon.ico
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/img/favicon.ico
rename to lib/assets/javascripts/cdb/www/img/favicon.ico
diff --git a/lib/assets/javascripts/cdb.js/www/img/footer-brand.png b/lib/assets/javascripts/cdb/www/img/footer-brand.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/img/footer-brand.png
rename to lib/assets/javascripts/cdb/www/img/footer-brand.png
diff --git a/lib/assets/javascripts/cdb.js/www/img/header-bg.png b/lib/assets/javascripts/cdb/www/img/header-bg.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/img/header-bg.png
rename to lib/assets/javascripts/cdb/www/img/header-bg.png
diff --git a/lib/assets/javascripts/cdb.js/www/img/thumbnail.png b/lib/assets/javascripts/cdb/www/img/thumbnail.png
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/img/thumbnail.png
rename to lib/assets/javascripts/cdb/www/img/thumbnail.png
diff --git a/lib/assets/javascripts/cdb.js/www/index.html b/lib/assets/javascripts/cdb/www/index.html
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/index.html
rename to lib/assets/javascripts/cdb/www/index.html
diff --git a/lib/assets/javascripts/cdb.js/www/js/app.js b/lib/assets/javascripts/cdb/www/js/app.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/js/app.js
rename to lib/assets/javascripts/cdb/www/js/app.js
diff --git a/lib/assets/javascripts/cdb.js/www/js/main.js b/lib/assets/javascripts/cdb/www/js/main.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/js/main.js
rename to lib/assets/javascripts/cdb/www/js/main.js
diff --git a/lib/assets/javascripts/cdb.js/www/js/vendor/codemirror.js b/lib/assets/javascripts/cdb/www/js/vendor/codemirror.js
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/js/vendor/codemirror.js
rename to lib/assets/javascripts/cdb/www/js/vendor/codemirror.js
diff --git a/lib/assets/javascripts/cdb.js/www/robots.txt b/lib/assets/javascripts/cdb/www/robots.txt
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/robots.txt
rename to lib/assets/javascripts/cdb/www/robots.txt
diff --git a/lib/assets/javascripts/cdb.js/www/sitemap.xml b/lib/assets/javascripts/cdb/www/sitemap.xml
similarity index 100%
rename from lib/assets/javascripts/cdb.js/www/sitemap.xml
rename to lib/assets/javascripts/cdb/www/sitemap.xml