diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 79cc07522a..bc2a8c13c0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -83,7 +83,7 @@ There are two test suites: one for the old Editor and one for Builder.
The old Editor specs reside in `lib/assets/test/spec/cartodb`.
-The core Builder specs reside in `lib/assets/test/spec/cartodb3`.
+The core Builder specs reside in `lib/assets/test/spec/builder`.
#### Running all tests
diff --git a/Gruntfile.js b/Gruntfile.js
index 1ca00752e8..edf498d8bd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -266,8 +266,8 @@ module.exports = function (grunt) {
'copy:app',
'copy:css_cartodb',
'compass',
- 'copy:css_vendor_cartodb3',
- 'copy:css_cartodb3',
+ 'copy:css_vendor_builder',
+ 'copy:css_builder',
'sass',
'concat:css'
]);
diff --git a/NEWS.md b/NEWS.md
index 5b34f58b82..cc2a8ae3d8 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -139,6 +139,7 @@ ion for time-series (#12670)
* Use carto.js v4.0.0-beta.13
### Bug fixes / enhancements
+* Rename 'cartodb3' to 'builder'
* Fix select geometries dropdown in JOIN analysis ([Support#1281](https://github.com/CartoDB/support/issues/1281))
* Fix IE11 Drag&Drop ([Support#876](https://github.com/CartoDB/support/issues/876))
* Removed references to analytics JS files in static pages (#13543)
diff --git a/app/controllers/carto/api/infowindow_migrator.rb b/app/controllers/carto/api/infowindow_migrator.rb
index 88c7380b27..1f052d640d 100644
--- a/app/controllers/carto/api/infowindow_migrator.rb
+++ b/app/controllers/carto/api/infowindow_migrator.rb
@@ -1,7 +1,7 @@
module Carto
module Api
module InfowindowMigrator
- MUSTACHE_ROOT_PATH = 'lib/assets/javascripts/cartodb3/mustache-templates'.freeze
+ MUSTACHE_ROOT_PATH = 'lib/assets/javascripts/builder/mustache-templates'.freeze
def migrate_builder_infowindow(templated_element, mustache_dir: 'infowindows')
return nil if templated_element.nil?
diff --git a/builder_specs.html b/builder_specs.html
index 29a49b44f0..c3d50c214f 100644
--- a/builder_specs.html
+++ b/builder_specs.html
@@ -36,7 +36,7 @@
Builder specs ( available if running
grunt test:browser
)
diff --git a/lib/assets/javascripts/cartodb3/app-notifications.js b/lib/assets/javascripts/builder/app-notifications.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/app-notifications.js
rename to lib/assets/javascripts/builder/app-notifications.js
diff --git a/lib/assets/javascripts/cartodb3/cartocss-notifications.js b/lib/assets/javascripts/builder/cartocss-notifications.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/cartocss-notifications.js
rename to lib/assets/javascripts/builder/cartocss-notifications.js
index 657288ad25..7527d8ed75 100755
--- a/lib/assets/javascripts/cartodb3/cartocss-notifications.js
+++ b/lib/assets/javascripts/builder/cartocss-notifications.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var Notifier = require('builder/components/notifier/notifier');
var NOTIFICATION_ERROR_TEMPLATE = _.template("
<%- title %>");
var NOTIFICATION_PREFIX = 'cartocss-notification-';
diff --git a/lib/assets/javascripts/cartodb3/components/apply-button/apply-button-view.js b/lib/assets/javascripts/builder/components/apply-button/apply-button-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/apply-button/apply-button-view.js
rename to lib/assets/javascripts/builder/components/apply-button/apply-button-view.js
index 0e79f5bbc4..bb0a8ba3e3 100755
--- a/lib/assets/javascripts/cartodb3/components/apply-button/apply-button-view.js
+++ b/lib/assets/javascripts/builder/components/apply-button/apply-button-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./apply-button.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'onApplyClick',
diff --git a/lib/assets/javascripts/cartodb3/components/apply-button/apply-button.tpl b/lib/assets/javascripts/builder/components/apply-button/apply-button.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/apply-button/apply-button.tpl
rename to lib/assets/javascripts/builder/components/apply-button/apply-button.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/background-import-item-view.js b/lib/assets/javascripts/builder/components/background-importer/background-import-item-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/background-importer/background-import-item-view.js
rename to lib/assets/javascripts/builder/components/background-importer/background-import-item-view.js
index 96e6f998b5..9e05ef8046 100755
--- a/lib/assets/javascripts/cartodb3/components/background-importer/background-import-item-view.js
+++ b/lib/assets/javascripts/builder/components/background-importer/background-import-item-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var UploadConfig = require('cartodb3/config/upload-config');
+var Notifier = require('builder/components/notifier/notifier');
+var UploadConfig = require('builder/config/upload-config');
var ErrorDetailsView = require('./error-details-view');
var WarningsDetailsView = require('./warnings-details-view');
var TwitterImportDetailsDialog = require('./twitter-import-details-view');
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/background-import-item.tpl b/lib/assets/javascripts/builder/components/background-importer/background-import-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/background-import-item.tpl
rename to lib/assets/javascripts/builder/components/background-importer/background-import-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/background-import-limit-view.js b/lib/assets/javascripts/builder/components/background-importer/background-import-limit-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/background-importer/background-import-limit-view.js
rename to lib/assets/javascripts/builder/components/background-importer/background-import-limit-view.js
index d2610b2999..d079429170 100755
--- a/lib/assets/javascripts/cartodb3/components/background-importer/background-import-limit-view.js
+++ b/lib/assets/javascripts/builder/components/background-importer/background-import-limit-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./background-import-limit.tpl');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var Notifier = require('builder/components/notifier/notifier');
/**
* Import limit message within background importer
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/background-import-limit.tpl b/lib/assets/javascripts/builder/components/background-importer/background-import-limit.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/background-import-limit.tpl
rename to lib/assets/javascripts/builder/components/background-importer/background-import-limit.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/background-importer.js b/lib/assets/javascripts/builder/components/background-importer/background-importer.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/background-importer/background-importer.js
rename to lib/assets/javascripts/builder/components/background-importer/background-importer.js
index 66c14094d1..34623dfb03 100755
--- a/lib/assets/javascripts/cartodb3/components/background-importer/background-importer.js
+++ b/lib/assets/javascripts/builder/components/background-importer/background-importer.js
@@ -2,7 +2,7 @@ var Backbone = require('backbone');
var _ = require('underscore');
var ImportItemView = require('./background-import-item-view');
var ImportLimitItemView = require('./background-import-limit-view');
-var ImportsModel = require('cartodb3/data/background-importer/imports-model');
+var ImportsModel = require('builder/data/background-importer/imports-model');
/**
* Background polling manager
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/failed.js b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/failed.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/failed.js
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/failed.js
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/failed.tpl b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/failed.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/failed.tpl
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/failed.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/loading.js b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/loading.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/loading.js
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/loading.js
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/loading.tpl b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/loading.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/loading.tpl
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/loading.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/success.js b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/success.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/success.js
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/success.js
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/success.tpl b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/success.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/success.tpl
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/success.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/warnings.js b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/warnings.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/warnings.js
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/warnings.js
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/warnings.tpl b/lib/assets/javascripts/builder/components/background-importer/delegated-import-views/warnings.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/delegated-import-views/warnings.tpl
rename to lib/assets/javascripts/builder/components/background-importer/delegated-import-views/warnings.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/error-details-view.js b/lib/assets/javascripts/builder/components/background-importer/error-details-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/error-details-view.js
rename to lib/assets/javascripts/builder/components/background-importer/error-details-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/error-details.tpl b/lib/assets/javascripts/builder/components/background-importer/error-details.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/error-details.tpl
rename to lib/assets/javascripts/builder/components/background-importer/error-details.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/twitter-import-details-view.js b/lib/assets/javascripts/builder/components/background-importer/twitter-import-details-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/background-importer/twitter-import-details-view.js
rename to lib/assets/javascripts/builder/components/background-importer/twitter-import-details-view.js
index c54021d4a3..d1bc838656 100755
--- a/lib/assets/javascripts/cartodb3/components/background-importer/twitter-import-details-view.js
+++ b/lib/assets/javascripts/builder/components/background-importer/twitter-import-details-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var template = require('./twitter-import-details.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl b/lib/assets/javascripts/builder/components/background-importer/twitter-import-details.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl
rename to lib/assets/javascripts/builder/components/background-importer/twitter-import-details.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/upgrade-errors.tpl b/lib/assets/javascripts/builder/components/background-importer/upgrade-errors.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/upgrade-errors.tpl
rename to lib/assets/javascripts/builder/components/background-importer/upgrade-errors.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/warning-partial-import-details.tpl b/lib/assets/javascripts/builder/components/background-importer/warning-partial-import-details.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/warning-partial-import-details.tpl
rename to lib/assets/javascripts/builder/components/background-importer/warning-partial-import-details.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/warning-too-many-files-details.tpl b/lib/assets/javascripts/builder/components/background-importer/warning-too-many-files-details.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/warning-too-many-files-details.tpl
rename to lib/assets/javascripts/builder/components/background-importer/warning-too-many-files-details.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/warning-too-many-rows-connector-details.tpl b/lib/assets/javascripts/builder/components/background-importer/warning-too-many-rows-connector-details.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/warning-too-many-rows-connector-details.tpl
rename to lib/assets/javascripts/builder/components/background-importer/warning-too-many-rows-connector-details.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/background-importer/warnings-details-view.js b/lib/assets/javascripts/builder/components/background-importer/warnings-details-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/background-importer/warnings-details-view.js
rename to lib/assets/javascripts/builder/components/background-importer/warnings-details-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/carousel-form-view.js b/lib/assets/javascripts/builder/components/carousel-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/carousel-form-view.js
rename to lib/assets/javascripts/builder/components/carousel-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/cartocss.code-mirror.js b/lib/assets/javascripts/builder/components/code-mirror/cartocss.code-mirror.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/cartocss.code-mirror.js
rename to lib/assets/javascripts/builder/components/code-mirror/cartocss.code-mirror.js
index bb386c21b2..3243da8f66 100755
--- a/lib/assets/javascripts/cartodb3/components/code-mirror/cartocss.code-mirror.js
+++ b/lib/assets/javascripts/builder/components/code-mirror/cartocss.code-mirror.js
@@ -1,4 +1,4 @@
-var COLOR_KEYWORDS = require('cartodb3/helpers/color-keywords');
+var COLOR_KEYWORDS = require('builder/helpers/color-keywords');
/*
LESS mode - http://www.lesscss.org/
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror-bullet.tpl b/lib/assets/javascripts/builder/components/code-mirror/code-mirror-bullet.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror-bullet.tpl
rename to lib/assets/javascripts/builder/components/code-mirror/code-mirror-bullet.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror-error.tpl b/lib/assets/javascripts/builder/components/code-mirror/code-mirror-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror-error.tpl
rename to lib/assets/javascripts/builder/components/code-mirror/code-mirror-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror-view.js b/lib/assets/javascripts/builder/components/code-mirror/code-mirror-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror-view.js
rename to lib/assets/javascripts/builder/components/code-mirror/code-mirror-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror.tpl b/lib/assets/javascripts/builder/components/code-mirror/code-mirror.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/code-mirror.tpl
rename to lib/assets/javascripts/builder/components/code-mirror/code-mirror.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/colorpicker.code-mirror.js b/lib/assets/javascripts/builder/components/code-mirror/colorpicker.code-mirror.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/colorpicker.code-mirror.js
rename to lib/assets/javascripts/builder/components/code-mirror/colorpicker.code-mirror.js
index cbb8141745..8727c92f9f 100644
--- a/lib/assets/javascripts/cartodb3/components/code-mirror/colorpicker.code-mirror.js
+++ b/lib/assets/javascripts/builder/components/code-mirror/colorpicker.code-mirror.js
@@ -1,8 +1,8 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var _ = require('underscore');
-var ColorPicker = require('cartodb3/components/form-components/editors/fill/color-picker/color-picker.js');
-var COLOR_KEYWORDS = require('cartodb3/helpers/color-keywords');
+var ColorPicker = require('builder/components/form-components/editors/fill/color-picker/color-picker.js');
+var COLOR_KEYWORDS = require('builder/helpers/color-keywords');
/**
* Show color picker when user clicks over
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/hint/custom-list-hint.js b/lib/assets/javascripts/builder/components/code-mirror/hint/custom-list-hint.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/hint/custom-list-hint.js
rename to lib/assets/javascripts/builder/components/code-mirror/hint/custom-list-hint.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/mode/mustache.js b/lib/assets/javascripts/builder/components/code-mirror/mode/mustache.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/mode/mustache.js
rename to lib/assets/javascripts/builder/components/code-mirror/mode/mustache.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/mode/sql.js b/lib/assets/javascripts/builder/components/code-mirror/mode/sql.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/mode/sql.js
rename to lib/assets/javascripts/builder/components/code-mirror/mode/sql.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/placeholder.code-mirror.js b/lib/assets/javascripts/builder/components/code-mirror/placeholder.code-mirror.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/placeholder.code-mirror.js
rename to lib/assets/javascripts/builder/components/code-mirror/placeholder.code-mirror.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/scroll.code-mirror.js b/lib/assets/javascripts/builder/components/code-mirror/scroll.code-mirror.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/scroll.code-mirror.js
rename to lib/assets/javascripts/builder/components/code-mirror/scroll.code-mirror.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/searchcursor.code-mirror.js b/lib/assets/javascripts/builder/components/code-mirror/searchcursor.code-mirror.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/searchcursor.code-mirror.js
rename to lib/assets/javascripts/builder/components/code-mirror/searchcursor.code-mirror.js
diff --git a/lib/assets/javascripts/cartodb3/components/code-mirror/show-hint.code-mirror.js b/lib/assets/javascripts/builder/components/code-mirror/show-hint.code-mirror.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/code-mirror/show-hint.code-mirror.js
rename to lib/assets/javascripts/builder/components/code-mirror/show-hint.code-mirror.js
diff --git a/lib/assets/javascripts/cartodb3/components/context-menu-factory-view.js b/lib/assets/javascripts/builder/components/context-menu-factory-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/context-menu-factory-view.js
rename to lib/assets/javascripts/builder/components/context-menu-factory-view.js
index 57b8131196..b378eccad5 100755
--- a/lib/assets/javascripts/cartodb3/components/context-menu-factory-view.js
+++ b/lib/assets/javascripts/builder/components/context-menu-factory-view.js
@@ -2,7 +2,7 @@ var CoreView = require('backbone/core-view');
var ContextMenuView = require('./context-menu/context-menu-view');
var CustomListCollection = require('./custom-list/custom-list-collection');
var template = require('./context-menu-factory.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var TipsyTooltipView = require('./tipsy-tooltip-view');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/context-menu-factory.tpl b/lib/assets/javascripts/builder/components/context-menu-factory.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/context-menu-factory.tpl
rename to lib/assets/javascripts/builder/components/context-menu-factory.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/context-menu/context-menu-view.js b/lib/assets/javascripts/builder/components/context-menu/context-menu-view.js
similarity index 87%
rename from lib/assets/javascripts/cartodb3/components/context-menu/context-menu-view.js
rename to lib/assets/javascripts/builder/components/context-menu/context-menu-view.js
index b8f73f823a..814ee88916 100755
--- a/lib/assets/javascripts/cartodb3/components/context-menu/context-menu-view.js
+++ b/lib/assets/javascripts/builder/components/context-menu/context-menu-view.js
@@ -1,11 +1,11 @@
var $ = require('jquery');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-list-view');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
-var itemTemplate = require('cartodb3/components/custom-list/custom-list-item.tpl');
-var magicPositioner = require('cartodb3/helpers/magic-positioner');
-var DropdownOverlayView = require('cartodb3/components/dropdown-overlay/dropdown-overlay-view');
+var CustomListView = require('builder/components/custom-list/custom-list-view');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
+var itemTemplate = require('builder/components/custom-list/custom-list-item.tpl');
+var magicPositioner = require('builder/helpers/magic-positioner');
+var DropdownOverlayView = require('builder/components/dropdown-overlay/dropdown-overlay-view');
var ESCAPE_KEY_CODE = 27;
diff --git a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-collection.js b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-collection.js
rename to lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item-model.js b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item-model.js
rename to lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item-view.js b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item-view.js
rename to lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item-view.js
index e5d003f9ac..9d93ee8366 100755
--- a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item-view.js
+++ b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./custom-carousel-item.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item.tpl b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-item.tpl
rename to lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-view.js b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel-view.js
rename to lib/assets/javascripts/builder/components/custom-carousel/custom-carousel-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel.tpl b/lib/assets/javascripts/builder/components/custom-carousel/custom-carousel.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-carousel/custom-carousel.tpl
rename to lib/assets/javascripts/builder/components/custom-carousel/custom-carousel.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-action-view.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-action-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-action-view.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-action-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-action.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-action.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-action.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-action.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-add.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-add.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-add.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-add.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-collection.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-collection.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-context-menu.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-context-menu.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-context-menu.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-context-menu.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-empty.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-empty.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-empty.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-empty.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-header.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-header.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item-model.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-item-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item-model.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-item-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item-view.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item-view.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item-with-checkbox.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-item-with-checkbox.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item-with-checkbox.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-item-with-checkbox.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-item.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-multi-collection.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-multi-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-multi-collection.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-multi-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-multi-item-view.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-multi-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-multi-item-view.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-multi-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-search-view.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-search-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-search-view.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-search-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-search.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list-search.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-search.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-search.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-view.js b/lib/assets/javascripts/builder/components/custom-list/custom-list-view.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list-view.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-list-view.js
index 2522845672..9e35fce3f4 100755
--- a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list-view.js
+++ b/lib/assets/javascripts/builder/components/custom-list/custom-list-view.js
@@ -4,7 +4,7 @@ var Ps = require('perfect-scrollbar');
var emptyTemplate = require('./custom-list-empty.tpl');
var addTemplate = require('./custom-list-add.tpl');
var template = require('./custom-list.tpl');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var ARROW_DOWN_KEY_CODE = 40;
var ARROW_UP_KEY_CODE = 38;
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-list.tpl b/lib/assets/javascripts/builder/components/custom-list/custom-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-list.tpl
rename to lib/assets/javascripts/builder/components/custom-list/custom-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/custom-list/custom-view.js b/lib/assets/javascripts/builder/components/custom-list/custom-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/custom-list/custom-view.js
rename to lib/assets/javascripts/builder/components/custom-list/custom-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/dataset/dataset-base-view.js b/lib/assets/javascripts/builder/components/dataset/dataset-base-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/dataset/dataset-base-view.js
rename to lib/assets/javascripts/builder/components/dataset/dataset-base-view.js
index 94669e07f7..707a047ba9 100755
--- a/lib/assets/javascripts/cartodb3/components/dataset/dataset-base-view.js
+++ b/lib/assets/javascripts/builder/components/dataset/dataset-base-view.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var SQLNotifications = require('cartodb3/sql-notifications');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var SQLNotifications = require('builder/sql-notifications');
+var SQLUtils = require('builder/helpers/sql-utils');
+var Notifier = require('builder/components/notifier/notifier');
var cdb = require('cartodb.js');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker-range/calendar-dropdown-view.js b/lib/assets/javascripts/builder/components/date-picker-range/calendar-dropdown-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker-range/calendar-dropdown-view.js
rename to lib/assets/javascripts/builder/components/date-picker-range/calendar-dropdown-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker-range/calendar-dropdown.tpl b/lib/assets/javascripts/builder/components/date-picker-range/calendar-dropdown.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker-range/calendar-dropdown.tpl
rename to lib/assets/javascripts/builder/components/date-picker-range/calendar-dropdown.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-form.tpl b/lib/assets/javascripts/builder/components/date-picker-range/date-picker-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-form.tpl
rename to lib/assets/javascripts/builder/components/date-picker-range/date-picker-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range-form.tpl b/lib/assets/javascripts/builder/components/date-picker-range/date-picker-range-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range-form.tpl
rename to lib/assets/javascripts/builder/components/date-picker-range/date-picker-range-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range-view.js b/lib/assets/javascripts/builder/components/date-picker-range/date-picker-range-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range-view.js
rename to lib/assets/javascripts/builder/components/date-picker-range/date-picker-range-view.js
index 8ab00b9443..f16e199bfe 100755
--- a/lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range-view.js
+++ b/lib/assets/javascripts/builder/components/date-picker-range/date-picker-range-view.js
@@ -3,8 +3,8 @@ var CoreView = require('backbone/core-view');
var _ = require('underscore');
var moment = require('moment');
var $ = require('jquery');
-var Utils = require('cartodb3/helpers/utils');
-require('cartodb3/components/form-components/index');
+var Utils = require('builder/helpers/utils');
+require('builder/components/form-components/index');
require('datepicker');
var datePickerTemplate = require('./date-picker-range-form.tpl');
var template = require('./date-picker-range.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range.tpl b/lib/assets/javascripts/builder/components/date-picker-range/date-picker-range.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker-range/date-picker-range.tpl
rename to lib/assets/javascripts/builder/components/date-picker-range/date-picker-range.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker/date-picker-view.js b/lib/assets/javascripts/builder/components/date-picker/date-picker-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/date-picker/date-picker-view.js
rename to lib/assets/javascripts/builder/components/date-picker/date-picker-view.js
index ace64438a8..2af29f34a6 100755
--- a/lib/assets/javascripts/cartodb3/components/date-picker/date-picker-view.js
+++ b/lib/assets/javascripts/builder/components/date-picker/date-picker-view.js
@@ -2,7 +2,7 @@ var CoreView = require('backbone/core-view');
var _ = require('underscore');
var moment = require('moment');
var $ = require('jquery');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
require('datepicker');
var template = require('./date-picker.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker/date-picker.tpl b/lib/assets/javascripts/builder/components/date-picker/date-picker.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker/date-picker.tpl
rename to lib/assets/javascripts/builder/components/date-picker/date-picker.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/date-picker/edit-field-model.js b/lib/assets/javascripts/builder/components/date-picker/edit-field-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/date-picker/edit-field-model.js
rename to lib/assets/javascripts/builder/components/date-picker/edit-field-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/dropdown-overlay/dropdown-overlay-view.js b/lib/assets/javascripts/builder/components/dropdown-overlay/dropdown-overlay-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/dropdown-overlay/dropdown-overlay-view.js
rename to lib/assets/javascripts/builder/components/dropdown-overlay/dropdown-overlay-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/error/error-view.js b/lib/assets/javascripts/builder/components/error/error-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/error/error-view.js
rename to lib/assets/javascripts/builder/components/error/error-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/error/error.tpl b/lib/assets/javascripts/builder/components/error/error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/error/error.tpl
rename to lib/assets/javascripts/builder/components/error/error.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/base.js b/lib/assets/javascripts/builder/components/form-components/editors/base.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/base.js
rename to lib/assets/javascripts/builder/components/form-components/editors/base.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/code-editor.js b/lib/assets/javascripts/builder/components/form-components/editors/code-editor.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/code-editor.js
rename to lib/assets/javascripts/builder/components/form-components/editors/code-editor.js
index 93142d839f..e491b6b382 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/code-editor.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/code-editor.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var FactoryHints = require('cartodb3/editor/editor-hints/factory-hints');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
+var FactoryHints = require('builder/editor/editor-hints/factory-hints');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
Backbone.Form.editors.CodeEditor = Backbone.Form.editors.TextArea.extend({
render: function () {
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-dropdown-measurements-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-dropdown-measurements-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-dropdown-measurements-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-dropdown-measurements-view.js
index 5bda0ad54c..80543c3b8a 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-dropdown-measurements-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-dropdown-measurements-view.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
var MeasurementsView = require('./measurements-list-view');
var FiltersView = require('./filters-list-view');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurement-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurement-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurement-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurement-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.js
index dd6627f515..5dd606cdb0 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var template = require('./data-observatory-measurements.tpl');
var selectedItemTemplate = require('./data-observatory-measurement-item.tpl');
var DropdownDialogView = require('./data-observatory-dropdown-measurements-view');
-var PopupManager = require('cartodb3/components/popup-manager');
-var MeasurementsCollection = require('cartodb3/data/data-observatory/measurements-collection');
-var FiltersCollection = require('cartodb3/data/data-observatory/filters-collection');
+var PopupManager = require('builder/components/popup-manager');
+var MeasurementsCollection = require('builder/data/data-observatory/measurements-collection');
+var FiltersCollection = require('builder/data/data-observatory/filters-collection');
var ENTER_KEY_CODE = 13;
var STATE = {
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-item-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-item-view.js
index 2059e055fe..95f782c751 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-item-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-item-view.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var CustomListMultiItemView = require('cartodb3/components/custom-list/custom-list-multi-item-view');
+var CustomListMultiItemView = require('builder/components/custom-list/custom-list-multi-item-view');
var NAME = _.template('<%-name %> (<%- items %>)');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filter-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filter-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filters-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filters-list-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filters-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filters-list-view.js
index dda438ff9e..f0376e14c3 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/filters-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/filters-list-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
+var CustomListView = require('builder/components/custom-list/custom-view');
var CustomListItemView = require('./filter-list-item-view');
var itemListTemplate = require('./filter-list-item.tpl');
var template = require('./filter-list-view.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var statusTemplate = require('./list-view-states.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/list-view-states.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/list-view-states.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/list-view-states.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/list-view-states.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-item.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-item.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-item.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-item.js
index 7bdad03db4..389cd82ded 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-item.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-item.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var NestedForm = require('cartodb3/components/form-components/nested-form-custom');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var NestedForm = require('builder/components/form-components/nested-form-custom');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
Backbone.Form.editors.List.MeasurementModel = Backbone.Form.editors.NestedModel.extend({
initialize: function (options) {
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-list-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-list-item-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-list-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-list-item-view.js
index 75d807012e..27bbfd4269 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-list-item-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-list-item-view.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var BaseView = require('cartodb3/components/custom-list/custom-list-item-view');
+var BaseView = require('builder/components/custom-list/custom-list-item-view');
module.exports = BaseView.extend({
render: function () {
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-list-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurement-list-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurement-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-count-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-count-view.js
index a45a9b45ad..fbb10ed396 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-count-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var template = require('./measurements-count.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-count.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-count.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-list-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-list-view.js
index e43083a621..f0a52746ff 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-list-view.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
+var CustomListView = require('builder/components/custom-list/custom-view');
var CustomListItemView = require('./measurement-list-item-view');
var itemListTemplate = require('./measurement-list-item.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var template = require('./measurements-list.tpl');
var SearchMeasurementView = require('./measurements-search-view');
var CountMeasurementView = require('./measurements-count-view');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view.js b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-search-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-search-view.js
index f2f716b609..85b2ada674 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-search-view.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var utils = require('cartodb3/helpers/utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var utils = require('builder/helpers/utils');
var template = require('./measurements-search.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search.tpl b/lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-search.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/data-observatory-measurements/measurements-search.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-dialog-model.js b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-dialog-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-dialog-model.js
rename to lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-dialog-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-dialog-view.js b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-dialog-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-dialog-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-dialog-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-editor-model.js b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-editor-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-editor-model.js
rename to lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-editor-model.js
index 15f162245a..c434c299ec 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-editor-model.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-editor-model.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var moment = require('moment');
var MONTHS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-editor-view.js b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-editor-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime-editor-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime-editor-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime.js b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime.js
rename to lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime.js
index 070fa139c8..4c2f9af3b3 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var moment = require('moment');
var DatetimeDialogModel = require('./datetime-dialog-model');
var DatetimeDialogView = require('./datetime-dialog-view');
var template = require('./datetime.tpl');
-var PopupManager = require('cartodb3/components/popup-manager');
+var PopupManager = require('builder/components/popup-manager');
Backbone.Form.editors.DateTime = Backbone.Form.editors.Base.extend({
className: 'Editor-formInput u-flex u-alignCenter',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime.tpl b/lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/datetime/datetime.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/datetime/datetime.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/editor-helpers-extend.js b/lib/assets/javascripts/builder/components/form-components/editors/editor-helpers-extend.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/editor-helpers-extend.js
rename to lib/assets/javascripts/builder/components/form-components/editors/editor-helpers-extend.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler-editor/enabler-editor-view.js b/lib/assets/javascripts/builder/components/form-components/editors/enabler-editor/enabler-editor-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/enabler-editor/enabler-editor-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/enabler-editor/enabler-editor-view.js
index 21cd3b571b..0359abfdaf 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler-editor/enabler-editor-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/enabler-editor/enabler-editor-view.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var template = require('./enabler-editor.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler-editor/enabler-editor.tpl b/lib/assets/javascripts/builder/components/form-components/editors/enabler-editor/enabler-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/enabler-editor/enabler-editor.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/enabler-editor/enabler-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler-reversed.tpl b/lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler-reversed.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler-reversed.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler-reversed.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler-view.js b/lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler-view.js
index 179e53c3db..413ef83912 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var $ = require('jquery');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var template = require('./enabler.tpl');
var templateReversed = require('./enabler-reversed.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler.tpl b/lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/enabler/enabler.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/enabler/enabler.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/color-picker-template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/color-picker-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/color-picker-template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/color-picker-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/color-picker.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/color-picker.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/color-picker.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/color-picker.js
index b58bbd0f5b..a7e06b2437 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/color-picker.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/color-picker.js
@@ -5,7 +5,7 @@ var CoreView = require('backbone/core-view');
require('bootstrap-colorpicker');
var template = require('./template.tpl');
var colorPickerTemplate = require('./color-picker-template.tpl');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var ESCAPE_KEY_CODE = 27;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/color-picker/template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/color-picker/template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/column-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/column-list-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/column-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/column-list-view.js
index 02399c5e88..5a0d866462 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/column-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/column-list-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var template = require('./column-list-view.tpl');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/column-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/column-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/column-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/column-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/default-fill-settings.json b/lib/assets/javascripts/builder/components/form-components/editors/fill/default-fill-settings.json
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/default-fill-settings.json
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/default-fill-settings.json
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-dialog-model.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill-dialog-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-dialog-model.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/fill-dialog-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-dialog.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill-dialog.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-dialog.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/fill-dialog.js
index 64cfa1279f..6df8c73e61 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-dialog.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill-dialog.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var DropdownOverlayView = require('cartodb3/components/dropdown-overlay/dropdown-overlay-view');
+var DropdownOverlayView = require('builder/components/dropdown-overlay/dropdown-overlay-view');
module.exports = CoreView.extend({
className: 'Editor-boxModal Editor-FormDialog js-formDialog is-opening',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-tab-pane.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill-tab-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-tab-pane.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/fill-tab-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-tab.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill-tab.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-tab.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/fill-tab.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill-template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/fill-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/fill.js
index d530d125f2..2c7b3a9f5b 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/fill.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/fill.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var FillDialogModel = require('./fill-dialog-model');
var FillDialogView = require('./fill-dialog');
@@ -11,7 +11,7 @@ var InputColor = require('./input-color/input-color');
var template = require('./fill-template.tpl');
-var PopupManager = require('cartodb3/components/popup-manager');
+var PopupManager = require('builder/components/popup-manager');
var INPUT_TYPE_MAP = {
'size': InputNumber,
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-collection.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-collection.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js
index 6bcbed62d4..6f7db55c1a 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var template = require('./asset-header-view.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/asset-item-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js
index 10a191d793..f4fd615dbc 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var StaticAssetItemView = require('./static-asset-item-view');
-var StaticAssetsCollection = require('cartodb3/data/static-assets-collection');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var StaticAssetsCollection = require('builder/data/static-assets-collection');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'icons',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.js
index 34af2ba56c..02ee3809ae 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.js
@@ -3,23 +3,23 @@ var _ = require('underscore');
var CoreView = require('backbone/core-view');
var Backbone = require('backbone');
-var Utils = require('cartodb3/helpers/utils');
-var MakiIcons = require('cartodb3/components/form-components/editors/fill/input-color/assets/maki-icons');
+var Utils = require('builder/helpers/utils');
+var MakiIcons = require('builder/components/form-components/editors/fill/input-color/assets/maki-icons');
var UserAssetsView = require('./user-assets-tab');
var OrganizationAssetsListView = require('./organization-assets-list-view');
-var OrganizationAssetsCollection = require('cartodb3/data/organization-assets-collection');
+var OrganizationAssetsCollection = require('builder/data/organization-assets-collection');
var UploadAssetsView = require('./upload-assets-tab');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var AssetsCollection = require('cartodb3/data/assets-collection');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var AssetsCollection = require('builder/data/assets-collection');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
+var ScrollView = require('builder/components/scroll/scroll-view');
var AssetsListView = require('./assets-list-view');
-var loadingView = require('cartodb3/components/loading/render-loading');
+var loadingView = require('builder/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
+var ErrorView = require('builder/components/error/error-view');
var errorTemplate = require('./upload-assets-error.tpl');
-var errorParser = require('cartodb3/helpers/error-parser');
+var errorParser = require('builder/helpers/error-parser');
var template = require('./assets-view.tpl');
var tabPaneTemplate = require('./tab-pane-template.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.js
index b82861c21c..15414991cb 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./input-asset-picker-header.tpl');
-var ImageLoaderView = require('cartodb3/components/img-loader-view');
+var ImageLoaderView = require('builder/components/img-loader-view');
module.exports = CoreView.extend({
events: {
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.js
index 9f29c80702..c2efff369b 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.js
@@ -3,8 +3,8 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./input-asset-picker-view.tpl');
var InputAssetPickerHeader = require('./input-asset-picker-header');
-var InputAssetPickerView = require('cartodb3/components/form-components/editors/fill/input-color/input-color-file-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var InputAssetPickerView = require('builder/components/form-components/editors/fill/input-color/input-color-file-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
'modals',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.js
index b169d5ff9c..6965192aec 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var AssetItemView = require('./asset-item-view');
var template = require('./organization-assets-list-view.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/tab-pane-template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/tab-pane-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/tab-pane-template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/tab-pane-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-error.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-error.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.js
index ff06cac28e..c11484b362 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.js
@@ -3,9 +3,9 @@ var Dropzone = require('dropzone');
var $ = require('jquery');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var Utils = require('cartodb3/helpers/utils');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var AssetsCollection = require('cartodb3/data/assets-collection');
+var Utils = require('builder/helpers/utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var AssetsCollection = require('builder/data/assets-collection');
var template = require('./upload-assets-tab.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.js
index c25ca39256..1f28686858 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.js
@@ -2,12 +2,12 @@ var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var AssetItemView = require('./asset-item-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var Backbone = require('backbone');
-var loadingView = require('cartodb3/components/loading/render-loading');
+var loadingView = require('builder/components/loading/render-loading');
var AssetHeaderView = require('./asset-header-view');
-var ErrorView = require('cartodb3/components/error/error-view');
+var ErrorView = require('builder/components/error/error-view');
var errorTemplate = require('./upload-assets-error.tpl');
var template = require('./user-assets-list-view.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-tab.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-tab.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-tab.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-tab.js
index cefe9b1b3d..be2a31fd35 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-tab.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-tab.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var ScrollView = require('builder/components/scroll/scroll-view');
var UserAssetsListView = require('./user-assets-list-view');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets/maki-icons.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets/maki-icons.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets/maki-icons.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets/maki-icons.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets/pattern-icons.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets/pattern-icons.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets/pattern-icons.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/assets/pattern-icons.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-dialog-content.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-dialog-content.js
index eca5395eea..a643ea59fc 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-dialog-content.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var tabPaneTemplate = require('cartodb3/components/form-components/editors/fill/fill-tab-pane.tpl');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
+var tabPaneTemplate = require('builder/components/form-components/editors/fill/fill-tab-pane.tpl');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
var InputColorFixedContentView = require('./input-color-fixed-content-view');
var InputColorValueContentView = require('./input-color-value-content-view');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-carousel.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-carousel.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-carousel.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-carousel.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-view.js
index 324a9e723a..0387cce223 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-view.js
@@ -1,10 +1,10 @@
var CoreView = require('backbone/core-view');
var template = require('./input-color-file-view.tpl');
var AssetsView = require('./assets-picker/assets-view');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
-var StaticAssetsCollection = require('cartodb3/data/static-assets-collection');
-var StaticAssetModel = require('cartodb3/data/static-asset-model');
+var CarouselFormView = require('builder/components/carousel-form-view');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
+var StaticAssetsCollection = require('builder/data/static-assets-collection');
+var StaticAssetModel = require('builder/data/static-asset-model');
var StaticAssetItemViewTemplate = require('./assets-picker/static-asset-item-view.tpl');
var CarouselTemplate = require('./input-color-file-carousel.tpl');
var MakiIcons = require('./assets/maki-icons');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-file-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view.js
index 1b6a88e0b7..0e082343c2 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var tabPaneTemplate = require('cartodb3/components/form-components/editors/fill/fill-tab-pane.tpl');
-var createMixedLabelsTabPane = require('cartodb3/components/tab-pane/create-mixed-labels-tab-pane');
-var ColorPicker = require('cartodb3/components/form-components/editors/fill/color-picker/color-picker');
+var tabPaneTemplate = require('builder/components/form-components/editors/fill/fill-tab-pane.tpl');
+var createMixedLabelsTabPane = require('builder/components/tab-pane/create-mixed-labels-tab-pane');
+var ColorPicker = require('builder/components/form-components/editors/fill/color-picker/color-picker');
var InputColorFileView = require('./input-color-file-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js
index dd2182b694..871cd8f30e 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var ImageLoaderView = require('cartodb3/components/img-loader-view');
+var ImageLoaderView = require('builder/components/img-loader-view');
var template = require('./input-color-picker-header.tpl');
var MAX = 1;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.js
index b375c8b8fb..87f040b690 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var ColorPicker = require('cartodb3/components/form-components/editors/fill/color-picker/color-picker');
+var ColorPicker = require('builder/components/form-components/editors/fill/color-picker/color-picker');
var template = require('./input-color-picker-view.tpl');
var InputColorPickerHeader = require('./input-color-picker-header');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'ramp',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-value-content-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-value-content-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-value-content-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-value-content-view.js
index dca27e4abc..cd950b4ae4 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-value-content-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color-value-content-view.js
@@ -1,16 +1,16 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
-var ColumnListView = require('cartodb3/components/form-components/editors/fill/column-list-view');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
+var ColumnListView = require('builder/components/form-components/editors/fill/column-list-view');
var quantificationMethodItemTemplate = require('./quantification-method-item.tpl');
var InputQuantitativeRamps = require('./input-quantitative-ramps/main-view');
var InputQualitativeRamps = require('./input-qualitative-ramps/main-view');
-var DefaultFillSettings = require('cartodb3/components/form-components/editors/fill/default-fill-settings.json');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var DefaultFillSettings = require('builder/components/form-components/editors/fill/default-fill-settings.json');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
var EXCLUDED_COLUMNS = ['the_geom', 'the_geom_webmercator'];
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color.js
index ca470a334a..805afd26c1 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color.js
@@ -3,10 +3,10 @@ var $ = require('jquery');
var CoreView = require('backbone/core-view');
var template = require('./input-color.tpl');
var InputDialogContent = require('./input-color-dialog-content');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var rampList = require('./input-quantitative-ramps/ramps');
-var ImageLoaderView = require('cartodb3/components/img-loader-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var ImageLoaderView = require('builder/components/img-loader-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
module.exports = CoreView.extend({
tagName: 'li',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-color.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.js
index 89dc3fde54..8e830e0815 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var $ = require('jquery');
-var ImageLoaderView = require('cartodb3/components/img-loader-view');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
+var ImageLoaderView = require('builder/components/img-loader-view');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
module.exports = CustomListItemView.extend({
module: 'components:form-components:editors:fill:input-color:input-qualitative-ramps:categories-list:list-item-view:categories-list-item-view',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-custom-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-custom-list-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-custom-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-custom-list-view.js
index 6b47183796..5cc6942cee 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-custom-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-custom-list-view.js
@@ -1,4 +1,4 @@
-var CustomListView = require('cartodb3/components/custom-list/custom-list-view');
+var CustomListView = require('builder/components/custom-list/custom-list-view');
module.exports = CustomListView.extend({
module: 'components:form-components:editors:fill:input-color:input-qualitative-ramps:categories-list:list-view:categories-custom-list-view',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-list-view.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-list-view.js
index 6e2f91df43..d084d14339 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/categories-list-view.js
@@ -1,5 +1,5 @@
-var CustomView = require('cartodb3/components/custom-list/custom-view.js');
-var itemTemplate = require('cartodb3/components/custom-list/custom-list-item.tpl');
+var CustomView = require('builder/components/custom-list/custom-view.js');
+var itemTemplate = require('builder/components/custom-list/custom-list-item.tpl');
var CategoriesListItemView = require('../list-item-view/categories-list-item-view');
var CategoriesListView = require('./categories-custom-list-view');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.js
index d36e598081..0fbe9bd849 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var CategoriesListView = require('./categories-list-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var template = require('./input-color-categories-list-view.tpl');
var itemTemplate = require('../list-item-view/categories-list-item.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-color-categories-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-color-categories-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-color-categories-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-color-categories-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramp-custom-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramp-custom-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramp-custom-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramp-custom-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.js
index 234c8e5122..09093ae9ae 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.js
@@ -7,10 +7,10 @@ var colorRampsListTemplate = require('./color-ramps-list-view.tpl');
var colorRampsListItemTemplate = require('../list-item-view/color-ramps-list-item.tpl');
var ColorRampsListItemView = require('../list-item-view/color-ramps-list-item-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
-var CartoColor = require('cartodb3/helpers/carto-color');
+var CartoColor = require('builder/helpers/carto-color');
var EVENTS = {
CUSTOM_COLOR: 'custom-color',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js
index 296f353727..f2fb2c5d1e 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js
@@ -4,7 +4,7 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var mainViewTemplate = require('./main-view.tpl');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
var AssetPickerView = require('../assets-picker/input-asset-picker-view');
var ColorRampsListView = require('./color-ramps-list/list-view/color-ramps-list-view');
@@ -16,7 +16,7 @@ var MAX_VALUES = 10;
var DEFAULT_COLORS = _.clone(CartoColor.Prism[MAX_VALUES + 1]); // max values + "others" color
var queryTemplate = _.template('SELECT <%= column %>, count(<%= column %>) FROM (<%= sql %>) _table_sql GROUP BY <%= column %> ORDER BY count DESC, <%= column %> ASC LIMIT <%= max_values %>');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'columns',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/custom-ramp-template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/custom-ramp-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/custom-ramp-template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/custom-ramp-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.js
index bbe0519379..fb83b5522c 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.js
@@ -2,7 +2,7 @@ var Backbone = require('backbone');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var InputRampListView = require('./input-ramp-list-view');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
var InputColorPickerView = require('../input-color-picker/input-color-picker-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-template.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-template.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.js
index 85f96de670..7f3f875530 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var cdb = require('cartodb.js');
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var rampItemTemplate = require('./input-ramp-list-item-template.tpl');
var rampItemView = require('./input-ramp-list-item-view');
var customRampTemplate = require('./custom-ramp-template.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view.js
index f196de54d0..2d26adb90b 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view.js
@@ -1,12 +1,12 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
-var ColumnListView = require('cartodb3/components/form-components/editors/fill/column-list-view');
-var quantificationMethodItemTemplate = require('cartodb3/components/form-components/editors/fill/input-color/quantification-method-item.tpl');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
+var ColumnListView = require('builder/components/form-components/editors/fill/column-list-view');
+var quantificationMethodItemTemplate = require('builder/components/form-components/editors/fill/input-color/quantification-method-item.tpl');
var InputRampContentView = require('./input-ramp-content-view');
var rampList = require('cartocolor');
-var DefaultFillSettings = require('cartodb3/components/form-components/editors/fill/default-fill-settings.json');
+var DefaultFillSettings = require('builder/components/form-components/editors/fill/default-fill-settings.json');
module.exports = CoreView.extend({
module: 'components:form-components:editors:fill:input-color:input-quantitative-ramps:main-view',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/ramps.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/ramps.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/ramps.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/ramps.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/quantification-method-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/quantification-method-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-color/quantification-method-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-color/quantification-method-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-content-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-content-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-content-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-content-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-dialog-content.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-dialog-content.js
index 10af8308cd..0a26c011e0 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-dialog-content.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var tabPaneTemplate = require('cartodb3/components/form-components/editors/fill/fill-tab-pane.tpl');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
+var tabPaneTemplate = require('builder/components/form-components/editors/fill/fill-tab-pane.tpl');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
var InputNumberFixedContentView = require('./input-number-fixed-content-view');
var InputNumberValueContentView = require('./input-number-value-content-view');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-fixed-content-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-fixed-content-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-fixed-content-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-fixed-content-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.js
index 1c3029f3c2..80f09c022c 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
-var ColumnListView = require('cartodb3/components/form-components/editors/fill/column-list-view');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
+var ColumnListView = require('builder/components/form-components/editors/fill/column-list-view');
var quantificationMethodItemTemplate = require('./quantification-method-item.tpl');
var InputNumberContentView = require('./input-number-content-view');
-var DefaultFillSettings = require('cartodb3/components/form-components/editors/fill/default-fill-settings.json');
+var DefaultFillSettings = require('builder/components/form-components/editors/fill/default-fill-settings.json');
/**
* add the number of classes
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number.js b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number.js
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number.js
index 75128d33ee..6e843cf93b 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var CoreView = require('backbone/core-view');
var template = require('./input-number.tpl');
var InputDialogContent = require('./input-number-dialog-content');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
module.exports = CoreView.extend({
tagName: 'li',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/input-number.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/quantification-method-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/quantification-method-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/fill/input-number/quantification-method-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/fill/input-number/quantification-method-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list-view-states.tpl b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list-view-states.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list-view-states.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list-view-states.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list-view.js
index ebcef96f9b..864e6051ae 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var template = require('./lazy-list.tpl');
var SearchView = require('./lazy-search-view');
var statusTemplate = require('./lazy-list-view-states.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list.tpl b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-list.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search-collection.js b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search-collection.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search-collection.js
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search-collection.js
index b708d86f13..ff662d3d48 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search-collection.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search-collection.js
@@ -2,9 +2,9 @@ var Backbone = require('backbone');
var _ = require('underscore');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var queryTemplate = _.template("SELECT DISTINCT <%= column %> FROM (<%= sql %>) _table_sql WHERE <%= column %> ilike '%<%= search %>%' ORDER BY <%= column %> ASC");
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search-view.js b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search-view.js
index 8b611f6d8c..08133352e3 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search-view.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var utils = require('cartodb3/helpers/utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var utils = require('builder/helpers/utils');
var template = require('./lazy-search.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search.tpl b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-search.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-search.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select-view.js b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select-view.js
index 46b219050e..ea0dee6324 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select-view.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var template = require('./lazy-select.tpl');
var selectedItemTemplate = require('./lazy-select-item.tpl');
var ListView = require('./lazy-list-view');
-var PopupManager = require('cartodb3/components/popup-manager');
+var PopupManager = require('builder/components/popup-manager');
var SearchCollection = require('./lazy-search-collection');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select.tpl b/lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/lazy-select/lazy-select.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/lazy-select/lazy-select.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/legend/category-item.js b/lib/assets/javascripts/builder/components/form-components/editors/legend/category-item.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/legend/category-item.js
rename to lib/assets/javascripts/builder/components/form-components/editors/legend/category-item.js
index bf28251b50..9deef76ea4 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/legend/category-item.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/legend/category-item.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
Backbone.Form.editors.List.CategoryModel = Backbone.Form.editors.NestedModel.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/list/list-item.js b/lib/assets/javascripts/builder/components/form-components/editors/list/list-item.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/list/list-item.js
rename to lib/assets/javascripts/builder/components/form-components/editors/list/list-item.js
index c619d0e44f..dbb5ad8904 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/list/list-item.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/list/list-item.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var $ = require('jquery');
var _ = require('underscore');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/list/list.js b/lib/assets/javascripts/builder/components/form-components/editors/list/list.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/list/list.js
rename to lib/assets/javascripts/builder/components/form-components/editors/list/list.js
index 24eabd5536..d6dd199355 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/list/list.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/list/list.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var OPTIONS = [
'userModel',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-item-view.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-item-view.js
index fa64b7a613..84d0b28924 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-item-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-item-view.js
@@ -1,4 +1,4 @@
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
var _ = require('underscore');
module.exports = CustomListItemView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-selected.tpl b/lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-selected.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-selected.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-selected.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-view.js b/lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/node-dataset/node-dataset-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/node-dataset/node-dataset-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/number/number.js b/lib/assets/javascripts/builder/components/form-components/editors/number/number.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/number/number.js
rename to lib/assets/javascripts/builder/components/form-components/editors/number/number.js
index f1d2fceb3c..ec2169321c 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/number/number.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/number/number.js
@@ -2,10 +2,10 @@ var Backbone = require('backbone');
var _ = require('underscore');
var $ = require('jquery');
var template = require('./number.tpl');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
require('jquery');
require('jquery-ui');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var UP_ARROW_KEY_CODE = 38;
var BOTTOM_ARROW_KEY_CODE = 40;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/number/number.tpl b/lib/assets/javascripts/builder/components/form-components/editors/number/number.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/number/number.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/number/number.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-collection.js b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-collection.js
similarity index 82%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-collection.js
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-collection.js
index cee7a28369..546937417c 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-collection.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-collection.js
@@ -1,4 +1,4 @@
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var _ = require('underscore');
/*
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-count.tpl b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-count.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-count.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-count.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-model.js b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-model.js
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-view.js
index 866695071b..daf2b7b296 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list-view.js
@@ -1,8 +1,8 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
var $ = require('jquery');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var DropdownOverlayView = require('cartodb3/components/dropdown-overlay/dropdown-overlay-view');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var DropdownOverlayView = require('builder/components/dropdown-overlay/dropdown-overlay-view');
var OperatorsListModel = require('./operators-list-model');
var emptyTemplate = require('./operators-list-count.tpl');
var template = require('./operators-list.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list.tpl b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-list.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-view.js b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators-view.js
index 1904176974..be2c8535b0 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators-view.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var _ = require('underscore');
var $ = require('jquery');
var OperatorListView = require('./operators-list-view');
var OperatorListCollection = require('./operators-list-collection');
var template = require('./operators.tpl');
-var PopupManager = require('cartodb3/components/popup-manager');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var PopupManager = require('builder/components/popup-manager');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators.tpl b/lib/assets/javascripts/builder/components/form-components/editors/operators/operators.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/operators/operators.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/operators/operators.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/radio/radio.js b/lib/assets/javascripts/builder/components/form-components/editors/radio/radio.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/radio/radio.js
rename to lib/assets/javascripts/builder/components/form-components/editors/radio/radio.js
index 2f5ac46a11..ed32bd1db3 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/radio/radio.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/radio/radio.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var template = require('./radio.tpl');
var _ = require('underscore');
var $ = require('jquery');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
Backbone.Form.editors.Radio = Backbone.Form.editors.Radio.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/radio/radio.tpl b/lib/assets/javascripts/builder/components/form-components/editors/radio/radio.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/radio/radio.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/radio/radio.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/multi-select-view.js b/lib/assets/javascripts/builder/components/form-components/editors/select/multi-select-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/multi-select-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/select/multi-select-view.js
index 6b75017a59..da7f87793a 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/multi-select-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/select/multi-select-view.js
@@ -1,13 +1,13 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var _ = require('underscore');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-multi-collection');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-multi-collection');
var selectedItemTemplate = require('./select-item.tpl');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-multi-item-view');
-var itemListTemplate = require('cartodb3/components/custom-list/custom-list-item-with-checkbox.tpl');
+var CustomListItemView = require('builder/components/custom-list/custom-list-multi-item-view');
+var itemListTemplate = require('builder/components/custom-list/custom-list-item-with-checkbox.tpl');
var template = require('./select.tpl');
-var PopupManager = require('cartodb3/components/popup-manager');
+var PopupManager = require('builder/components/popup-manager');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/select/select-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-layer-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/select/select-layer-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-layer-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-layer-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-layer-list-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/select/select-layer-list-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-layer-list-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-layer-list-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-layer-list-item.tpl b/lib/assets/javascripts/builder/components/form-components/editors/select/select-layer-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-layer-list-item.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-layer-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-list-view-states.tpl b/lib/assets/javascripts/builder/components/form-components/editors/select/select-list-view-states.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-list-view-states.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-list-view-states.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-list-view.js b/lib/assets/javascripts/builder/components/form-components/editors/select/select-list-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-list-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-list-view.js
index f710b10aef..b1c116cf5d 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-list-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/select/select-list-view.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var CustomView = require('cartodb3/components/custom-list/custom-view');
-var DropdownOverlayView = require('cartodb3/components/dropdown-overlay/dropdown-overlay-view');
+var CustomView = require('builder/components/custom-list/custom-view');
+var DropdownOverlayView = require('builder/components/dropdown-overlay/dropdown-overlay-view');
var statusTemplate = require('./select-list-view-states.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'collection',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-placeholder.js b/lib/assets/javascripts/builder/components/form-components/editors/select/select-placeholder.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-placeholder.js
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-placeholder.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-view.js b/lib/assets/javascripts/builder/components/form-components/editors/select/select-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select-view.js
index 5ee3cb7d5b..20293a1f04 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/select/select-view.js
@@ -1,15 +1,15 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var _ = require('underscore');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var selectedItemTemplate = require('./select-item.tpl');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
-var itemListTemplate = require('cartodb3/components/custom-list/custom-list-item.tpl');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
+var itemListTemplate = require('builder/components/custom-list/custom-list-item.tpl');
var template = require('./select.tpl');
-var PopupManager = require('cartodb3/components/popup-manager');
+var PopupManager = require('builder/components/popup-manager');
var SelectListView = require('./select-list-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/select.tpl b/lib/assets/javascripts/builder/components/form-components/editors/select/select.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/select.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/select/select.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/suggest-view.js b/lib/assets/javascripts/builder/components/form-components/editors/select/suggest-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/select/suggest-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/select/suggest-view.js
index fa6e59e2a1..edd2652101 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/select/suggest-view.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/select/suggest-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var _ = require('underscore');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var template = require('./select.tpl');
Backbone.Form.editors.Suggest = Backbone.Form.editors.Select.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/slider/slider.js b/lib/assets/javascripts/builder/components/form-components/editors/slider/slider.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/slider/slider.js
rename to lib/assets/javascripts/builder/components/form-components/editors/slider/slider.js
index 50935ea16c..e02edfec39 100644
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/slider/slider.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/slider/slider.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
var template = require('./slider.tpl');
var MutationObserver = window.MutationObserver;
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/slider/slider.tpl b/lib/assets/javascripts/builder/components/form-components/editors/slider/slider.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/slider/slider.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/slider/slider.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/sortable-list.js b/lib/assets/javascripts/builder/components/form-components/editors/sortable-list.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/sortable-list.js
rename to lib/assets/javascripts/builder/components/form-components/editors/sortable-list.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist-collection.js b/lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist-collection.js
rename to lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist-item-view.js b/lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist-item-view.js
rename to lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist.js b/lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist.js
rename to lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist.js
index 4c0c41599e..614827fab9 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist.js
@@ -3,7 +3,7 @@ var Backbone = require('backbone');
var template = require('./taglist.tpl');
var TagView = require('./taglist-item-view');
var TagCollection = require('./taglist-collection');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
require('jquery');
require('jquery-ui');
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist.tpl b/lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/taglist/taglist.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/taglist/taglist.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/text.js b/lib/assets/javascripts/builder/components/form-components/editors/text.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/text.js
rename to lib/assets/javascripts/builder/components/form-components/editors/text.js
index aa38325486..c249ee3b31 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/editors/text.js
+++ b/lib/assets/javascripts/builder/components/form-components/editors/text.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
var EditorHelpers = require('./editor-helpers-extend');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
Backbone.Form.editors.Text = Backbone.Form.editors.Text.extend({
className: 'CDB-InputText CDB-Text',
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/textarea.js b/lib/assets/javascripts/builder/components/form-components/editors/textarea.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/textarea.js
rename to lib/assets/javascripts/builder/components/form-components/editors/textarea.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/toggle/toggle.js b/lib/assets/javascripts/builder/components/form-components/editors/toggle/toggle.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/toggle/toggle.js
rename to lib/assets/javascripts/builder/components/form-components/editors/toggle/toggle.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/editors/toggle/toggle.tpl b/lib/assets/javascripts/builder/components/form-components/editors/toggle/toggle.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/editors/toggle/toggle.tpl
rename to lib/assets/javascripts/builder/components/form-components/editors/toggle/toggle.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/field.js b/lib/assets/javascripts/builder/components/form-components/field.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/form-components/field.js
rename to lib/assets/javascripts/builder/components/form-components/field.js
index e456afe540..83ad3070a8 100755
--- a/lib/assets/javascripts/cartodb3/components/form-components/field.js
+++ b/lib/assets/javascripts/builder/components/form-components/field.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
var $ = require('jquery');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view.js');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view.js');
var Clipboard = require('clipboard');
Backbone.Form.Field = Backbone.Form.Field.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/field.tpl b/lib/assets/javascripts/builder/components/form-components/field.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/field.tpl
rename to lib/assets/javascripts/builder/components/form-components/field.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/fieldset-template.js b/lib/assets/javascripts/builder/components/form-components/fieldset-template.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/fieldset-template.js
rename to lib/assets/javascripts/builder/components/form-components/fieldset-template.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/form.js b/lib/assets/javascripts/builder/components/form-components/form.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/form.js
rename to lib/assets/javascripts/builder/components/form-components/form.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/index.js b/lib/assets/javascripts/builder/components/form-components/index.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/index.js
rename to lib/assets/javascripts/builder/components/form-components/index.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/nested-form-custom.js b/lib/assets/javascripts/builder/components/form-components/nested-form-custom.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/nested-form-custom.js
rename to lib/assets/javascripts/builder/components/form-components/nested-form-custom.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/validators/column-type.js b/lib/assets/javascripts/builder/components/form-components/validators/column-type.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/validators/column-type.js
rename to lib/assets/javascripts/builder/components/form-components/validators/column-type.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/validators/interval.js b/lib/assets/javascripts/builder/components/form-components/validators/interval.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/validators/interval.js
rename to lib/assets/javascripts/builder/components/form-components/validators/interval.js
diff --git a/lib/assets/javascripts/cartodb3/components/form-components/validators/required-boolean.js b/lib/assets/javascripts/builder/components/form-components/validators/required-boolean.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/form-components/validators/required-boolean.js
rename to lib/assets/javascripts/builder/components/form-components/validators/required-boolean.js
diff --git a/lib/assets/javascripts/cartodb3/components/icon/icon-view.js b/lib/assets/javascripts/builder/components/icon/icon-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/icon/icon-view.js
rename to lib/assets/javascripts/builder/components/icon/icon-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/icon/templates/add-feature-line.tpl b/lib/assets/javascripts/builder/components/icon/templates/add-feature-line.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/icon/templates/add-feature-line.tpl
rename to lib/assets/javascripts/builder/components/icon/templates/add-feature-line.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/icon/templates/add-feature-point.tpl b/lib/assets/javascripts/builder/components/icon/templates/add-feature-point.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/icon/templates/add-feature-point.tpl
rename to lib/assets/javascripts/builder/components/icon/templates/add-feature-point.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/icon/templates/add-feature-polygon.tpl b/lib/assets/javascripts/builder/components/icon/templates/add-feature-polygon.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/icon/templates/add-feature-polygon.tpl
rename to lib/assets/javascripts/builder/components/icon/templates/add-feature-polygon.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/icon/templates/warning.tpl b/lib/assets/javascripts/builder/components/icon/templates/warning.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/icon/templates/warning.tpl
rename to lib/assets/javascripts/builder/components/icon/templates/warning.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/img-loader-view.js b/lib/assets/javascripts/builder/components/img-loader-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/img-loader-view.js
rename to lib/assets/javascripts/builder/components/img-loader-view.js
index 6ff981532c..10a2e379dd 100644
--- a/lib/assets/javascripts/cartodb3/components/img-loader-view.js
+++ b/lib/assets/javascripts/builder/components/img-loader-view.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
var CoreView = require('backbone/core-view');
-var utils = require('cartodb3/helpers/utils');
+var utils = require('builder/helpers/utils');
var _ = require('underscore');
var IMAGE_DIM = 18;
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-button.tpl b/lib/assets/javascripts/builder/components/infobox/infobox-button.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-button.tpl
rename to lib/assets/javascripts/builder/components/infobox/infobox-button.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-collection.js b/lib/assets/javascripts/builder/components/infobox/infobox-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-collection.js
rename to lib/assets/javascripts/builder/components/infobox/infobox-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-factory.js b/lib/assets/javascripts/builder/components/infobox/infobox-factory.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-factory.js
rename to lib/assets/javascripts/builder/components/infobox/infobox-factory.js
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-item-model.js b/lib/assets/javascripts/builder/components/infobox/infobox-item-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-item-model.js
rename to lib/assets/javascripts/builder/components/infobox/infobox-item-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-item-view.js b/lib/assets/javascripts/builder/components/infobox/infobox-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-item-view.js
rename to lib/assets/javascripts/builder/components/infobox/infobox-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-model.js b/lib/assets/javascripts/builder/components/infobox/infobox-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-model.js
rename to lib/assets/javascripts/builder/components/infobox/infobox-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-quota.tpl b/lib/assets/javascripts/builder/components/infobox/infobox-quota.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-quota.tpl
rename to lib/assets/javascripts/builder/components/infobox/infobox-quota.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox-view.js b/lib/assets/javascripts/builder/components/infobox/infobox-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox-view.js
rename to lib/assets/javascripts/builder/components/infobox/infobox-view.js
index caf4999d29..9187af82aa 100755
--- a/lib/assets/javascripts/cartodb3/components/infobox/infobox-view.js
+++ b/lib/assets/javascripts/builder/components/infobox/infobox-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'infoboxModel',
diff --git a/lib/assets/javascripts/cartodb3/components/infobox/infobox.tpl b/lib/assets/javascripts/builder/components/infobox/infobox.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/infobox/infobox.tpl
rename to lib/assets/javascripts/builder/components/infobox/infobox.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/inline-editor/inline-editor-view.js b/lib/assets/javascripts/builder/components/inline-editor/inline-editor-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/inline-editor/inline-editor-view.js
rename to lib/assets/javascripts/builder/components/inline-editor/inline-editor-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/likes/likes-model.js b/lib/assets/javascripts/builder/components/likes/likes-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/likes/likes-model.js
rename to lib/assets/javascripts/builder/components/likes/likes-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/likes/likes-view.js b/lib/assets/javascripts/builder/components/likes/likes-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/likes/likes-view.js
rename to lib/assets/javascripts/builder/components/likes/likes-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/likes/likes.tpl b/lib/assets/javascripts/builder/components/likes/likes.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/likes/likes.tpl
rename to lib/assets/javascripts/builder/components/likes/likes.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/loading/loading.tpl b/lib/assets/javascripts/builder/components/loading/loading.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/loading/loading.tpl
rename to lib/assets/javascripts/builder/components/loading/loading.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/loading/quote.tpl b/lib/assets/javascripts/builder/components/loading/quote.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/loading/quote.tpl
rename to lib/assets/javascripts/builder/components/loading/quote.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/loading/random-quote.js b/lib/assets/javascripts/builder/components/loading/random-quote.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/loading/random-quote.js
rename to lib/assets/javascripts/builder/components/loading/random-quote.js
diff --git a/lib/assets/javascripts/cartodb3/components/loading/render-loading.js b/lib/assets/javascripts/builder/components/loading/render-loading.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/loading/render-loading.js
rename to lib/assets/javascripts/builder/components/loading/render-loading.js
diff --git a/lib/assets/javascripts/cartodb3/components/local-storage/local-storage.js b/lib/assets/javascripts/builder/components/local-storage/local-storage.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/local-storage/local-storage.js
rename to lib/assets/javascripts/builder/components/local-storage/local-storage.js
diff --git a/lib/assets/javascripts/cartodb3/components/metrics/metrics-model.js b/lib/assets/javascripts/builder/components/metrics/metrics-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/metrics/metrics-model.js
rename to lib/assets/javascripts/builder/components/metrics/metrics-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/metrics/metrics-tracker.js b/lib/assets/javascripts/builder/components/metrics/metrics-tracker.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/metrics/metrics-tracker.js
rename to lib/assets/javascripts/builder/components/metrics/metrics-tracker.js
diff --git a/lib/assets/javascripts/cartodb3/components/metrics/webgl-metrics.js b/lib/assets/javascripts/builder/components/metrics/webgl-metrics.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/metrics/webgl-metrics.js
rename to lib/assets/javascripts/builder/components/metrics/webgl-metrics.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/add-analyses.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/add-analyses.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/add-analyses.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/add-analyses.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/add-analysis-view.js b/lib/assets/javascripts/builder/components/modals/add-analysis/add-analysis-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/add-analysis-view.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/add-analysis-view.js
index 751978d75b..a25a7699cf 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/add-analysis-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-analysis/add-analysis-view.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var Analyses = require('cartodb3/data/analyses');
+var Analyses = require('builder/data/analyses');
var AnalysisOptionsCollection = require('./analysis-options-collection');
var analysisOptions = require('./analysis-options');
var AnalysisViewPane = require('./analysis-view-pane');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var DataServicesApiCheck = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var renderLoading = require('builder/components/loading/render-loading');
+var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
/**
* View to add a new analysis node.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analyses-types.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analyses-types.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analyses-types.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analyses-types.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category-pane-view.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category-pane-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category-pane-view.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category-pane-view.js
index b75bf08de0..fddf73cb60 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category-pane-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category-pane-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
var AnalysisCategoryPane = require('./analysis-category-pane');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category-pane.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category-pane.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category-pane.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category-pane.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-category.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-category.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/analysis-option-model.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/analysis-option-model.js
index f0607b7cfb..27501ffb8f 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/analysis-option-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
+var camshaftReference = require('builder/data/camshaft-reference');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
module.exports = Backbone.Model.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.js
index 0ba567a93f..d0298c67d9 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var AnalysisOptionModel = require('./analysis-option-model');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
+var camshaftReference = require('builder/data/camshaft-reference');
/**
* Model to represent a generated analysis option.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-view.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-view.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-view.js
index 3c3b0bd392..7345e8500c 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option-view.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
var template = require('./analysis-option.tpl');
-var Analyses = require('cartodb3/data/analyses');
+var Analyses = require('builder/data/analyses');
/**
* View for an individual analysis option.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-option.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-option.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-options-collection.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-options-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-options-collection.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-options-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-options.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-options.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-options.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-view-pane.js b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-view-pane.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-view-pane.js
rename to lib/assets/javascripts/builder/components/modals/add-analysis/analysis-view-pane.js
index 3c27fbb11f..2ebdbc3319 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/analysis-view-pane.js
+++ b/lib/assets/javascripts/builder/components/modals/add-analysis/analysis-view-pane.js
@@ -1,12 +1,12 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var AnalysisCategoryView = require('./analysis-category-pane-view');
-var createTemplateTabPane = require('cartodb3/components/tab-pane/create-template-tab-pane');
+var createTemplateTabPane = require('builder/components/tab-pane/create-template-tab-pane');
var template = require('./add-analyses.tpl');
var tabPaneButtonTemplate = require('./tab-pane-button-template.tpl');
var tabPaneTemplate = require('./tab-pane-template.tpl');
var analysesTypes = require('./analyses-types');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
/**
* View to select the analysis to create.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/aoi.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/aoi.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/aoi.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/aoi.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/centroid.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/centroid.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/centroid.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/centroid.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/closest.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/closest.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/closest.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/closest.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/connect-with-lines.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/connect-with-lines.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/connect-with-lines.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/connect-with-lines.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/filter-by-column-value.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/filter-by-column-value.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/filter-by-column-value.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/filter-by-column-value.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/filter-by-layer.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/filter-by-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/filter-by-layer.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/filter-by-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/filter-by-polygon.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/filter-by-polygon.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/filter-by-polygon.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/filter-by-polygon.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/georeference.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/georeference.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/georeference.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/georeference.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/group-points.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/group-points.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/group-points.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/group-points.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/intersect.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/intersect.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/intersect.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/intersect.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/join-two-columns.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/join-two-columns.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/join-two-columns.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/join-two-columns.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/kmeans.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/kmeans.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/kmeans.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/kmeans.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/outliers.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/outliers.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/outliers.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/outliers.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/predict-trends.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/predict-trends.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/predict-trends.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/predict-trends.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/sampling.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/sampling.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/animation-templates/sampling.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/animation-templates/sampling.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/tab-pane-button-template.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/tab-pane-button-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/tab-pane-button-template.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/tab-pane-button-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-analysis/tab-pane-template.tpl b/lib/assets/javascripts/builder/components/modals/add-analysis/tab-pane-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-analysis/tab-pane-template.tpl
rename to lib/assets/javascripts/builder/components/modals/add-analysis/tab-pane-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap-model.js
index 116fd76b42..bd125dc092 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var XYZModel = require('./xyz/xyz-model');
-var mosaicThumbnail = require('cartodb3/components/mosaic/mosaic-thumbnail.tpl');
+var mosaicThumbnail = require('builder/components/mosaic/mosaic-thumbnail.tpl');
var MapboxModel = require('./mapbox/mapbox-model');
var WMSModel = require('./wms/wms-model');
var TileJSONModel = require('./tilejson/tilejson-model');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap-view.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap-view.js
index d481a2a02f..858b6963b9 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap-view.js
@@ -1,10 +1,10 @@
var CoreView = require('backbone/core-view');
var template = require('./add-basemap.tpl');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var ViewFactory = require('cartodb3/components/view-factory');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var ViewFactory = require('builder/components/view-factory');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
var _ = require('underscore');
var TabsView = require('./tabs-view');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/add-basemap.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/add-basemap.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/enter-url.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/enter-url.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/enter-url.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/enter-url.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.js b/lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.js
index 5594eb9dc9..b3b247b4de 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.js
@@ -3,7 +3,7 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
/**
* Factory to create a CustomBaselayerModel from a given URL and access token tuple for Mapbox.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-view.js
index 11cd796465..9bc40b56da 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/mapbox/mapbox-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/mapbox/mapbox-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var ViewFactory = require('cartodb3/components/view-factory');
-var renderLoading = require('cartodb3/components/loading/render-loading');
+var ViewFactory = require('builder/components/view-factory');
+var renderLoading = require('builder/components/loading/render-loading');
var enterUrl = require('./enter-url.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa-model.js
index 0c1eded144..1adc2e9b09 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa-model.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var Backbone = require('backbone');
var moment = require('moment');
var NASAView = require('./nasa-view');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
var TYPES = {
day: {
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa-view.js
index 29099a276d..91859d37ae 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa-view.js
@@ -1,9 +1,9 @@
var $ = require('jquery');
var moment = require('moment');
var CoreView = require('backbone/core-view');
-var DatePickerView = require('cartodb3/components/date-picker/date-picker-view');
-var EditFieldModel = require('cartodb3/components/date-picker/edit-field-model');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var DatePickerView = require('builder/components/date-picker/date-picker-view');
+var EditFieldModel = require('builder/components/date-picker/edit-field-model');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var template = require('./nasa.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/nasa/nasa.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/nasa/nasa.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/tabs-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/tabs-view.js
index 61a7c36b2a..63e2584e6b 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/tabs-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
var $ = require('jquery');
var template = require('./tabs.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/tabs.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/tabs.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/enter-url.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/enter-url.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/enter-url.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/enter-url.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-layer-model.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-layer-model.js
index 3ffa2359c8..d71767ceee 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-layer-model.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
/**
* Model to representing a TileJSON endpoint
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/tilejson/tilejson-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/tilejson/tilejson-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/enter-url.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/enter-url.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/enter-url.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/enter-url.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/select-layer-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/select-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/select-layer-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/select-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/select-layer.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/select-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/select-layer.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/select-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer-model.js
index de19956502..244bac009c 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
/**
* Model for an individual WMS/WMTS layer.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layer.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layers-collection.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layers-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layers-collection.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layers-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layers-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layers-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-layers-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-layers-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-model.js
index 7900b0221d..d7128512a8 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-model.js
@@ -2,7 +2,7 @@ var Backbone = require('backbone');
var _ = require('underscore');
var WMSView = require('./wms-view');
var WMSLayersCollection = require('./wms-layers-collection');
-var WMSService = require('cartodb3/data/wms-service');
+var WMSService = require('builder/data/wms-service');
/**
* View model for WMS/WMTS tab content.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-view.js
index 38687902b2..9b08dd8163 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/wms/wms-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/wms/wms-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
var SelectLayerView = require('./select-layer-view');
-var ViewFactory = require('cartodb3/components/view-factory');
-var ErrorView = require('cartodb3/components/error/error-view');
-var renderLoading = require('cartodb3/components/loading/render-loading');
+var ViewFactory = require('builder/components/view-factory');
+var ErrorView = require('builder/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
var enterUrl = require('./enter-url.tpl');
var $ = require('jquery');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/enter-url.tpl b/lib/assets/javascripts/builder/components/modals/add-basemap/xyz/enter-url.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/enter-url.tpl
rename to lib/assets/javascripts/builder/components/modals/add-basemap/xyz/enter-url.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/xyz-model.js b/lib/assets/javascripts/builder/components/modals/add-basemap/xyz/xyz-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/xyz-model.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/xyz/xyz-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/xyz-view.js b/lib/assets/javascripts/builder/components/modals/add-basemap/xyz/xyz-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/xyz-view.js
rename to lib/assets/javascripts/builder/components/modals/add-basemap/xyz/xyz-view.js
index 3c69ee0f9b..d3e5e2faff 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/xyz/xyz-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-basemap/xyz/xyz-view.js
@@ -2,8 +2,8 @@ var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./enter-url.tpl');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
/**
* Represents the XYZ tab content.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer-model.js b/lib/assets/javascripts/builder/components/modals/add-layer/add-layer-model.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer-model.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/add-layer-model.js
index a516288cd5..2a3bf9a9a8 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/add-layer-model.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var UploadModel = require('cartodb3/data/upload-model');
-var VisualizationFetchModel = require('cartodb3/data/visualizations-fetch-model');
-var TablesCollection = require('cartodb3/data/visualizations-collection');
-var TableModel = require('cartodb3/data/table-model');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var UploadModel = require('builder/data/upload-model');
+var VisualizationFetchModel = require('builder/data/visualizations-fetch-model');
+var TablesCollection = require('builder/data/visualizations-collection');
+var TableModel = require('builder/data/table-model');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
/**
* Add layer model
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/add-layer-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/add-layer-view.js
index 76c7fe72db..eb16ff3986 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/add-layer-view.js
@@ -5,12 +5,12 @@ var template = require('./add-layer.tpl');
var FooterView = require('./footer/footer-view');
var NavigationView = require('./content/navigation-view');
var ListingView = require('./content/listing-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var ViewFactory = require('cartodb3/components/view-factory');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var ViewFactory = require('builder/components/view-factory');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'modalModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/add-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/add-layer.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/add-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/content-result-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/content-result-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/content-result-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/content-result-view.js
index 268ad3c1de..b3e430aa5e 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/content-result-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/content-result-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var randomQuote = require('cartodb3/components/loading/random-quote');
+var randomQuote = require('builder/components/loading/random-quote');
/*
* Content result default view
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/dataset-item-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/dataset-item-view.js
index f23e1b483a..18376a6f30 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/dataset-item-view.js
@@ -3,10 +3,10 @@ var CoreView = require('backbone/core-view');
var $ = require('jquery');
var _ = require('underscore');
var moment = require('moment');
-var Utils = require('cartodb3/helpers/utils');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var Utils = require('builder/helpers/utils');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var template = require('./dataset-item.tpl');
-var LikesView = require('cartodb3/components/likes/likes-view');
+var LikesView = require('builder/components/likes/likes-view');
/**
* View representing an item in the list under datasets route.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/dataset-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/dataset-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-error.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-error.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-list-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-list-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-list-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-list-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-loader.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-loader.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-loader.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-loader.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-no-result.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-no-result.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-pagination-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-pagination-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-pagination-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-pagination-view.js
index ef2e43ceeb..79c6ae8e88 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-pagination-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-pagination-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var PaginationModel = require('cartodb3/components/pagination/pagination-model');
-var PaginationView = require('cartodb3/components/pagination/pagination-view');
+var PaginationModel = require('builder/components/pagination/pagination-model');
+var PaginationView = require('builder/components/pagination/pagination-view');
/**
* Responsible for the datasets paginator
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/datasets-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/no-datasets.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/no-datasets.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/no-datasets.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/no-datasets.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/remote-dataset-item-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/remote-dataset-item-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/remote-dataset-item-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/remote-dataset-item-view.js
index 2c2f169ae5..a90c5f3e68 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/remote-dataset-item-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/remote-dataset-item-view.js
@@ -3,9 +3,9 @@ var $ = require('jquery');
var DatasetItem = require('./dataset-item-view');
var moment = require('moment');
var markdown = require('markdown');
-var Utils = require('cartodb3/helpers/utils');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var UploadConfig = require('cartodb3/config/upload-config');
+var Utils = require('builder/helpers/utils');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var UploadConfig = require('builder/config/upload-config');
var template = require('./remote-dataset-item.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/remote-dataset-item.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/remote-dataset-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/datasets/remote-dataset-item.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/datasets/remote-dataset-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-arcgis-fallback.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-arcgis-fallback.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-arcgis-fallback.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-arcgis-fallback.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-box-fallback.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-box-fallback.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-box-fallback.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-box-fallback.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-instagram-fallback.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-instagram-fallback.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-instagram-fallback.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-instagram-fallback.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-mailchimp-fallback.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-mailchimp-fallback.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-mailchimp-fallback.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-mailchimp-fallback.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-salesforce-fallback.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-salesforce-fallback.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-salesforce-fallback.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-salesforce-fallback.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-twitter-fallback.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-twitter-fallback.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/fallbacks/import-twitter-fallback.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/fallbacks/import-twitter-fallback.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-form.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-form.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-header.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-header.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-selected-dataset-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-selected-dataset-view.js
similarity index 84%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-selected-dataset-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-selected-dataset-view.js
index 94d464b0c5..8bc6ac7593 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-selected-dataset-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-selected-dataset-view.js
@@ -1,6 +1,6 @@
-var Utils = require('cartodb3/helpers/utils');
-var SelectedDatasetView = require('cartodb3/components/modals/add-layer/content/imports/import-selected-dataset-view');
-var template = require('cartodb3/components/modals/add-layer/content/imports/import-selected-dataset.tpl');
+var Utils = require('builder/helpers/utils');
+var SelectedDatasetView = require('builder/components/modals/add-layer/content/imports/import-selected-dataset-view');
+var template = require('builder/components/modals/add-layer/content/imports/import-selected-dataset.tpl');
/**
* Selected ArcGIS dataset
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-view.js
similarity index 81%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-view.js
index e1b7cb00be..12da059b82 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-arcgis/import-arcgis-view.js
@@ -1,7 +1,7 @@
-var FormView = require('cartodb3/components/modals/add-layer/content/imports/import-data/import-data-form-view');
-var HeaderView = require('cartodb3/components/modals/add-layer/content/imports/import-data/import-data-header-view');
+var FormView = require('builder/components/modals/add-layer/content/imports/import-data/import-data-form-view');
+var HeaderView = require('builder/components/modals/add-layer/content/imports/import-data/import-data-header-view');
var SelectedDatasetView = require('./import-arcgis-selected-dataset-view');
-var ImportDataView = require('cartodb3/components/modals/add-layer/content/imports/import-data/import-data-view');
+var ImportDataView = require('builder/components/modals/add-layer/content/imports/import-data/import-data-view');
var headerTemplate = require('./import-arcgis-header.tpl');
var formTemplate = require('./import-arcgis-form.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-form-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-form-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-form-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-form-view.js
index c59f127696..2bb1189585 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-form-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-form-view.js
@@ -3,7 +3,7 @@ var Dropzone = require('dropzone');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
var template = require('./import-data-form.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
/**
* Form view for url import for example
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-form.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-form.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-header-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-header-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-header-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-header-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-header.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-header.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-view.js
index 4d0e38363b..3f4854fe7e 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data-view.js
@@ -1,10 +1,10 @@
-var ImportView = require('cartodb3/components/modals/add-layer/content/imports/import-view');
-var UploadModel = require('cartodb3/data/upload-model');
+var ImportView = require('builder/components/modals/add-layer/content/imports/import-view');
+var UploadModel = require('builder/data/upload-model');
var FormView = require('./import-data-form-view');
var HeaderView = require('./import-data-header-view');
-var SelectedDatasetView = require('cartodb3/components/modals/add-layer/content/imports/import-selected-dataset-view');
+var SelectedDatasetView = require('builder/components/modals/add-layer/content/imports/import-selected-dataset-view');
var template = require('./import-data.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
/**
* Import data panel
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-data/import-data.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-data/import-data.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-mailchimp/import-data-header-mailchimp.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-mailchimp/import-data-header-mailchimp.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-mailchimp/import-data-header-mailchimp.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-mailchimp/import-data-header-mailchimp.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-options.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-options.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-salesforce/import-data-form-salesforce.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-salesforce/import-data-form-salesforce.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-salesforce/import-data-form-salesforce.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-salesforce/import-data-form-salesforce.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-salesforce/import-data-header-salesforce.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-salesforce/import-data-header-salesforce.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-salesforce/import-data-header-salesforce.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-salesforce/import-data-header-salesforce.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-selected-dataset-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-selected-dataset-view.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-selected-dataset-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-selected-dataset-view.js
index e941d5b050..48d55248bf 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-selected-dataset-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-selected-dataset-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var template = require('./import-selected-dataset.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-selected-dataset.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-selected-dataset.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-selected-dataset.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-selected-dataset.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-header-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-header-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-header-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-header-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-header.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-header.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-item-description-format.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-item-description-format.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-item-description-format.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-item-description-format.js
index 327a419b5a..23ea04ff8a 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-item-description-format.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-item-description-format.js
@@ -1,4 +1,4 @@
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
/**
* Service list item format utils
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-item-model.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-item-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-item-model.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-item-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-items-collection.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-items-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-items-collection.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-items-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-item-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-item-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-item-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-item-view.js
index ee82dd101d..54aaffa691 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-item-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-item-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var ServiceUtilsFormat = require('./import-service-item-description-format');
var template = require('./import-service-list-item.tpl');
var _ = require('underscore');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-item.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-item.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-list.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-loader-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-loader-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-loader-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-loader-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-loader.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-loader.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-loader.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-loader.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-oauth-model.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-oauth-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-oauth-model.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-oauth-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-token-model.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-token-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-token-model.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-token-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-view.js
index 7fc4e8e60b..06628962b7 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service-view.js
@@ -1,9 +1,9 @@
-var ImportView = require('cartodb3/components/modals/add-layer/content/imports/import-view');
-var UploadModel = require('cartodb3/data/upload-model');
+var ImportView = require('builder/components/modals/add-layer/content/imports/import-view');
+var UploadModel = require('builder/data/upload-model');
var ServiceHeaderView = require('./import-service-header-view');
var ServiceLoaderView = require('./import-service-loader-view');
var ServiceListView = require('./import-service-list-view');
-var ServiceSelectedFileView = require('cartodb3/components/modals/add-layer/content/imports/import-selected-dataset-view');
+var ServiceSelectedFileView = require('builder/components/modals/add-layer/content/imports/import-selected-dataset-view');
var ServiceTokenModel = require('./import-service-token-model');
var ServiceOauthModel = require('./import-service-oauth-model');
var ServiceCollection = require('./import-service-items-collection');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-service/import-service.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-service/import-service.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-tab.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-tab.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-tab.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-tab.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-info-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-info-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-info-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-info-view.js
index c11c04c4be..1252679f27 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-info-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-info-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var template = require('./credits-info.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-info.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-info.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-info.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-info.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-usage-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-usage-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/credits-usage-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/credits-usage-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/import-twitter-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/import-twitter-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/import-twitter-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/import-twitter-view.js
index ebcc4832d8..8d102009d1 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/import-twitter-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/import-twitter-view.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var moment = require('moment');
-var ImportView = require('cartodb3/components/modals/add-layer/content/imports/import-view');
-var UploadModel = require('cartodb3/data/upload-model');
-var DatesRangePickerView = require('cartodb3/components/date-picker-range/date-picker-range-view');
+var ImportView = require('builder/components/modals/add-layer/content/imports/import-view');
+var UploadModel = require('builder/data/upload-model');
+var DatesRangePickerView = require('builder/components/date-picker-range/date-picker-range-view');
var TwitterCategoriesView = require('./twitter-categories/twitter-categories-view');
var CreditsUsageView = require('./credits-usage-view.js');
var template = require('./import-twitter.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/import-twitter.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/import-twitter.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/import-twitter.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/import-twitter.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-collection.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-collection.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-categories-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-model.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-model.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-twitter/twitter-categories/twitter-category.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-view.js
index 309aea9214..c1bdfb05fc 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/import-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var UploadModel = require('cartodb3/data/upload-model');
+var UploadModel = require('builder/data/upload-model');
/**
* Default view for an import item
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/imports-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/imports-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports-view.js
index a837f909f7..462c87c3e4 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/imports-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports-view.js
@@ -1,18 +1,18 @@
var cdb = require('cartodb.js');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var ViewFactory = require('cartodb3/components/view-factory');
+var ViewFactory = require('builder/components/view-factory');
var importViewTemplate = require('./imports.tpl');
var importTabViewTemplate = require('./import-tab.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
var _ = require('underscore');
var IMPORT_OPTIONS = require('./import-options');
var TABS_PER_ROW = 5;
var DEFAULT_IMPORT = 'file';
var ROW_WIDTH = 800;
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'createModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/imports.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/imports/imports.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/listing-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/listing-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/listing-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/listing-view.js
index be40e8d274..38ed651738 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/listing-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/listing-view.js
@@ -2,9 +2,9 @@ var CoreView = require('backbone/core-view');
var _ = require('underscore');
var DatasetsView = require('./datasets/datasets-view');
var ImportsView = require('./imports/imports-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'createModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/navigation-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/navigation-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/navigation-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/navigation-view.js
index 1ae76ac887..c4d5d0e2ca 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/navigation-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/navigation-view.js
@@ -3,7 +3,7 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var template = require('./navigation.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/content/navigation.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/navigation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/content/navigation.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/content/navigation.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/footer-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/footer/footer-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/footer-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/footer/footer-view.js
index 8351146c4c..5b84ef9265 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/footer-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/footer/footer-view.js
@@ -2,7 +2,7 @@ var CoreView = require('backbone/core-view');
var GuessingTogglerView = require('./guessing-toggler-view');
var PrivacyTogglerView = require('./privacy-toggler-view');
var template = require('./footer.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'privacyModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/footer.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/footer/footer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/footer.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/footer/footer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/guessing-toggler-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/footer/guessing-toggler-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/guessing-toggler-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/footer/guessing-toggler-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/guessing-toggler.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/footer/guessing-toggler.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/guessing-toggler.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/footer/guessing-toggler.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/privacy-toggler-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/footer/privacy-toggler-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/privacy-toggler-view.js
rename to lib/assets/javascripts/builder/components/modals/add-layer/footer/privacy-toggler-view.js
index ddf32bff71..24e8877f75 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/privacy-toggler-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/footer/privacy-toggler-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var template = require('./privacy-toggler.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var publicPrivacy = 'PUBLIC';
var privatePrivacy = 'PRIVATE';
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/privacy-toggler.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/footer/privacy-toggler.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-layer/footer/privacy-toggler.tpl
rename to lib/assets/javascripts/builder/components/modals/add-layer/footer/privacy-toggler.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/add-widgets-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/add-widgets-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/add-widgets-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/add-widgets-view.js
index a1a202bb91..77dbba15f6 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/add-widgets-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/add-widgets-view.js
@@ -6,7 +6,7 @@ var createTuplesItems = require('./create-tuples-items');
var widgetsTypes = require('./widgets-types');
var BodyView = require('./body-view');
var template = require('./add-widgets.tpl');
-var renderLoading = require('cartodb3/components/loading/render-loading');
+var renderLoading = require('builder/components/loading/render-loading');
var TableStats = require('./tablestats.js');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/add-widgets.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/add-widgets.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/add-widgets.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/add-widgets.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/body-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/body-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/body-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/body-view.js
index fee8d4065d..106f07fbeb 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/body-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/body-view.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var createTemplateTabPane = require('cartodb3/components/tab-pane/create-template-tab-pane');
+var createTemplateTabPane = require('builder/components/tab-pane/create-template-tab-pane');
var tabPaneButtonTemplate = require('./tab-pane-button-template.tpl');
var tabPaneTemplate = require('./tab-pane-template.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-fake.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-fake.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-fake.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/category/category-fake.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option-model.js b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option-model.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option-model.js
index d938baecd3..6fdbecdc4e 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
var CATEGORY_TYPE = 'category';
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option-view.js
index 8087047ca4..4e6eca56b8 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var LayerSelectorView = require('cartodb3/components/modals/add-widgets/layer-selector-view');
+var LayerSelectorView = require('builder/components/modals/add-widgets/layer-selector-view');
var template = require('./category-option.tpl');
var categoryFake = require('./category-fake.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-option.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/category/category-option.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-options-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/category/category-options-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/category/category-options-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/category/category-options-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/create-tuples-items.js b/lib/assets/javascripts/builder/components/modals/add-widgets/create-tuples-items.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/create-tuples-items.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/create-tuples-items.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-fake.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-fake.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-fake.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-fake.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option-model.js b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option-model.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option-model.js
index 0ccf58dd7a..1375b30c1c 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option-model.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
var FORMULA_TYPE = 'formula';
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option-view.js
index 195df42b62..8d235332e2 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var LayerSelectorView = require('cartodb3/components/modals/add-widgets/layer-selector-view');
+var LayerSelectorView = require('builder/components/modals/add-widgets/layer-selector-view');
var template = require('./formula-option.tpl');
var formulaFake = require('./formula-fake.tpl');
var _ = require('underscore');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-option.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-option.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-options-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-options-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/formula/formula-options-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/formula/formula-options-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-fake.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-fake.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-fake.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-fake.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option-model.js b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option-model.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option-model.js
index 1be768ac95..15c3d481f1 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
var HISTOGRAM_TYPE = 'histogram';
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option-view.js
index 376c2963f4..d198d14bec 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var LayerSelectorView = require('cartodb3/components/modals/add-widgets/layer-selector-view');
+var LayerSelectorView = require('builder/components/modals/add-widgets/layer-selector-view');
var template = require('./histogram-option.tpl');
var histogramFake = require('./histogram-fake.tpl');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-option.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-option.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-options-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-options-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/histogram/histogram-options-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/histogram/histogram-options-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/layer-selector-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/layer-selector-view.js
similarity index 86%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/layer-selector-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/layer-selector-view.js
index e724355a6e..1f905e5a72 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/layer-selector-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/layer-selector-view.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var analyses = require('cartodb3/data/analyses');
-require('cartodb3/components/form-components/index');
-var CustomListItemView = require('cartodb3/components/form-components/editors/select/select-layer-list-item-view');
-var itemListTemplate = require('cartodb3/components/form-components/editors/select/select-layer-item.tpl');
-var selectedItemTemplate = require('cartodb3/components/form-components/editors/select/select-layer-list-item.tpl');
+var analyses = require('builder/data/analyses');
+require('builder/components/form-components/index');
+var CustomListItemView = require('builder/components/form-components/editors/select/select-layer-list-item-view');
+var itemListTemplate = require('builder/components/form-components/editors/select/select-layer-item.tpl');
+var selectedItemTemplate = require('builder/components/form-components/editors/select/select-layer-list-item.tpl');
/**
* View for selecting the layer through which to load the column data.
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/layer-selector.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/layer-selector.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/layer-selector.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/layer-selector.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/select.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/select.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/select.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/select.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/tab-pane-button-template.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/tab-pane-button-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/tab-pane-button-template.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/tab-pane-button-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/tab-pane-template.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/tab-pane-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/tab-pane-template.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/tab-pane-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/tablestats.js b/lib/assets/javascripts/builder/components/modals/add-widgets/tablestats.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/tablestats.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/tablestats.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option-model.js b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option-model.js
similarity index 85%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option-model.js
index a091304cac..5dca3798a1 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option-model.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
/**
* Special case for the time-series type, when if selected it deletes an existing time-series if there is one,
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-none-option.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-none-option.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option-model.js b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option-model.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option-model.js
index 1116aa633f..9942ec6d98 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option-model.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
var TIME_SERIES_TYPE = 'time-series';
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option-view.js
index 7ef1fbec37..a2a467bd9d 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option-view.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var LayerSelectorView = require('cartodb3/components/modals/add-widgets/layer-selector-view');
+var LayerSelectorView = require('builder/components/modals/add-widgets/layer-selector-view');
var template = require('./time-series-option.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option.tpl b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-option.tpl
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-option.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-options-view.js b/lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-options-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/time-series/time-series-options-view.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/time-series/time-series-options-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/widget-option-model.js b/lib/assets/javascripts/builder/components/modals/add-widgets/widget-option-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/widget-option-model.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/widget-option-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/widgets-types.js b/lib/assets/javascripts/builder/components/modals/add-widgets/widgets-types.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/modals/add-widgets/widgets-types.js
rename to lib/assets/javascripts/builder/components/modals/add-widgets/widgets-types.js
index 4e57801e80..d9bba85863 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/add-widgets/widgets-types.js
+++ b/lib/assets/javascripts/builder/components/modals/add-widgets/widgets-types.js
@@ -8,7 +8,7 @@ var FormulaOptionsView = require('./formula/formula-options-view');
var TimeSeriesOptionModel = require('./time-series/time-series-option-model');
var TimeSeriesNoneOptionModel = require('./time-series/time-series-none-option-model');
var TimeSeriesOptionsView = require('./time-series/time-series-options-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
var CARTODB_ID = 'cartodb_id';
diff --git a/lib/assets/javascripts/cartodb3/components/modals/confirmation/modal-confirmation-view.js b/lib/assets/javascripts/builder/components/modals/confirmation/modal-confirmation-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/confirmation/modal-confirmation-view.js
rename to lib/assets/javascripts/builder/components/modals/confirmation/modal-confirmation-view.js
index 81af27ea27..2233d5d590 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/confirmation/modal-confirmation-view.js
+++ b/lib/assets/javascripts/builder/components/modals/confirmation/modal-confirmation-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var _ = require('underscore');
-var renderLoading = require('cartodb3/components/loading/render-loading');
+var renderLoading = require('builder/components/loading/render-loading');
var ENTER_KEY_CODE = 13;
var REQUIRED_OPTS = [
'template',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/creation/modal-creation-view.js b/lib/assets/javascripts/builder/components/modals/creation/modal-creation-view.js
similarity index 86%
rename from lib/assets/javascripts/cartodb3/components/modals/creation/modal-creation-view.js
rename to lib/assets/javascripts/builder/components/modals/creation/modal-creation-view.js
index 5d6c571470..a1320683b7 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/creation/modal-creation-view.js
+++ b/lib/assets/javascripts/builder/components/modals/creation/modal-creation-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
var REQUIRED_OPTS = [
'errorTitle',
'loadingTitle',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata-error.tpl b/lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata-error.tpl
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata-view.js b/lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata-view.js
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata-view.js
index d12a7d2e31..a3d5f39924 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata-view.js
+++ b/lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata-view.js
@@ -1,16 +1,16 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var VisMetadataModel = require('cartodb3/data/vis-metadata-model');
+var VisMetadataModel = require('builder/data/vis-metadata-model');
var template = require('./dataset-metadata.tpl');
var FooterView = require('./footer/footer-view');
var templateError = require('./dataset-metadata-error.tpl');
-var templateLoading = require('cartodb3/components/loading/render-loading');
+var templateLoading = require('builder/components/loading/render-loading');
var FormView = require('./form/form-view');
var saveMetadata = require('./save-metadata-dataset');
-var errorParser = require('cartodb3/helpers/error-parser');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var utils = require('cartodb3/helpers/utils');
+var errorParser = require('builder/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var utils = require('builder/helpers/utils');
module.exports = CoreView.extend({
events: {
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata.tpl b/lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/dataset-metadata.tpl
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/dataset-metadata.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/footer/footer-view.js b/lib/assets/javascripts/builder/components/modals/dataset-metadata/footer/footer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/footer/footer-view.js
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/footer/footer-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/footer/footer.tpl b/lib/assets/javascripts/builder/components/modals/dataset-metadata/footer/footer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/footer/footer.tpl
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/footer/footer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/form/form-view.js b/lib/assets/javascripts/builder/components/modals/dataset-metadata/form/form-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/form/form-view.js
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/form/form-view.js
index 77810a5aa6..f1f1a716a9 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/form/form-view.js
+++ b/lib/assets/javascripts/builder/components/modals/dataset-metadata/form/form-view.js
@@ -2,9 +2,9 @@ var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var templateForm = require('./form.tpl');
-require('cartodb3/components/form-components/index');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var utils = require('cartodb3/helpers/utils');
+require('builder/components/form-components/index');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var utils = require('builder/helpers/utils');
var REQUIRED_OPTS = [
'visDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/form/form.tpl b/lib/assets/javascripts/builder/components/modals/dataset-metadata/form/form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/form/form.tpl
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/form/form.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/save-metadata-dataset.js b/lib/assets/javascripts/builder/components/modals/dataset-metadata/save-metadata-dataset.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/save-metadata-dataset.js
rename to lib/assets/javascripts/builder/components/modals/dataset-metadata/save-metadata-dataset.js
index 09f0ee518e..cb2919657e 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/dataset-metadata/save-metadata-dataset.js
+++ b/lib/assets/javascripts/builder/components/modals/dataset-metadata/save-metadata-dataset.js
@@ -1,4 +1,4 @@
-var TITLE_SUFIX = require('cartodb3/components/modals/visualization-title-suffix-metadata');
+var TITLE_SUFIX = require('builder/components/modals/visualization-title-suffix-metadata');
module.exports = function (opts) {
if (!opts.visDefinitionModel) throw new Error('visDefinitionModel is required');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view.js b/lib/assets/javascripts/builder/components/modals/editor-visualization-warning/editor-visualization-warning-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view.js
rename to lib/assets/javascripts/builder/components/modals/editor-visualization-warning/editor-visualization-warning-view.js
index 187dde44fe..f9a431293e 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view.js
+++ b/lib/assets/javascripts/builder/components/modals/editor-visualization-warning/editor-visualization-warning-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
var template = require('./editor-visualization-warning.tpl');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
-var errorParser = require('cartodb3/helpers/error-parser');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
+var errorParser = require('builder/helpers/error-parser');
var VIS_VERSION = 3;
/**
diff --git a/lib/assets/javascripts/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning.tpl b/lib/assets/javascripts/builder/components/modals/editor-visualization-warning/editor-visualization-warning.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning.tpl
rename to lib/assets/javascripts/builder/components/modals/editor-visualization-warning/editor-visualization-warning.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-format-view.js b/lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-format-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-format-view.js
rename to lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-format-view.js
index 1e5ef4a7a9..bd9bfa37e5 100644
--- a/lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-format-view.js
+++ b/lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-format-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./modal-export-data-format.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'format',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-format.tpl b/lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-format.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-format.tpl
rename to lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-format.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-view.js b/lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-view.js
rename to lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-view.js
index 569440d5de..53355f15da 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data-view.js
+++ b/lib/assets/javascripts/builder/components/modals/export-data/modal-export-data-view.js
@@ -1,11 +1,11 @@
var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
var template = require('./modal-export-data.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
var FormatView = require('./modal-export-data-format-view');
var MAX_SQL_GET_LENGTH = 1000;
diff --git a/lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data.tpl b/lib/assets/javascripts/builder/components/modals/export-data/modal-export-data.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/export-data/modal-export-data.tpl
rename to lib/assets/javascripts/builder/components/modals/export-data/modal-export-data.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/footer/footer-view.js b/lib/assets/javascripts/builder/components/modals/map-metadata/footer/footer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/footer/footer-view.js
rename to lib/assets/javascripts/builder/components/modals/map-metadata/footer/footer-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/footer/footer.tpl b/lib/assets/javascripts/builder/components/modals/map-metadata/footer/footer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/footer/footer.tpl
rename to lib/assets/javascripts/builder/components/modals/map-metadata/footer/footer.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/form/form-view.js b/lib/assets/javascripts/builder/components/modals/map-metadata/form/form-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/form/form-view.js
rename to lib/assets/javascripts/builder/components/modals/map-metadata/form/form-view.js
index 4db4f72e78..2dcff5f148 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/form/form-view.js
+++ b/lib/assets/javascripts/builder/components/modals/map-metadata/form/form-view.js
@@ -2,9 +2,9 @@ var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var templateForm = require('./form.tpl');
-require('cartodb3/components/form-components/index');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var utils = require('cartodb3/helpers/utils');
+require('builder/components/form-components/index');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var utils = require('builder/helpers/utils');
var REQUIRED_OPTS = [
'visDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/form/form.tpl b/lib/assets/javascripts/builder/components/modals/map-metadata/form/form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/form/form.tpl
rename to lib/assets/javascripts/builder/components/modals/map-metadata/form/form.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata-error.tpl b/lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata-error.tpl
rename to lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata-view.js b/lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata-view.js
rename to lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata-view.js
index c750d8b280..669ef217b9 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata-view.js
+++ b/lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata-view.js
@@ -1,16 +1,16 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var VisMetadataModel = require('cartodb3/data/vis-metadata-model');
+var VisMetadataModel = require('builder/data/vis-metadata-model');
var template = require('./map-metadata.tpl');
var FooterView = require('./footer/footer-view');
var templateError = require('./map-metadata-error.tpl');
-var templateLoading = require('cartodb3/components/loading/render-loading');
+var templateLoading = require('builder/components/loading/render-loading');
var FormView = require('./form/form-view');
var saveMetadata = require('./save-metadata-map');
-var errorParser = require('cartodb3/helpers/error-parser');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var utils = require('cartodb3/helpers/utils');
+var errorParser = require('builder/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var utils = require('builder/helpers/utils');
/**
* Add layer dialog, typically used from editor
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata.tpl b/lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/map-metadata.tpl
rename to lib/assets/javascripts/builder/components/modals/map-metadata/map-metadata.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/save-metadata-map.js b/lib/assets/javascripts/builder/components/modals/map-metadata/save-metadata-map.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/modals/map-metadata/save-metadata-map.js
rename to lib/assets/javascripts/builder/components/modals/map-metadata/save-metadata-map.js
index 0b321e5884..fbf920c337 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/map-metadata/save-metadata-map.js
+++ b/lib/assets/javascripts/builder/components/modals/map-metadata/save-metadata-map.js
@@ -1,4 +1,4 @@
-var TITLE_SUFIX = require('cartodb3/components/modals/visualization-title-suffix-metadata');
+var TITLE_SUFIX = require('builder/components/modals/visualization-title-suffix-metadata');
module.exports = function (opts) {
if (!opts.visDefinitionModel) throw new Error('visDefinitionModel is required');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/modal-view-model.js b/lib/assets/javascripts/builder/components/modals/modal-view-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/modal-view-model.js
rename to lib/assets/javascripts/builder/components/modals/modal-view-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/modal-view.js b/lib/assets/javascripts/builder/components/modals/modal-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/modal-view.js
rename to lib/assets/javascripts/builder/components/modals/modal-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/modal.tpl b/lib/assets/javascripts/builder/components/modals/modal.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/modal.tpl
rename to lib/assets/javascripts/builder/components/modals/modal.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/modals-service-model.js b/lib/assets/javascripts/builder/components/modals/modals-service-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/modals-service-model.js
rename to lib/assets/javascripts/builder/components/modals/modals-service-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/create-privacy-options.js b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/create-privacy-options.js
rename to lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/create-share-options.js b/lib/assets/javascripts/builder/components/modals/publish/create-share-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/create-share-options.js
rename to lib/assets/javascripts/builder/components/modals/publish/create-share-options.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/privacy-collection.js b/lib/assets/javascripts/builder/components/modals/publish/privacy-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/privacy-collection.js
rename to lib/assets/javascripts/builder/components/modals/publish/privacy-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/privacy-model.js b/lib/assets/javascripts/builder/components/modals/publish/privacy-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/privacy-model.js
rename to lib/assets/javascripts/builder/components/modals/publish/privacy-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/privacy-password-model.js b/lib/assets/javascripts/builder/components/modals/publish/privacy-password-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/privacy-password-model.js
rename to lib/assets/javascripts/builder/components/modals/publish/privacy-password-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish-button-view.js b/lib/assets/javascripts/builder/components/modals/publish/publish-button-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish-button-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish-button-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish-button.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish-button.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish-button.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish-button.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish-view.js b/lib/assets/javascripts/builder/components/modals/publish/publish-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish-view.js
index 06401d5666..97dc905a0a 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/publish-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/publish-view.js
@@ -2,14 +2,14 @@ var moment = require('moment');
var CoreView = require('backbone/core-view');
var template = require('./publish.tpl');
var TabPaneTemplate = require('./tab-pane-submenu.tpl');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
var PublishView = require('./publish/publish-view');
var ShareView = require('./share/share-view');
-var PrivacyDropdown = require('cartodb3/components/privacy-dropdown/privacy-dropdown-view');
+var PrivacyDropdown = require('builder/components/privacy-dropdown/privacy-dropdown-view');
var PublishButton = require('./publish-button-view');
var ShareWith = require('./share-with-view');
var UpgradeView = require('./upgrade-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'modalModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/create-share-options.js b/lib/assets/javascripts/builder/components/modals/publish/publish/create-share-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/create-share-options.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish/create-share-options.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/icon-embed.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish/icon-embed.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/icon-embed.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish/icon-embed.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/icon-link.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish/icon-link.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/icon-link.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish/icon-link.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/icon-mobile.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish/icon-mobile.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/icon-mobile.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish/icon-mobile.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/publish-view.js b/lib/assets/javascripts/builder/components/modals/publish/publish/publish-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/publish-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish/publish-view.js
index e721533334..04d0803515 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/publish-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/publish/publish-view.js
@@ -3,7 +3,7 @@ var CreateShareOptions = require('./create-share-options');
var ShareCollection = require('./share-collection');
var ShareItemView = require('./share-item-view');
var template = require('./publish.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'visDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/publish.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish/publish.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/publish.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish/publish.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-collection.js b/lib/assets/javascripts/builder/components/modals/publish/publish/share-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-collection.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish/share-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-item-view.js b/lib/assets/javascripts/builder/components/modals/publish/publish/share-item-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-item-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish/share-item-view.js
index a529d6bc40..47842755d0 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-item-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/publish/share-item-view.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var CoreView = require('backbone/core-view');
var Clipboard = require('clipboard');
var template = require('./share-item.tpl');
-var browserDetect = require('cartodb3/helpers/browser-detect');
+var browserDetect = require('builder/helpers/browser-detect');
var PRIVATE_LABEL_TEMPLATE = _.template("
<%- private %>.
")({
private: _t('components.modals.publish.share.private')
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-item.tpl b/lib/assets/javascripts/builder/components/modals/publish/publish/share-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-item.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/publish/share-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-model.js b/lib/assets/javascripts/builder/components/modals/publish/publish/share-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/publish/share-model.js
rename to lib/assets/javascripts/builder/components/modals/publish/publish/share-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share-with-view.js b/lib/assets/javascripts/builder/components/modals/publish/share-with-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share-with-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/share-with-view.js
index 4a42345377..b0b545df61 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/share-with-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/share-with-view.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./share-with.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'visDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share-with.tpl b/lib/assets/javascripts/builder/components/modals/publish/share-with.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share-with.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/share-with.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share-list-view.js b/lib/assets/javascripts/builder/components/modals/publish/share/share-list-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/share-list-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/share/share-list-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share-permission-view.js b/lib/assets/javascripts/builder/components/modals/publish/share/share-permission-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/share-permission-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/share/share-permission-view.js
index 62a835949e..8aab02d88a 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share-permission-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/share/share-permission-view.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./share-permission.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view.js');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view.js');
var $ = require('jquery');
var UsersGroup = require('./users-group-view');
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share-permission.tpl b/lib/assets/javascripts/builder/components/modals/publish/share/share-permission.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/share-permission.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/share/share-permission.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share-view.js b/lib/assets/javascripts/builder/components/modals/publish/share/share-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/share-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/share/share-view.js
index 08ca4c4229..989bbb2924 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/share/share-view.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./share.tpl');
-var GrantableCollection = require('cartodb3/data/grantables-collection');
-var SearchPaginationView = require('cartodb3/components/pagination-search/pagination-search-view');
+var GrantableCollection = require('builder/data/grantables-collection');
+var SearchPaginationView = require('builder/components/pagination-search/pagination-search-view');
var ListView = require('./share-list-view');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/share.tpl b/lib/assets/javascripts/builder/components/modals/publish/share/share.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/share.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/share/share.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/user-view.js b/lib/assets/javascripts/builder/components/modals/publish/share/user-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/user-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/share/user-view.js
index d1608b4b96..5e885055bb 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/publish/share/user-view.js
+++ b/lib/assets/javascripts/builder/components/modals/publish/share/user-view.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./user.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var REQUIRED_OPTS = [
'username',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/user.tpl b/lib/assets/javascripts/builder/components/modals/publish/share/user.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/user.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/share/user.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/users-group-view.js b/lib/assets/javascripts/builder/components/modals/publish/share/users-group-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/users-group-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/share/users-group-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/share/users-group.tpl b/lib/assets/javascripts/builder/components/modals/publish/share/users-group.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/share/users-group.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/share/users-group.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/tab-pane-submenu.tpl b/lib/assets/javascripts/builder/components/modals/publish/tab-pane-submenu.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/tab-pane-submenu.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/tab-pane-submenu.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/upgrade-view.js b/lib/assets/javascripts/builder/components/modals/publish/upgrade-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/upgrade-view.js
rename to lib/assets/javascripts/builder/components/modals/publish/upgrade-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/modals/publish/upgrade.tpl b/lib/assets/javascripts/builder/components/modals/publish/upgrade.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/publish/upgrade.tpl
rename to lib/assets/javascripts/builder/components/modals/publish/upgrade.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/remove-dataset/remove-dataset-view.js b/lib/assets/javascripts/builder/components/modals/remove-dataset/remove-dataset-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/components/modals/remove-dataset/remove-dataset-view.js
rename to lib/assets/javascripts/builder/components/modals/remove-dataset/remove-dataset-view.js
index 1ee51b5207..e94613af70 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/remove-dataset/remove-dataset-view.js
+++ b/lib/assets/javascripts/builder/components/modals/remove-dataset/remove-dataset-view.js
@@ -1,13 +1,13 @@
var _ = require('underscore');
var moment = require('moment');
-var ConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var MapcardPreview = require('cartodb3/helpers/mapcard-preview');
-var ErrorView = require('cartodb3/components/error/error-view');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var tableDeleteOperation = require('cartodb3/dataset/operations/table-delete-operation');
+var ConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var MapcardPreview = require('builder/helpers/mapcard-preview');
+var ErrorView = require('builder/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
+var tableDeleteOperation = require('builder/dataset/operations/table-delete-operation');
var template = require('./remove-dataset.tpl');
-var errorParser = require('cartodb3/helpers/error-parser');
+var errorParser = require('builder/helpers/error-parser');
var REQUIRED_OPTS = [
'modalModel',
'userModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/remove-dataset/remove-dataset.tpl b/lib/assets/javascripts/builder/components/modals/remove-dataset/remove-dataset.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/remove-dataset/remove-dataset.tpl
rename to lib/assets/javascripts/builder/components/modals/remove-dataset/remove-dataset.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/remove-layer/delete-layer-confirmation-view.js b/lib/assets/javascripts/builder/components/modals/remove-layer/delete-layer-confirmation-view.js
similarity index 85%
rename from lib/assets/javascripts/cartodb3/components/modals/remove-layer/delete-layer-confirmation-view.js
rename to lib/assets/javascripts/builder/components/modals/remove-layer/delete-layer-confirmation-view.js
index 20f9eb4d09..b9f78698b3 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/remove-layer/delete-layer-confirmation-view.js
+++ b/lib/assets/javascripts/builder/components/modals/remove-layer/delete-layer-confirmation-view.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
-var ConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var ExportView = require('cartodb3/editor/components/modals/export-map/modal-export-map-view.js');
-var ExportMapModel = require('cartodb3/data/export-map-definition-model.js');
-var templateConfirmation = require('cartodb3/editor/layers/delete-layer-confirmation.tpl');
-var removeLayer = require('cartodb3/editor/layers/operations/remove-layer');
+var ConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var ExportView = require('builder/editor/components/modals/export-map/modal-export-map-view.js');
+var ExportMapModel = require('builder/data/export-map-definition-model.js');
+var templateConfirmation = require('builder/editor/layers/delete-layer-confirmation.tpl');
+var removeLayer = require('builder/editor/layers/operations/remove-layer');
var REQUIRED_OPTS = [
'modalModel',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/sync-options/sync-options-modal-view.js b/lib/assets/javascripts/builder/components/modals/sync-options/sync-options-modal-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/modals/sync-options/sync-options-modal-view.js
rename to lib/assets/javascripts/builder/components/modals/sync-options/sync-options-modal-view.js
index b9904cc587..1330954658 100755
--- a/lib/assets/javascripts/cartodb3/components/modals/sync-options/sync-options-modal-view.js
+++ b/lib/assets/javascripts/builder/components/modals/sync-options/sync-options-modal-view.js
@@ -1,8 +1,8 @@
var CoreView = require('backbone/core-view');
var template = require('./sync-options-modal.tpl');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
-var errorParser = require('cartodb3/helpers/error-parser');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
+var errorParser = require('builder/helpers/error-parser');
module.exports = CoreView.extend({
className: 'Dialog-content',
diff --git a/lib/assets/javascripts/cartodb3/components/modals/sync-options/sync-options-modal.tpl b/lib/assets/javascripts/builder/components/modals/sync-options/sync-options-modal.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/sync-options/sync-options-modal.tpl
rename to lib/assets/javascripts/builder/components/modals/sync-options/sync-options-modal.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/modals/visualization-title-suffix-metadata.js b/lib/assets/javascripts/builder/components/modals/visualization-title-suffix-metadata.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/modals/visualization-title-suffix-metadata.js
rename to lib/assets/javascripts/builder/components/modals/visualization-title-suffix-metadata.js
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic-form-view.js b/lib/assets/javascripts/builder/components/mosaic-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic-form-view.js
rename to lib/assets/javascripts/builder/components/mosaic-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic-collection.js b/lib/assets/javascripts/builder/components/mosaic/mosaic-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic-collection.js
rename to lib/assets/javascripts/builder/components/mosaic/mosaic-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic-item-model.js b/lib/assets/javascripts/builder/components/mosaic/mosaic-item-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic-item-model.js
rename to lib/assets/javascripts/builder/components/mosaic/mosaic-item-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic-item-view.js b/lib/assets/javascripts/builder/components/mosaic/mosaic-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic-item-view.js
rename to lib/assets/javascripts/builder/components/mosaic/mosaic-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic-item.tpl b/lib/assets/javascripts/builder/components/mosaic/mosaic-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic-item.tpl
rename to lib/assets/javascripts/builder/components/mosaic/mosaic-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic-thumbnail.tpl b/lib/assets/javascripts/builder/components/mosaic/mosaic-thumbnail.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic-thumbnail.tpl
rename to lib/assets/javascripts/builder/components/mosaic/mosaic-thumbnail.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic-view.js b/lib/assets/javascripts/builder/components/mosaic/mosaic-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic-view.js
rename to lib/assets/javascripts/builder/components/mosaic/mosaic-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/mosaic/mosaic.tpl b/lib/assets/javascripts/builder/components/mosaic/mosaic.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/mosaic/mosaic.tpl
rename to lib/assets/javascripts/builder/components/mosaic/mosaic.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/no-results/no-results.tpl b/lib/assets/javascripts/builder/components/no-results/no-results.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/no-results/no-results.tpl
rename to lib/assets/javascripts/builder/components/no-results/no-results.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/no-results/render-no-results.js b/lib/assets/javascripts/builder/components/no-results/render-no-results.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/no-results/render-no-results.js
rename to lib/assets/javascripts/builder/components/no-results/render-no-results.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-action-view.js b/lib/assets/javascripts/builder/components/notifier/notifier-action-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-action-view.js
rename to lib/assets/javascripts/builder/components/notifier/notifier-action-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-action.tpl b/lib/assets/javascripts/builder/components/notifier/notifier-action.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-action.tpl
rename to lib/assets/javascripts/builder/components/notifier/notifier-action.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-close.tpl b/lib/assets/javascripts/builder/components/notifier/notifier-close.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-close.tpl
rename to lib/assets/javascripts/builder/components/notifier/notifier-close.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-collection.js b/lib/assets/javascripts/builder/components/notifier/notifier-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-collection.js
rename to lib/assets/javascripts/builder/components/notifier/notifier-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-item-view.js b/lib/assets/javascripts/builder/components/notifier/notifier-item-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-item-view.js
rename to lib/assets/javascripts/builder/components/notifier/notifier-item-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-item.tpl b/lib/assets/javascripts/builder/components/notifier/notifier-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-item.tpl
rename to lib/assets/javascripts/builder/components/notifier/notifier-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-model.js b/lib/assets/javascripts/builder/components/notifier/notifier-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-model.js
rename to lib/assets/javascripts/builder/components/notifier/notifier-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier-view.js b/lib/assets/javascripts/builder/components/notifier/notifier-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier-view.js
rename to lib/assets/javascripts/builder/components/notifier/notifier-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier.js b/lib/assets/javascripts/builder/components/notifier/notifier.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier.js
rename to lib/assets/javascripts/builder/components/notifier/notifier.js
diff --git a/lib/assets/javascripts/cartodb3/components/notifier/notifier.tpl b/lib/assets/javascripts/builder/components/notifier/notifier.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/notifier/notifier.tpl
rename to lib/assets/javascripts/builder/components/notifier/notifier.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/aggregate-intersection.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/aggregate-intersection.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/aggregate-intersection.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/aggregate-intersection.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/area-of-influence.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/area-of-influence.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/area-of-influence.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/area-of-influence.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/centroid.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/centroid.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/centroid.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/centroid.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/closest.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/closest.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/closest.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/closest.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/cluster.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/cluster.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/cluster.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/cluster.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/connect-with-lines.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/connect-with-lines.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/connect-with-lines.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/connect-with-lines.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/data-observatory-measure.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/data-observatory-measure.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/data-observatory-measure.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/data-observatory-measure.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/data-observatory-multiple-measure.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/data-observatory-multiple-measure.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/data-observatory-multiple-measure.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/data-observatory-multiple-measure.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/filter-by-node-column.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/filter-by-node-column.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/filter-by-node-column.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/filter-by-node-column.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/filter.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/filter.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/filter.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/filter.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/georeference.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/georeference.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/georeference.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/georeference.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/group-points.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/group-points.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/group-points.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/group-points.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/intersection.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/intersection.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/intersection.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/intersection.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/kmeans.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/kmeans.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/kmeans.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/kmeans.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/merge.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/merge.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/merge.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/merge.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/moran.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/moran.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/moran.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/moran.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/sampling.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/sampling.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/sampling.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/sampling.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/spatial-markov-trend.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analyses/spatial-markov-trend.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analyses/spatial-markov-trend.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analyses/spatial-markov-trend.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-launcher.js b/lib/assets/javascripts/builder/components/onboardings/analysis/analysis-launcher.js
similarity index 84%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-launcher.js
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analysis-launcher.js
index 07affb8325..36d310e931 100755
--- a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-launcher.js
+++ b/lib/assets/javascripts/builder/components/onboardings/analysis/analysis-launcher.js
@@ -1,6 +1,6 @@
-var LocalStorage = require('cartodb3/components/local-storage/local-storage');
-var AnalysisOnboardingView = require('cartodb3/components/onboardings/analysis/analysis-view');
-var Analyses = require('cartodb3/data/analyses');
+var LocalStorage = require('builder/components/local-storage/local-storage');
+var AnalysisOnboardingView = require('builder/components/onboardings/analysis/analysis-view');
+var Analyses = require('builder/data/analyses');
var STORAGE_KEY = 'onboarding';
var launcher = (function () {
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-view.js b/lib/assets/javascripts/builder/components/onboardings/analysis/analysis-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-view.js
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analysis-view.js
index 7ab7d4e928..f80450982c 100755
--- a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-view.js
+++ b/lib/assets/javascripts/builder/components/onboardings/analysis/analysis-view.js
@@ -1,7 +1,7 @@
-var LocalStorage = require('cartodb3/components/local-storage/local-storage');
+var LocalStorage = require('builder/components/local-storage/local-storage');
var CoreView = require('backbone/core-view');
var template = require('./analysis-view.tpl');
-var Analyses = require('cartodb3/data/analyses');
+var Analyses = require('builder/data/analyses');
var STORAGE_KEY = 'onboarding';
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-view.tpl b/lib/assets/javascripts/builder/components/onboardings/analysis/analysis-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/analysis/analysis-view.tpl
rename to lib/assets/javascripts/builder/components/onboardings/analysis/analysis-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/builder-activated/builder-activated-notification-view.js b/lib/assets/javascripts/builder/components/onboardings/builder-activated/builder-activated-notification-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/builder-activated/builder-activated-notification-view.js
rename to lib/assets/javascripts/builder/components/onboardings/builder-activated/builder-activated-notification-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/builder-activated/builder-activated-notification.tpl b/lib/assets/javascripts/builder/components/onboardings/builder-activated/builder-activated-notification.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/builder-activated/builder-activated-notification.tpl
rename to lib/assets/javascripts/builder/components/onboardings/builder-activated/builder-activated-notification.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/builder/builder-view.js b/lib/assets/javascripts/builder/components/onboardings/builder/builder-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/onboardings/builder/builder-view.js
rename to lib/assets/javascripts/builder/components/onboardings/builder/builder-view.js
index 37015ad6cc..b3de5ef135 100755
--- a/lib/assets/javascripts/cartodb3/components/onboardings/builder/builder-view.js
+++ b/lib/assets/javascripts/builder/components/onboardings/builder/builder-view.js
@@ -2,8 +2,8 @@ var $ = require('jquery');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./builder-view.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var GAPusher = require('cartodb3/helpers/ga-pusher');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var GAPusher = require('builder/helpers/ga-pusher');
var BUILDER_KEY = 'onboarding';
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/builder/builder-view.tpl b/lib/assets/javascripts/builder/components/onboardings/builder/builder-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/builder/builder-view.tpl
rename to lib/assets/javascripts/builder/components/onboardings/builder/builder-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/builder/launcher.js b/lib/assets/javascripts/builder/components/onboardings/builder/launcher.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/onboardings/builder/launcher.js
rename to lib/assets/javascripts/builder/components/onboardings/builder/launcher.js
index c7b31f6b2e..d4fc7b9891 100755
--- a/lib/assets/javascripts/cartodb3/components/onboardings/builder/launcher.js
+++ b/lib/assets/javascripts/builder/components/onboardings/builder/launcher.js
@@ -1,5 +1,5 @@
var BuilderOnboardingView = require('./builder-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var BUILDER_KEY = 'onboarding';
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/generic/generic-onboarding-launcher.js b/lib/assets/javascripts/builder/components/onboardings/generic/generic-onboarding-launcher.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/generic/generic-onboarding-launcher.js
rename to lib/assets/javascripts/builder/components/onboardings/generic/generic-onboarding-launcher.js
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/generic/generic-onboarding-view.js b/lib/assets/javascripts/builder/components/onboardings/generic/generic-onboarding-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/onboardings/generic/generic-onboarding-view.js
rename to lib/assets/javascripts/builder/components/onboardings/generic/generic-onboarding-view.js
index 2a009fef42..b9e9aa76b6 100644
--- a/lib/assets/javascripts/cartodb3/components/onboardings/generic/generic-onboarding-view.js
+++ b/lib/assets/javascripts/builder/components/onboardings/generic/generic-onboarding-view.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var Backbone = require('backbone');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'onboardingNotification',
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.js b/lib/assets/javascripts/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.js
similarity index 78%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.js
rename to lib/assets/javascripts/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.js
index 39d1e5d9fa..6bc0cf1cf7 100644
--- a/lib/assets/javascripts/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.js
+++ b/lib/assets/javascripts/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var OnboardingView = require('cartodb3/components/onboardings/generic/generic-onboarding-view');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
+var OnboardingView = require('builder/components/onboardings/generic/generic-onboarding-view');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
var template = require('./analysis-onboarding.tpl');
module.exports = OnboardingView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding.tpl b/lib/assets/javascripts/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding.tpl
rename to lib/assets/javascripts/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.js b/lib/assets/javascripts/builder/components/onboardings/layers/data-onboarding/data-onboarding-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.js
rename to lib/assets/javascripts/builder/components/onboardings/layers/data-onboarding/data-onboarding-view.js
index b32e5ac511..6fda0191ff 100644
--- a/lib/assets/javascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.js
+++ b/lib/assets/javascripts/builder/components/onboardings/layers/data-onboarding/data-onboarding-view.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var $ = require('jquery');
-var OnboardingView = require('cartodb3/components/onboardings/generic/generic-onboarding-view');
+var OnboardingView = require('builder/components/onboardings/generic/generic-onboarding-view');
var template = require('./data-onboarding.tpl');
module.exports = OnboardingView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding.tpl b/lib/assets/javascripts/builder/components/onboardings/layers/data-onboarding/data-onboarding.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding.tpl
rename to lib/assets/javascripts/builder/components/onboardings/layers/data-onboarding/data-onboarding.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/layer-onboarding-key.js b/lib/assets/javascripts/builder/components/onboardings/layers/layer-onboarding-key.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/layer-onboarding-key.js
rename to lib/assets/javascripts/builder/components/onboardings/layers/layer-onboarding-key.js
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view.js b/lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-onboarding-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view.js
rename to lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-onboarding-view.js
index 4d0ac8fc4d..3c0ce7c391 100644
--- a/lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view.js
+++ b/lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-onboarding-view.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var $ = require('jquery');
-var OnboardingView = require('cartodb3/components/onboardings/generic/generic-onboarding-view');
+var OnboardingView = require('builder/components/onboardings/generic/generic-onboarding-view');
var defaultTemplate = require('./style-onboarding.tpl');
var pointsTemplate = require('./style-points-onboarding.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'geom'
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding.tpl b/lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-onboarding.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding.tpl
rename to lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-onboarding.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-points-onboarding.tpl b/lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-points-onboarding.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/layers/style-onboarding/style-points-onboarding.tpl
rename to lib/assets/javascripts/builder/components/onboardings/layers/style-onboarding/style-points-onboarding.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/onboarding-view-model.js b/lib/assets/javascripts/builder/components/onboardings/onboarding-view-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/onboarding-view-model.js
rename to lib/assets/javascripts/builder/components/onboardings/onboarding-view-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/onboarding-view.js b/lib/assets/javascripts/builder/components/onboardings/onboarding-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/onboarding-view.js
rename to lib/assets/javascripts/builder/components/onboardings/onboarding-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/onboarding.tpl b/lib/assets/javascripts/builder/components/onboardings/onboarding.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/onboarding.tpl
rename to lib/assets/javascripts/builder/components/onboardings/onboarding.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/onboardings/onboardings-service-model.js b/lib/assets/javascripts/builder/components/onboardings/onboardings-service-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/onboardings/onboardings-service-model.js
rename to lib/assets/javascripts/builder/components/onboardings/onboardings-service-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search-model.js b/lib/assets/javascripts/builder/components/pagination-search/pagination-search-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search-model.js
rename to lib/assets/javascripts/builder/components/pagination-search/pagination-search-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search-view.js b/lib/assets/javascripts/builder/components/pagination-search/pagination-search-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search-view.js
rename to lib/assets/javascripts/builder/components/pagination-search/pagination-search-view.js
index 442f72fdb1..3cd60c3e84 100755
--- a/lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search-view.js
+++ b/lib/assets/javascripts/builder/components/pagination-search/pagination-search-view.js
@@ -1,14 +1,14 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var PaginationModel = require('cartodb3/components/pagination/pagination-model');
+var PaginationModel = require('builder/components/pagination/pagination-model');
var PaginationSearchModel = require('./pagination-search-model');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var renderNoResults = require('cartodb3/components/no-results/render-no-results');
-var ErrorView = require('cartodb3/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
+var renderNoResults = require('builder/components/no-results/render-no-results');
+var ErrorView = require('builder/components/error/error-view');
var template = require('./pagination-search.tpl');
-var Utils = require('cartodb3/helpers/utils');
-var PaginationView = require('cartodb3/components/pagination/pagination-view');
+var Utils = require('builder/helpers/utils');
+var PaginationView = require('builder/components/pagination/pagination-view');
var paginationTemplate = require('./pagination.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search.tpl b/lib/assets/javascripts/builder/components/pagination-search/pagination-search.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/pagination-search/pagination-search.tpl
rename to lib/assets/javascripts/builder/components/pagination-search/pagination-search.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/pagination-search/pagination.tpl b/lib/assets/javascripts/builder/components/pagination-search/pagination.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/pagination-search/pagination.tpl
rename to lib/assets/javascripts/builder/components/pagination-search/pagination.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/pagination/pagination-model.js b/lib/assets/javascripts/builder/components/pagination/pagination-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/pagination/pagination-model.js
rename to lib/assets/javascripts/builder/components/pagination/pagination-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/pagination/pagination-view.js b/lib/assets/javascripts/builder/components/pagination/pagination-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/pagination/pagination-view.js
rename to lib/assets/javascripts/builder/components/pagination/pagination-view.js
index 7aab49b8dc..36b8f0b7a7 100755
--- a/lib/assets/javascripts/cartodb3/components/pagination/pagination-view.js
+++ b/lib/assets/javascripts/builder/components/pagination/pagination-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
-var navigateThroughRouter = require('cartodb3/helpers/navigate-through-router');
+var navigateThroughRouter = require('builder/helpers/navigate-through-router');
var template = require('./pagination.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/components/pagination/pagination.tpl b/lib/assets/javascripts/builder/components/pagination/pagination.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/pagination/pagination.tpl
rename to lib/assets/javascripts/builder/components/pagination/pagination.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/popup-manager.js b/lib/assets/javascripts/builder/components/popup-manager.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/popup-manager.js
rename to lib/assets/javascripts/builder/components/popup-manager.js
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/password-dialog-view.js b/lib/assets/javascripts/builder/components/privacy-dropdown/password-dialog-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/password-dialog-view.js
rename to lib/assets/javascripts/builder/components/privacy-dropdown/password-dialog-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/password-dialog.tpl b/lib/assets/javascripts/builder/components/privacy-dropdown/password-dialog.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/password-dialog.tpl
rename to lib/assets/javascripts/builder/components/privacy-dropdown/password-dialog.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-cta.tpl b/lib/assets/javascripts/builder/components/privacy-dropdown/privacy-cta.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-cta.tpl
rename to lib/assets/javascripts/builder/components/privacy-dropdown/privacy-cta.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dialog-view.js b/lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dialog-view.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dialog-view.js
rename to lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dialog-view.js
index 9b6014cc53..5116e1e02d 100755
--- a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dialog-view.js
+++ b/lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dialog-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-list-view');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
+var CustomListView = require('builder/components/custom-list/custom-list-view');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
var privacyCTATemplate = require('./privacy-cta.tpl');
var _ = require('underscore');
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dropdown-view.js b/lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dropdown-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dropdown-view.js
rename to lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dropdown-view.js
index c5c74d2fa6..db327eb426 100755
--- a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dropdown-view.js
+++ b/lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dropdown-view.js
@@ -3,13 +3,13 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var PrivacyDialogView = require('./privacy-dialog-view');
var PasswordDialogView = require('./password-dialog-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var template = require('./privacy-dropdown.tpl');
var templateTabPane = require('./tab-pane.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var ESCAPE_KEY_CODE = 27;
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dropdown.tpl b/lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dropdown.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/privacy-dropdown.tpl
rename to lib/assets/javascripts/builder/components/privacy-dropdown/privacy-dropdown.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/privacy-dropdown/tab-pane.tpl b/lib/assets/javascripts/builder/components/privacy-dropdown/tab-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/privacy-dropdown/tab-pane.tpl
rename to lib/assets/javascripts/builder/components/privacy-dropdown/tab-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/scroll/scroll-view.js b/lib/assets/javascripts/builder/components/scroll/scroll-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/scroll/scroll-view.js
rename to lib/assets/javascripts/builder/components/scroll/scroll-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/scroll/scroll.tpl b/lib/assets/javascripts/builder/components/scroll/scroll.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/scroll/scroll.tpl
rename to lib/assets/javascripts/builder/components/scroll/scroll.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/stack-layout/stack-layout-model.js b/lib/assets/javascripts/builder/components/stack-layout/stack-layout-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/stack-layout/stack-layout-model.js
rename to lib/assets/javascripts/builder/components/stack-layout/stack-layout-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/stack-layout/stack-layout-view.js b/lib/assets/javascripts/builder/components/stack-layout/stack-layout-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/stack-layout/stack-layout-view.js
rename to lib/assets/javascripts/builder/components/stack-layout/stack-layout-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/create-editor-menu-tab-pane.js b/lib/assets/javascripts/builder/components/tab-pane/create-editor-menu-tab-pane.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/create-editor-menu-tab-pane.js
rename to lib/assets/javascripts/builder/components/tab-pane/create-editor-menu-tab-pane.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/create-mixed-labels-tab-pane.js b/lib/assets/javascripts/builder/components/tab-pane/create-mixed-labels-tab-pane.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/create-mixed-labels-tab-pane.js
rename to lib/assets/javascripts/builder/components/tab-pane/create-mixed-labels-tab-pane.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/create-template-tab-pane.js b/lib/assets/javascripts/builder/components/tab-pane/create-template-tab-pane.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/create-template-tab-pane.js
rename to lib/assets/javascripts/builder/components/tab-pane/create-template-tab-pane.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/create-text-labels-tab-pane-routed.js b/lib/assets/javascripts/builder/components/tab-pane/create-text-labels-tab-pane-routed.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/create-text-labels-tab-pane-routed.js
rename to lib/assets/javascripts/builder/components/tab-pane/create-text-labels-tab-pane-routed.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/create-text-labels-tab-pane.js b/lib/assets/javascripts/builder/components/tab-pane/create-text-labels-tab-pane.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/create-text-labels-tab-pane.js
rename to lib/assets/javascripts/builder/components/tab-pane/create-text-labels-tab-pane.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-collection.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-collection.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-collection.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-color-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-color-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-color-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-color-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-color.tpl b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-color.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-color.tpl
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-color.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-file.tpl b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-file.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-file.tpl
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-file.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-icon-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-icon-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-icon-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-icon-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-icon.tpl b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-icon.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-icon.tpl
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-icon.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-item-view-routed.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-item-view-routed.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-item-view-routed.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-item-view-routed.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-item-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-item-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-item-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-item-view.js
index 0da2537b62..8e3ca4f4a6 100755
--- a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-item-view.js
+++ b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-item-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
/**
* TabPaneItem component
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-label-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-label-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-label-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-label-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-label.tpl b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-label.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-label.tpl
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-label.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-mixed-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-mixed-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-mixed-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-mixed-view.js
index 789523e7e4..37933af194 100755
--- a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-mixed-view.js
+++ b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-mixed-view.js
@@ -1,6 +1,6 @@
var template = require('./tab-pane-file.tpl');
var CoreView = require('backbone/core-view');
-var ImageLoaderView = require('cartodb3/components/img-loader-view');
+var ImageLoaderView = require('builder/components/img-loader-view');
/**
* File component
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-template-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-template-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-template-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-template-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-template.tpl b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-template.tpl
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-view-routed.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-view-routed.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-view-routed.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-view-routed.js
index 8264e3bf03..9b5ad5a23f 100644
--- a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-view-routed.js
+++ b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-view-routed.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var TabPaneView = require('./tab-pane-view.js');
var TabPaneViewItemRouted = require('./tab-pane-item-view-routed.js');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
module.exports = TabPaneView.extend({
initialize: function (options) {
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-view.js b/lib/assets/javascripts/builder/components/tab-pane/tab-pane-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane-view.js
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane.tpl b/lib/assets/javascripts/builder/components/tab-pane/tab-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tab-pane/tab-pane.tpl
rename to lib/assets/javascripts/builder/components/tab-pane/tab-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/body/modals-templates/remove-table-row.tpl b/lib/assets/javascripts/builder/components/table/body/modals-templates/remove-table-row.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/body/modals-templates/remove-table-row.tpl
rename to lib/assets/javascripts/builder/components/table/body/modals-templates/remove-table-row.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/body/table-body-cell.tpl b/lib/assets/javascripts/builder/components/table/body/table-body-cell.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/body/table-body-cell.tpl
rename to lib/assets/javascripts/builder/components/table/body/table-body-cell.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/body/table-body-row-view.js b/lib/assets/javascripts/builder/components/table/body/table-body-row-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/table/body/table-body-row-view.js
rename to lib/assets/javascripts/builder/components/table/body/table-body-row-view.js
index f8b36f826f..793c8e1e5f 100755
--- a/lib/assets/javascripts/cartodb3/components/table/body/table-body-row-view.js
+++ b/lib/assets/javascripts/builder/components/table/body/table-body-row-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
var cellTemplate = require('./table-body-cell.tpl');
-var pointGeojsonParser = require('cartodb3/helpers/point-geojson-parser');
+var pointGeojsonParser = require('builder/helpers/point-geojson-parser');
var FORMATTED_TYPE_VALUES = {
'geometry': pointGeojsonParser
diff --git a/lib/assets/javascripts/cartodb3/components/table/body/table-body-view.js b/lib/assets/javascripts/builder/components/table/body/table-body-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/table/body/table-body-view.js
rename to lib/assets/javascripts/builder/components/table/body/table-body-view.js
index 0db1371cea..fa8bef4a6a 100755
--- a/lib/assets/javascripts/cartodb3/components/table/body/table-body-view.js
+++ b/lib/assets/javascripts/builder/components/table/body/table-body-view.js
@@ -3,29 +3,29 @@ var $ = require('jquery');
var _ = require('underscore');
var Clipboard = require('clipboard');
var TableBodyRowView = require('./table-body-row-view');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var addTableRowOperation = require('cartodb3/components/table/operations/table-add-row');
-var removeTableRowOperation = require('cartodb3/components/table/operations/table-remove-row');
-var editCellOperation = require('cartodb3/components/table/operations/table-edit-cell');
-var ConfirmationModalView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var TablePaginatorView = require('cartodb3/components/table/paginator/table-paginator-view');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var addTableRowOperation = require('builder/components/table/operations/table-add-row');
+var removeTableRowOperation = require('builder/components/table/operations/table-remove-row');
+var editCellOperation = require('builder/components/table/operations/table-edit-cell');
+var ConfirmationModalView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var TablePaginatorView = require('builder/components/table/paginator/table-paginator-view');
var tableBodyTemplate = require('./table-body.tpl');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
var tableNoRowsTemplate = require('./table-no-rows.tpl');
-var EditorsServiceModel = require('cartodb3/components/table/editors/editors-service-model');
-var EditorsModel = require('cartodb3/components/table/editors/types/editor-model');
-var errorParser = require('cartodb3/helpers/error-parser');
-var magicPositioner = require('cartodb3/helpers/magic-positioner');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var EditorsServiceModel = require('builder/components/table/editors/editors-service-model');
+var EditorsModel = require('builder/components/table/editors/types/editor-model');
+var errorParser = require('builder/helpers/error-parser');
+var magicPositioner = require('builder/helpers/magic-positioner');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var EDITORS_MAP = {
- 'string': require('cartodb3/components/table/editors/types/editor-string-view'),
- 'number': require('cartodb3/components/table/editors/types/editor-base-view'),
- 'boolean': require('cartodb3/components/table/editors/types/editor-boolean-view'),
- 'date': require('cartodb3/components/table/editors/types/editor-date-view'),
- 'default': require('cartodb3/components/table/editors/types/editor-string-view')
+ 'string': require('builder/components/table/editors/types/editor-string-view'),
+ 'number': require('builder/components/table/editors/types/editor-base-view'),
+ 'boolean': require('builder/components/table/editors/types/editor-boolean-view'),
+ 'date': require('builder/components/table/editors/types/editor-date-view'),
+ 'default': require('builder/components/table/editors/types/editor-string-view')
};
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/components/table/body/table-body.tpl b/lib/assets/javascripts/builder/components/table/body/table-body.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/body/table-body.tpl
rename to lib/assets/javascripts/builder/components/table/body/table-body.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/body/table-no-rows.tpl b/lib/assets/javascripts/builder/components/table/body/table-no-rows.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/body/table-no-rows.tpl
rename to lib/assets/javascripts/builder/components/table/body/table-no-rows.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/editor-view-model.js b/lib/assets/javascripts/builder/components/table/editors/editor-view-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/editor-view-model.js
rename to lib/assets/javascripts/builder/components/table/editors/editor-view-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/editor-view.js b/lib/assets/javascripts/builder/components/table/editors/editor-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/editor-view.js
rename to lib/assets/javascripts/builder/components/table/editors/editor-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/editors-service-model.js b/lib/assets/javascripts/builder/components/table/editors/editors-service-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/editors-service-model.js
rename to lib/assets/javascripts/builder/components/table/editors/editors-service-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-base-view.js b/lib/assets/javascripts/builder/components/table/editors/types/editor-base-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-base-view.js
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-base-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-boolean-view.js b/lib/assets/javascripts/builder/components/table/editors/types/editor-boolean-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-boolean-view.js
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-boolean-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-boolean.tpl b/lib/assets/javascripts/builder/components/table/editors/types/editor-boolean.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-boolean.tpl
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-boolean.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-date-form-model.js b/lib/assets/javascripts/builder/components/table/editors/types/editor-date-form-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-date-form-model.js
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-date-form-model.js
index 1921b56eeb..d2cf24a27e 100755
--- a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-date-form-model.js
+++ b/lib/assets/javascripts/builder/components/table/editors/types/editor-date-form-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var moment = require('moment');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var MONTHS = [
{
val: 0,
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-date-view.js b/lib/assets/javascripts/builder/components/table/editors/types/editor-date-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-date-view.js
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-date-view.js
index 9bb38041db..b3435cdaaf 100755
--- a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-date-view.js
+++ b/lib/assets/javascripts/builder/components/table/editors/types/editor-date-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var EditorBaseView = require('./editor-base-view');
var EditorDateFormModel = require('./editor-date-form-model');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
module.exports = EditorBaseView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-model.js b/lib/assets/javascripts/builder/components/table/editors/types/editor-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-model.js
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/editors/types/editor-string-view.js b/lib/assets/javascripts/builder/components/table/editors/types/editor-string-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/editors/types/editor-string-view.js
rename to lib/assets/javascripts/builder/components/table/editors/types/editor-string-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/modals-templates/change-table-column-type.tpl b/lib/assets/javascripts/builder/components/table/head/modals-templates/change-table-column-type.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/modals-templates/change-table-column-type.tpl
rename to lib/assets/javascripts/builder/components/table/head/modals-templates/change-table-column-type.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/modals-templates/remove-table-column.tpl b/lib/assets/javascripts/builder/components/table/head/modals-templates/remove-table-column.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/modals-templates/remove-table-column.tpl
rename to lib/assets/javascripts/builder/components/table/head/modals-templates/remove-table-column.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/modals-templates/rename-table-column.tpl b/lib/assets/javascripts/builder/components/table/head/modals-templates/rename-table-column.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/modals-templates/rename-table-column.tpl
rename to lib/assets/javascripts/builder/components/table/head/modals-templates/rename-table-column.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/table-head-item-view.js b/lib/assets/javascripts/builder/components/table/head/table-head-item-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/table/head/table-head-item-view.js
rename to lib/assets/javascripts/builder/components/table/head/table-head-item-view.js
index f894179a4b..8f3b69560f 100755
--- a/lib/assets/javascripts/cartodb3/components/table/head/table-head-item-view.js
+++ b/lib/assets/javascripts/builder/components/table/head/table-head-item-view.js
@@ -1,16 +1,16 @@
var $ = require('jquery');
var CoreView = require('backbone/core-view');
var template = require('./table-head-item.tpl');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var TableHeadOptionsItemView = require('./table-head-options-item-view');
var tableHeadOptionsItemTemplate = require('./table-head-options-item.tpl');
-var ConfirmationModalView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var QueryColumnModel = require('cartodb3/data/query-column-model');
-var addColumnOperation = require('cartodb3/components/table/operations/table-add-column');
-var renameColumnOperation = require('cartodb3/components/table/operations/table-rename-column');
-var changeColumnTypeOperation = require('cartodb3/components/table/operations/table-change-column-type');
-var removeTableColumnOperation = require('cartodb3/components/table/operations/table-remove-column');
+var ConfirmationModalView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var QueryColumnModel = require('builder/data/query-column-model');
+var addColumnOperation = require('builder/components/table/operations/table-add-column');
+var renameColumnOperation = require('builder/components/table/operations/table-rename-column');
+var changeColumnTypeOperation = require('builder/components/table/operations/table-change-column-type');
+var removeTableColumnOperation = require('builder/components/table/operations/table-remove-column');
var ENTER_KEY_CODE = 13;
var ESC_KEY_CODE = 27;
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/table-head-item.tpl b/lib/assets/javascripts/builder/components/table/head/table-head-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/table-head-item.tpl
rename to lib/assets/javascripts/builder/components/table/head/table-head-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/table-head-options-item-view.js b/lib/assets/javascripts/builder/components/table/head/table-head-options-item-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/components/table/head/table-head-options-item-view.js
rename to lib/assets/javascripts/builder/components/table/head/table-head-options-item-view.js
index 7d68e5eb06..6d3eefc29a 100755
--- a/lib/assets/javascripts/cartodb3/components/table/head/table-head-options-item-view.js
+++ b/lib/assets/javascripts/builder/components/table/head/table-head-options-item-view.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
-var CustomListView = require('cartodb3/components/custom-list/custom-view');
-var QueryColumnModel = require('cartodb3/data/query-column-model');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
+var CustomListView = require('builder/components/custom-list/custom-view');
+var QueryColumnModel = require('builder/data/query-column-model');
module.exports = CustomListItemView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/table-head-options-item.tpl b/lib/assets/javascripts/builder/components/table/head/table-head-options-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/table-head-options-item.tpl
rename to lib/assets/javascripts/builder/components/table/head/table-head-options-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/table-head-view.js b/lib/assets/javascripts/builder/components/table/head/table-head-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/table-head-view.js
rename to lib/assets/javascripts/builder/components/table/head/table-head-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/head/table-head.tpl b/lib/assets/javascripts/builder/components/table/head/table-head.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/head/table-head.tpl
rename to lib/assets/javascripts/builder/components/table/head/table-head.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-add-column.js b/lib/assets/javascripts/builder/components/table/operations/table-add-column.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-add-column.js
rename to lib/assets/javascripts/builder/components/table/operations/table-add-column.js
index c1d19b74f7..5265d175f2 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-add-column.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-add-column.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.columnsCollection) throw new Error('columnsCollection is required');
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-add-row.js b/lib/assets/javascripts/builder/components/table/operations/table-add-row.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-add-row.js
rename to lib/assets/javascripts/builder/components/table/operations/table-add-row.js
index 6a1479349f..043e55be66 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-add-row.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-add-row.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.rowsCollection) { throw new Error('rowsCollection is required'); }
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-change-column-type.js b/lib/assets/javascripts/builder/components/table/operations/table-change-column-type.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-change-column-type.js
rename to lib/assets/javascripts/builder/components/table/operations/table-change-column-type.js
index 1f0f7c1684..dfb5ee0389 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-change-column-type.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-change-column-type.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.columnModel) { throw new Error('columnModel is required'); }
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-edit-cell.js b/lib/assets/javascripts/builder/components/table/operations/table-edit-cell.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-edit-cell.js
rename to lib/assets/javascripts/builder/components/table/operations/table-edit-cell.js
index 8eac60f2f8..f1e02f9523 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-edit-cell.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-edit-cell.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.rowModel) throw new Error('rowModel is required');
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-remove-column.js b/lib/assets/javascripts/builder/components/table/operations/table-remove-column.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-remove-column.js
rename to lib/assets/javascripts/builder/components/table/operations/table-remove-column.js
index 8dc417dbfc..26f332dab2 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-remove-column.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-remove-column.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.columnModel) { throw new Error('columnModel is required'); }
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-remove-row.js b/lib/assets/javascripts/builder/components/table/operations/table-remove-row.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-remove-row.js
rename to lib/assets/javascripts/builder/components/table/operations/table-remove-row.js
index 536f56d78a..2d1be362f6 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-remove-row.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-remove-row.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.rowModel) { throw new Error('rowModel is required'); }
diff --git a/lib/assets/javascripts/cartodb3/components/table/operations/table-rename-column.js b/lib/assets/javascripts/builder/components/table/operations/table-rename-column.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/components/table/operations/table-rename-column.js
rename to lib/assets/javascripts/builder/components/table/operations/table-rename-column.js
index 01403f8355..f988be70e4 100755
--- a/lib/assets/javascripts/cartodb3/components/table/operations/table-rename-column.js
+++ b/lib/assets/javascripts/builder/components/table/operations/table-rename-column.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.columnModel) { throw new Error('columnModel is required'); }
diff --git a/lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator-loader.tpl b/lib/assets/javascripts/builder/components/table/paginator/table-paginator-loader.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator-loader.tpl
rename to lib/assets/javascripts/builder/components/table/paginator/table-paginator-loader.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator-view.js b/lib/assets/javascripts/builder/components/table/paginator/table-paginator-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator-view.js
rename to lib/assets/javascripts/builder/components/table/paginator/table-paginator-view.js
index 3bef3c1eb1..ecaaa90273 100755
--- a/lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator-view.js
+++ b/lib/assets/javascripts/builder/components/table/paginator/table-paginator-view.js
@@ -2,8 +2,8 @@ var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./table-paginator.tpl');
var templateLoader = require('./table-paginator-loader.tpl');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator.tpl b/lib/assets/javascripts/builder/components/table/paginator/table-paginator.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/paginator/table-paginator.tpl
rename to lib/assets/javascripts/builder/components/table/paginator/table-paginator.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/table/table-manager.js b/lib/assets/javascripts/builder/components/table/table-manager.js
similarity index 87%
rename from lib/assets/javascripts/cartodb3/components/table/table-manager.js
rename to lib/assets/javascripts/builder/components/table/table-manager.js
index 56b652ad0c..5ce3e47962 100755
--- a/lib/assets/javascripts/cartodb3/components/table/table-manager.js
+++ b/lib/assets/javascripts/builder/components/table/table-manager.js
@@ -1,7 +1,7 @@
var TableView = require('./table-view');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
+var TableNameUtils = require('builder/helpers/table-name-utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodeModel',
diff --git a/lib/assets/javascripts/cartodb3/components/table/table-view-model.js b/lib/assets/javascripts/builder/components/table/table-view-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/table/table-view-model.js
rename to lib/assets/javascripts/builder/components/table/table-view-model.js
diff --git a/lib/assets/javascripts/cartodb3/components/table/table-view.js b/lib/assets/javascripts/builder/components/table/table-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/components/table/table-view.js
rename to lib/assets/javascripts/builder/components/table/table-view.js
index beac36a831..1ca3a5fb8f 100755
--- a/lib/assets/javascripts/cartodb3/components/table/table-view.js
+++ b/lib/assets/javascripts/builder/components/table/table-view.js
@@ -6,8 +6,8 @@ var TableHeadView = require('./head/table-head-view');
var TableBodyView = require('./body/table-body-view');
var addTableRow = require('./operations/table-add-row');
var addTableColumn = require('./operations/table-add-column');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var SQLUtils = require('builder/helpers/sql-utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodeModel',
diff --git a/lib/assets/javascripts/cartodb3/components/tipsy-tooltip-view.js b/lib/assets/javascripts/builder/components/tipsy-tooltip-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/tipsy-tooltip-view.js
rename to lib/assets/javascripts/builder/components/tipsy-tooltip-view.js
diff --git a/lib/assets/javascripts/cartodb3/components/toggler/toggler-view.js b/lib/assets/javascripts/builder/components/toggler/toggler-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/components/toggler/toggler-view.js
rename to lib/assets/javascripts/builder/components/toggler/toggler-view.js
index 45e7fbee8b..12eb02989a 100755
--- a/lib/assets/javascripts/cartodb3/components/toggler/toggler-view.js
+++ b/lib/assets/javascripts/builder/components/toggler/toggler-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./toggler.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/components/toggler/toggler.tpl b/lib/assets/javascripts/builder/components/toggler/toggler.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/toggler/toggler.tpl
rename to lib/assets/javascripts/builder/components/toggler/toggler.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/undo-redo/undo-redo-view.js b/lib/assets/javascripts/builder/components/undo-redo/undo-redo-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/components/undo-redo/undo-redo-view.js
rename to lib/assets/javascripts/builder/components/undo-redo/undo-redo-view.js
index 6131710702..3925f04554 100755
--- a/lib/assets/javascripts/cartodb3/components/undo-redo/undo-redo-view.js
+++ b/lib/assets/javascripts/builder/components/undo-redo/undo-redo-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./undo-redo.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
module.exports = CoreView.extend({
events: {
diff --git a/lib/assets/javascripts/cartodb3/components/undo-redo/undo-redo.tpl b/lib/assets/javascripts/builder/components/undo-redo/undo-redo.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/undo-redo/undo-redo.tpl
rename to lib/assets/javascripts/builder/components/undo-redo/undo-redo.tpl
diff --git a/lib/assets/javascripts/cartodb3/components/view-factory.js b/lib/assets/javascripts/builder/components/view-factory.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/view-factory.js
rename to lib/assets/javascripts/builder/components/view-factory.js
diff --git a/lib/assets/javascripts/cartodb3/components/view-options/panel-with-options-view.js b/lib/assets/javascripts/builder/components/view-options/panel-with-options-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/components/view-options/panel-with-options-view.js
rename to lib/assets/javascripts/builder/components/view-options/panel-with-options-view.js
index dab742ec70..3e49ecae5d 100755
--- a/lib/assets/javascripts/cartodb3/components/view-options/panel-with-options-view.js
+++ b/lib/assets/javascripts/builder/components/view-options/panel-with-options-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./panel-with-options.tpl');
-var InfoboxView = require('cartodb3/components/infobox/infobox-view');
+var InfoboxView = require('builder/components/infobox/infobox-view');
module.exports = CoreView.extend({
initialize: function (opts) {
diff --git a/lib/assets/javascripts/cartodb3/components/view-options/panel-with-options.tpl b/lib/assets/javascripts/builder/components/view-options/panel-with-options.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/components/view-options/panel-with-options.tpl
rename to lib/assets/javascripts/builder/components/view-options/panel-with-options.tpl
diff --git a/lib/assets/javascripts/cartodb3/config/upload-config.js b/lib/assets/javascripts/builder/config/upload-config.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/config/upload-config.js
rename to lib/assets/javascripts/builder/config/upload-config.js
diff --git a/lib/assets/javascripts/cartodb3/data/acl-item-model.js b/lib/assets/javascripts/builder/data/acl-item-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/acl-item-model.js
rename to lib/assets/javascripts/builder/data/acl-item-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/analyses.js b/lib/assets/javascripts/builder/data/analyses.js
similarity index 60%
rename from lib/assets/javascripts/cartodb3/data/analyses.js
rename to lib/assets/javascripts/builder/data/analyses.js
index cf5cdfa71e..1544cb08ea 100644
--- a/lib/assets/javascripts/cartodb3/data/analyses.js
+++ b/lib/assets/javascripts/builder/data/analyses.js
@@ -1,12 +1,12 @@
var _ = require('underscore');
var camshaftReference = require('./camshaft-reference');
-var AreaOfInfluenceFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model');
-var AggregateIntersectionFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model');
-var FilterIntersectionFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model');
-var FallbackFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model');
-var UnknownTypeFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model');
-var MergeAnalysisOptionModel = require('cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model');
-var DataServicesApiCheck = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var AreaOfInfluenceFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model');
+var AggregateIntersectionFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model');
+var FilterIntersectionFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model');
+var FallbackFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model');
+var UnknownTypeFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model');
+var MergeAnalysisOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model');
+var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
var DAO_TYPES = ['age-and-gender', 'boundaries', 'education', 'employment', 'families', 'housing', 'income', 'language', 'migration', 'nationality', 'population-segments', 'race-and-ethnicity', 'religion', 'transportation'];
@@ -18,19 +18,19 @@ var MAP = {
modalDesc: _t('components.modals.add-analysis.option-types.aggregate-intersection.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/intersect-second-layer',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/aggregate-intersection.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/intersect.tpl')
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/aggregate-intersection.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/intersect.tpl')
},
'bounding-box': {
title: _t('analyses.bounding-box.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/group-points.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/group-points.tpl'),
genericType: 'group-points'
},
'bounding-circle': {
title: _t('analyses.bounding-circle.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/group-points.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/group-points.tpl'),
genericType: 'group-points'
},
'buffer': {
@@ -40,30 +40,30 @@ var MAP = {
modalDesc: _t('components.modals.add-analysis.option-types.area-of-influence.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/areas-of-influence',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/area-of-influence.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/aoi.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/area-of-influence.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/aoi.tpl'),
genericType: 'area-of-influence'
},
'centroid': {
title: _t('analyses.centroid.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.centroid.title'),
modalDesc: _t('components.modals.add-analysis.option-types.centroid.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/find-centroid-of-geometries',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/centroid.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/centroid.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/centroid.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/centroid.tpl'),
genericType: 'centroid'
},
'convex-hull': {
title: _t('analyses.convex-hull.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.group-points.title'),
modalDesc: _t('components.modals.add-analysis.option-types.group-points.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/group-points-into-polygons',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses//group-points.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/group-points.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses//group-points.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/group-points.tpl'),
animationParams: {
method: _t('analyses-onboarding.placeholders.method')
},
@@ -71,13 +71,13 @@ var MAP = {
},
'concave-hull': {
title: _t('analyses.concave-hull.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/group-points.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/group-points.tpl'),
genericType: 'group-points'
},
'data-observatory-measure': {
title: _t('analyses.data-observatory-measure.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model'),
modalTitle: _t('components.modals.add-analysis.option-types.data-observatory-measure.title'),
modalDesc: _t('components.modals.add-analysis.option-types.data-observatory-measure.desc'),
modalCategory: 'create_clean',
@@ -85,13 +85,13 @@ var MAP = {
checkIfEnabled: function (configModel) {
return checkIfDataObservatoryIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/data-observatory-measure.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/data-observatory-measure.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl'),
genericType: 'data-observatory-measure'
},
'data-observatory-multiple-measures': {
title: _t('analyses.data-observatory-measure.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model'),
modalTitle: _t('components.modals.add-analysis.option-types.data-observatory-measure.title'),
modalDesc: _t('components.modals.add-analysis.option-types.data-observatory-measure.desc'),
modalCategory: 'create_clean',
@@ -105,110 +105,110 @@ var MAP = {
return checkIfDataObservatoryIsEnabled(configModel) && !hideDataObservatory;
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/data-observatory-multiple-measure.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/data-observatory-multiple-measure.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/data-observatory-measure.tpl'),
genericType: 'data-observatory-multiple-measures'
},
'filter-by-node-column': {
title: _t('analyses.filter-by-node-column.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column'),
modalTitle: _t('components.modals.add-analysis.option-types.filter-by-node-column.title'),
modalDesc: _t('components.modals.add-analysis.option-types.filter-by-node-column.desc'),
modalCategory: 'create_clean',
modalLink: 'https://carto.com/learn/guides/analysis/filter-by-layer',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/filter-by-node-column.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/filter-by-layer.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/filter-by-node-column.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/filter-by-layer.tpl'),
animationParams: {
name_of_the_layer: _t('analyses-onboarding.placeholders.layer-name')
}
},
'filter-category': {
title: _t('analyses.filter.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/filter.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/filter.tpl'),
genericType: 'filter'
},
'filter-range': {
title: _t('analyses.filter.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.filter.title'),
modalDesc: _t('components.modals.add-analysis.option-types.filter.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/filter-by-column-value',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/filter.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/filter-by-column-value.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/filter.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/filter-by-column-value.tpl'),
genericType: 'filter'
},
'georeference-city': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
checkIfEnabled: function (configModel) {
return checkIfInternalGeocodingIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'georeference-ip-address': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
checkIfEnabled: function (configModel) {
return checkIfInternalGeocodingIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'georeference-country': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
checkIfEnabled: function (configModel) {
return checkIfInternalGeocodingIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'georeference-long-lat': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'georeference-placeholder': {
dummy: true,
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.georeference.title'),
modalDesc: _t('components.modals.add-analysis.option-types.georeference.desc'),
modalCategory: 'create_clean',
modalLink: 'https://carto.com/learn/guides/analysis/georeference',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/georeference.tpl'),
genericType: 'georeference'
},
'georeference-postal-code': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
checkIfEnabled: function (configModel) {
return checkIfInternalGeocodingIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'georeference-street-address': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
checkIfEnabled: function (configModel) {
return checkIfExternalGeocodingIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'georeference-admin-region': {
title: _t('analyses.georeference.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model'),
checkIfEnabled: function (configModel) {
return checkIfInternalGeocodingIsEnabled(configModel);
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/georeference.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/georeference.tpl'),
genericType: 'georeference'
},
'intersection': {
@@ -218,67 +218,67 @@ var MAP = {
modalDesc: _t('components.modals.add-analysis.option-types.filter-intersection.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/filter-points-in-polygons',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/intersection.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/filter-by-polygon.tpl')
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/intersection.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/filter-by-polygon.tpl')
},
'kmeans': {
title: _t('analyses.kmeans.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.kmeans.title'),
modalDesc: _t('components.modals.add-analysis.option-types.kmeans.desc'),
modalCategory: 'analyze_predict',
modalLink: 'https://carto.com/learn/guides/analysis/calculate-clusters-of-points',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/kmeans.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/kmeans.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/kmeans.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/kmeans.tpl'),
animationParams: {
method: _t('analyses-onboarding.placeholders.clusters')
}
},
'line-to-single-point': {
title: _t('analyses.connect-with-lines.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.connect-with-lines.title'),
modalDesc: _t('components.modals.add-analysis.option-types.connect-with-lines.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/connect-with-lines',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/connect-with-lines.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/connect-with-lines.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/connect-with-lines.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/connect-with-lines.tpl'),
genericType: 'connect-with-lines'
},
'line-source-to-target': {
title: _t('analyses.connect-with-lines.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/connect-with-lines.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/connect-with-lines.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/connect-with-lines.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/connect-with-lines.tpl'),
genericType: 'connect-with-lines'
},
'line-sequential': {
title: _t('analyses.connect-with-lines.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/connect-with-lines.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/connect-with-lines.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/connect-with-lines.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/connect-with-lines.tpl'),
genericType: 'connect-with-lines'
},
'merge': {
title: _t('analyses.merge.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.merge.title'),
modalDesc: _t('components.modals.add-analysis.option-types.merge.desc'),
ModalModel: MergeAnalysisOptionModel,
modalCategory: 'create_clean',
modalLink: 'https://carto.com/learn/guides/analysis/join-column-from-second-layer',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/merge.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/join-two-columns.tpl')
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/merge.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/join-two-columns.tpl')
},
'moran': {
title: _t('analyses.moran-cluster.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.moran-cluster.title'),
modalDesc: _t('components.modals.add-analysis.option-types.moran-cluster.desc'),
modalCategory: 'analyze_predict',
modalLink: 'https://carto.com/learn/guides/analysis/detect-outliers-and-clusters',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/moran.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/outliers.tpl')
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/moran.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/outliers.tpl')
},
'routing-sequential': {
title: _t('analyses.routing.short-title'),
@@ -303,13 +303,13 @@ var MAP = {
},
'sampling': {
title: _t('analyses.sampling.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.sampling.title'),
modalDesc: _t('components.modals.add-analysis.option-types.sampling.desc'),
modalCategory: 'data_transformation',
modalLink: 'https://carto.com/learn/guides/analysis/subsample-percent-of-rows',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/sampling.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/sampling.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/sampling.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/sampling.tpl'),
animationParams: {
percentage: _t('analyses-onboarding.placeholders.percentage')
},
@@ -317,13 +317,13 @@ var MAP = {
},
'spatial-markov-trend': {
title: _t('analyses.spatial-markov-trend.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model'),
modalTitle: _t('components.modals.add-analysis.option-types.spatial-markov-trend.title'),
modalDesc: _t('components.modals.add-analysis.option-types.spatial-markov-trend.desc'),
modalCategory: 'analyze_predict',
modalLink: 'https://carto.com/learn/guides/analysis/predict-trends-and-volatility',
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/spatial-markov-trend.tpl'),
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/predict-trends.tpl')
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/spatial-markov-trend.tpl'),
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/predict-trends.tpl')
},
'trade-area': {
title: _t('analyses.area-of-influence.short-title'),
@@ -332,28 +332,28 @@ var MAP = {
if (!configModel) throw new Error('configModel is required');
return !!configModel.dataServiceEnabled('isolines');
},
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/area-of-influence.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/area-of-influence.tpl'),
genericType: 'area-of-influence'
},
'weighted-centroid': {
title: _t('analyses.centroid.short-title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/centroid.tpl'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/centroid.tpl'),
genericType: 'centroid'
},
'closest': {
title: _t('editor.layers.analysis-form.find-nearest.title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model'),
modalTitle: _t('editor.layers.analysis-form.find-nearest.modal-title'),
modalDesc: _t('editor.layers.analysis-form.find-nearest.modal-desc'),
modalCategory: 'analyze_predict',
modalLink: 'https://carto.com/learn/guides/analysis/find-nearest',
- animationTemplate: require('cartodb3/components/modals/add-analysis/animation-templates/closest.tpl'),
- onboardingTemplate: require('cartodb3/components/onboardings/analysis/analyses/closest.tpl')
+ animationTemplate: require('builder/components/modals/add-analysis/animation-templates/closest.tpl'),
+ onboardingTemplate: require('builder/components/onboardings/analysis/analyses/closest.tpl')
},
'deprecated-sql-function': {
title: _t('editor.layers.analysis-form.deprecated-sql-function.title'),
- FormModel: require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model'),
+ FormModel: require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model'),
modalTitle: _t('components.modals.add-analysis.option-types.deprecated-sql-function.title'),
modalDesc: _t('components.modals.add-analysis.option-types.deprecated-sql-function.desc'),
modalCategory: 'data_transformation',
diff --git a/lib/assets/javascripts/cartodb3/data/analysis-definition-model.js b/lib/assets/javascripts/builder/data/analysis-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/analysis-definition-model.js
rename to lib/assets/javascripts/builder/data/analysis-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/analysis-definition-node-model.js b/lib/assets/javascripts/builder/data/analysis-definition-node-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/analysis-definition-node-model.js
rename to lib/assets/javascripts/builder/data/analysis-definition-node-model.js
index 83ec6bba07..8c9b689be7 100755
--- a/lib/assets/javascripts/cartodb3/data/analysis-definition-node-model.js
+++ b/lib/assets/javascripts/builder/data/analysis-definition-node-model.js
@@ -3,11 +3,11 @@ var Backbone = require('backbone');
var camshaftReference = require('./camshaft-reference');
var QueryGeometryModel = require('./query-geometry-model');
var QuerySchemaModel = require('./query-schema-model');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var QueryRowsCollection = require('./query-rows-collection');
-var fetchAllQueryObjects = require('cartodb3/helpers/fetch-all-query-objects');
-var layerColors = require('cartodb3/data/layer-colors');
+var fetchAllQueryObjects = require('builder/helpers/fetch-all-query-objects');
+var layerColors = require('builder/data/layer-colors');
var REQUIRED_OPTS = [
'configModel'
diff --git a/lib/assets/javascripts/cartodb3/data/analysis-definition-node-source-model.js b/lib/assets/javascripts/builder/data/analysis-definition-node-source-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/analysis-definition-node-source-model.js
rename to lib/assets/javascripts/builder/data/analysis-definition-node-source-model.js
index 2dd9de3a4a..e6878c94ab 100755
--- a/lib/assets/javascripts/cartodb3/data/analysis-definition-node-source-model.js
+++ b/lib/assets/javascripts/builder/data/analysis-definition-node-source-model.js
@@ -1,6 +1,6 @@
var AnalysisDefinitionNodeModel = require('./analysis-definition-node-model');
var TableModel = require('./table-model');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
+var SQLUtils = require('builder/helpers/sql-utils');
/**
* Case of a node model representing a source node.
diff --git a/lib/assets/javascripts/cartodb3/data/analysis-definition-nodes-collection.js b/lib/assets/javascripts/builder/data/analysis-definition-nodes-collection.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/data/analysis-definition-nodes-collection.js
rename to lib/assets/javascripts/builder/data/analysis-definition-nodes-collection.js
index 1b6282ef6d..d180374c3e 100755
--- a/lib/assets/javascripts/cartodb3/data/analysis-definition-nodes-collection.js
+++ b/lib/assets/javascripts/builder/data/analysis-definition-nodes-collection.js
@@ -2,9 +2,9 @@ var _ = require('underscore');
var Backbone = require('backbone');
var AnalysisDefinitionNodeSourceModel = require('./analysis-definition-node-source-model');
var AnalysisDefinitionNodeModel = require('./analysis-definition-node-model');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var SQLUtils = require('builder/helpers/sql-utils');
+var TableNameUtils = require('builder/helpers/table-name-utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userModel',
diff --git a/lib/assets/javascripts/cartodb3/data/analysis-definitions-collection.js b/lib/assets/javascripts/builder/data/analysis-definitions-collection.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/analysis-definitions-collection.js
rename to lib/assets/javascripts/builder/data/analysis-definitions-collection.js
index 9280a2d307..29f54ad6b7 100755
--- a/lib/assets/javascripts/cartodb3/data/analysis-definitions-collection.js
+++ b/lib/assets/javascripts/builder/data/analysis-definitions-collection.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
var AnalysisDefinitionModel = require('./analysis-definition-model');
/**
diff --git a/lib/assets/javascripts/cartodb3/data/asset-model.js b/lib/assets/javascripts/builder/data/asset-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/asset-model.js
rename to lib/assets/javascripts/builder/data/asset-model.js
index 1c0f42622e..72deb7a0c3 100755
--- a/lib/assets/javascripts/cartodb3/data/asset-model.js
+++ b/lib/assets/javascripts/builder/data/asset-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
require('backbone-model-file-upload');
diff --git a/lib/assets/javascripts/cartodb3/data/assets-collection.js b/lib/assets/javascripts/builder/data/assets-collection.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/data/assets-collection.js
rename to lib/assets/javascripts/builder/data/assets-collection.js
index 88ff9df504..285e440961 100755
--- a/lib/assets/javascripts/cartodb3/data/assets-collection.js
+++ b/lib/assets/javascripts/builder/data/assets-collection.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var AssetModel = require('./asset-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/backbone/sync-abort.js b/lib/assets/javascripts/builder/data/backbone/sync-abort.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/backbone/sync-abort.js
rename to lib/assets/javascripts/builder/data/backbone/sync-abort.js
diff --git a/lib/assets/javascripts/cartodb3/data/background-importer/background-importer-imports-collection.js b/lib/assets/javascripts/builder/data/background-importer/background-importer-imports-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/background-importer/background-importer-imports-collection.js
rename to lib/assets/javascripts/builder/data/background-importer/background-importer-imports-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/background-importer/background-polling-model.js b/lib/assets/javascripts/builder/data/background-importer/background-polling-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/background-importer/background-polling-model.js
rename to lib/assets/javascripts/builder/data/background-importer/background-polling-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/background-importer/import-model-poller.js b/lib/assets/javascripts/builder/data/background-importer/import-model-poller.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/background-importer/import-model-poller.js
rename to lib/assets/javascripts/builder/data/background-importer/import-model-poller.js
diff --git a/lib/assets/javascripts/cartodb3/data/background-importer/import-model.js b/lib/assets/javascripts/builder/data/background-importer/import-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/background-importer/import-model.js
rename to lib/assets/javascripts/builder/data/background-importer/import-model.js
index 4c7888f599..cab9be76bb 100755
--- a/lib/assets/javascripts/cartodb3/data/background-importer/import-model.js
+++ b/lib/assets/javascripts/builder/data/background-importer/import-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
var ImportModelPoller = require('./import-model-poller');
-var SynchronizationModel = require('cartodb3/data/synchronization-model');
+var SynchronizationModel = require('builder/data/synchronization-model');
/**
* New import model that controls
diff --git a/lib/assets/javascripts/cartodb3/data/background-importer/imports-model.js b/lib/assets/javascripts/builder/data/background-importer/imports-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/data/background-importer/imports-model.js
rename to lib/assets/javascripts/builder/data/background-importer/imports-model.js
index 7f02bdc32f..5a238386d8 100755
--- a/lib/assets/javascripts/cartodb3/data/background-importer/imports-model.js
+++ b/lib/assets/javascripts/builder/data/background-importer/imports-model.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
var ImportModel = require('./import-model');
-var UploadModel = require('cartodb3/data/upload-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var PermissionModel = require('cartodb3/data/permission-model');
+var UploadModel = require('builder/data/upload-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var PermissionModel = require('builder/data/permission-model');
/**
* Upload/import model
diff --git a/lib/assets/javascripts/cartodb3/data/background-importer/poller.js b/lib/assets/javascripts/builder/data/background-importer/poller.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/background-importer/poller.js
rename to lib/assets/javascripts/builder/data/background-importer/poller.js
diff --git a/lib/assets/javascripts/cartodb3/data/basemap-providers-and-categories.js b/lib/assets/javascripts/builder/data/basemap-providers-and-categories.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/basemap-providers-and-categories.js
rename to lib/assets/javascripts/builder/data/basemap-providers-and-categories.js
diff --git a/lib/assets/javascripts/cartodb3/data/camshaft-reference.js b/lib/assets/javascripts/builder/data/camshaft-reference.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/camshaft-reference.js
rename to lib/assets/javascripts/builder/data/camshaft-reference.js
diff --git a/lib/assets/javascripts/cartodb3/data/column-model.js b/lib/assets/javascripts/builder/data/column-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/column-model.js
rename to lib/assets/javascripts/builder/data/column-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/column-row-data.js b/lib/assets/javascripts/builder/data/column-row-data.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/column-row-data.js
rename to lib/assets/javascripts/builder/data/column-row-data.js
diff --git a/lib/assets/javascripts/cartodb3/data/config-model.js b/lib/assets/javascripts/builder/data/config-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/config-model.js
rename to lib/assets/javascripts/builder/data/config-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/custom-baselayer-model.js b/lib/assets/javascripts/builder/data/custom-baselayer-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/custom-baselayer-model.js
rename to lib/assets/javascripts/builder/data/custom-baselayer-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/custom-baselayers-collection.js b/lib/assets/javascripts/builder/data/custom-baselayers-collection.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/data/custom-baselayers-collection.js
rename to lib/assets/javascripts/builder/data/custom-baselayers-collection.js
index 977215d6ca..fbedb3fb65 100755
--- a/lib/assets/javascripts/cartodb3/data/custom-baselayers-collection.js
+++ b/lib/assets/javascripts/builder/data/custom-baselayers-collection.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CustomBaselayerModel = require('./custom-baselayer-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/boundaries-collection.js b/lib/assets/javascripts/builder/data/data-observatory/boundaries-collection.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/boundaries-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/boundaries-collection.js
index fdb54d3c90..1b92ff063d 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/boundaries-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/boundaries-collection.js
@@ -1,5 +1,5 @@
var BaseCollection = require('./data-observatory-base-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
// Interpolation boundary tag filters geometries to only show full coverage geometries
var FILTER_CLIPPED_GEOMS_IF_EXISTS = 'WHERE CASE WHEN EXISTS(SELECT 1 as cond FROM _data WHERE geom_tags ?\'boundary_type/tags.interpolation_boundary\' group by cond) THEN geom_tags ? \'boundary_type/tags.interpolation_boundary\' ELSE true END';
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/column-name.js b/lib/assets/javascripts/builder/data/data-observatory/column-name.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/column-name.js
rename to lib/assets/javascripts/builder/data/data-observatory/column-name.js
index 4a46dae6cf..5e09bc4f17 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/column-name.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/column-name.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var errorParse = require('cartodb3/helpers/error-parser');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var errorParse = require('builder/helpers/error-parser');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/data-observatory-base-collection.js b/lib/assets/javascripts/builder/data/data-observatory/data-observatory-base-collection.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/data-observatory-base-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/data-observatory-base-collection.js
index d683d819fb..8268a526f9 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/data-observatory-base-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/data-observatory-base-collection.js
@@ -2,9 +2,9 @@ var Backbone = require('backbone');
var _ = require('underscore');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var errorParse = require('cartodb3/helpers/error-parser');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var errorParse = require('builder/helpers/error-parser');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/filters-collection.js b/lib/assets/javascripts/builder/data/data-observatory/filters-collection.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/filters-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/filters-collection.js
index b0d137750e..874a132c4b 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/filters-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/filters-collection.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var BaseCollection = require('./data-observatory-base-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var FILTERS_QUERY_WITH_REGION = "SELECT count(*) num_measurements, tag.key subsection_id, tag.value subsection_name FROM OBS_GetAvailableNumerators((SELECT ST_SetSRID(ST_Extent(the_geom), 4326) FROM ({{{ query }}}) q), {{{ region }}}) numers, Jsonb_Each(numers.numer_tags) tag WHERE tag.key like 'subsection%' GROUP BY tag.key, tag.value";
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/measurement-model.js b/lib/assets/javascripts/builder/data/data-observatory/measurement-model.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/measurement-model.js
rename to lib/assets/javascripts/builder/data/data-observatory/measurement-model.js
index 5b47d91358..07f70f8c31 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/measurement-model.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/measurement-model.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/measurements-collection.js b/lib/assets/javascripts/builder/data/data-observatory/measurements-collection.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/measurements-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/measurements-collection.js
index 56e1f75cad..deb15e7bda 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/measurements-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/measurements-collection.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var BaseCollection = require('./data-observatory-base-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var MEASUREMENTS_QUERY_WITH_REGION = 'SELECT numer_id, numer_name, numer_description, numer_type, numer_aggregate, numer_tags FROM _OBS_GetNumerators((SELECT ST_SetSRID(ST_Extent(the_geom), 4326) FROM ({{{ query }}}) q), section_tags => {{{ region }}}) ORDER BY numer_name ASC';
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/normalize-collection.js b/lib/assets/javascripts/builder/data/data-observatory/normalize-collection.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/normalize-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/normalize-collection.js
index 8c783082fa..6f1e78c827 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/normalize-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/normalize-collection.js
@@ -1,5 +1,5 @@
var BaseCollection = require('./data-observatory-base-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var NORMALIZE_QUERY_WITH_MEASUREMENT = 'SELECT * FROM OBS_GetAvailableDenominators((SELECT ST_SetSRID(ST_Extent(the_geom), 4326) FROM ({{{ query }}}) q), NULL, {{{ measurement }}}) denoms WHERE valid_numer IS TRUE';
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/regions-collection.js b/lib/assets/javascripts/builder/data/data-observatory/regions-collection.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/regions-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/regions-collection.js
index fd7be03ce4..1d742b1a98 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/regions-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/regions-collection.js
@@ -1,5 +1,5 @@
var BaseCollection = require('./data-observatory-base-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var REGIONS_QUERY = "SELECT count(*) num_measurements, tag.key region_id, tag.value region_name FROM (SELECT * FROM OBS_GetAvailableNumerators() WHERE jsonb_pretty(numer_tags) LIKE '%subsection/%') numers, Jsonb_Each(numers.numer_tags) tag WHERE tag.key like 'section%' GROUP BY tag.key, tag.value ORDER BY region_name";
diff --git a/lib/assets/javascripts/cartodb3/data/data-observatory/timespan-collection.js b/lib/assets/javascripts/builder/data/data-observatory/timespan-collection.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/data/data-observatory/timespan-collection.js
rename to lib/assets/javascripts/builder/data/data-observatory/timespan-collection.js
index 448974b415..0f16675aba 100644
--- a/lib/assets/javascripts/cartodb3/data/data-observatory/timespan-collection.js
+++ b/lib/assets/javascripts/builder/data/data-observatory/timespan-collection.js
@@ -1,5 +1,5 @@
var BaseCollection = require('./data-observatory-base-collection');
-var BaseModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var BaseModel = require('builder/components/custom-list/custom-list-item-model');
var TIMESPAN_QUERY_WITH_NORMALIZE = 'SELECT * FROM OBS_GetAvailableTimespans((SELECT ST_SetSRID(ST_Extent(the_geom), 4326) FROM ({{{ query }}}) q), NULL, {{{ measurement }}}, {{{ denom_id }}}) denoms WHERE valid_numer IS TRUE AND (valid_denom IS TRUE OR {{{ denom_id }}} IS NULL) ORDER BY timespan_name DESC';
diff --git a/lib/assets/javascripts/cartodb3/data/default-cartography.json b/lib/assets/javascripts/builder/data/default-cartography.json
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/default-cartography.json
rename to lib/assets/javascripts/builder/data/default-cartography.json
diff --git a/lib/assets/javascripts/cartodb3/data/default-form-styles.json b/lib/assets/javascripts/builder/data/default-form-styles.json
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/default-form-styles.json
rename to lib/assets/javascripts/builder/data/default-form-styles.json
diff --git a/lib/assets/javascripts/cartodb3/data/editor-background-polling-model.js b/lib/assets/javascripts/builder/data/editor-background-polling-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/editor-background-polling-model.js
rename to lib/assets/javascripts/builder/data/editor-background-polling-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/editor-model.js b/lib/assets/javascripts/builder/data/editor-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/editor-model.js
rename to lib/assets/javascripts/builder/data/editor-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/export-map-definition-model.js b/lib/assets/javascripts/builder/data/export-map-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/export-map-definition-model.js
rename to lib/assets/javascripts/builder/data/export-map-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/feature-definition-model.js b/lib/assets/javascripts/builder/data/feature-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/feature-definition-model.js
rename to lib/assets/javascripts/builder/data/feature-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/get-simple-geometry-type.js b/lib/assets/javascripts/builder/data/get-simple-geometry-type.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/get-simple-geometry-type.js
rename to lib/assets/javascripts/builder/data/get-simple-geometry-type.js
diff --git a/lib/assets/javascripts/cartodb3/data/grantables-collection.js b/lib/assets/javascripts/builder/data/grantables-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/grantables-collection.js
rename to lib/assets/javascripts/builder/data/grantables-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/group-model.js b/lib/assets/javascripts/builder/data/group-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/group-model.js
rename to lib/assets/javascripts/builder/data/group-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/infowindow-click-model.js b/lib/assets/javascripts/builder/data/infowindow-click-model.js
similarity index 62%
rename from lib/assets/javascripts/cartodb3/data/infowindow-click-model.js
rename to lib/assets/javascripts/builder/data/infowindow-click-model.js
index 0df682166d..0d23141f9c 100755
--- a/lib/assets/javascripts/cartodb3/data/infowindow-click-model.js
+++ b/lib/assets/javascripts/builder/data/infowindow-click-model.js
@@ -23,14 +23,14 @@ module.exports = InfowindowDefinitionModel.extend({
},
TEMPLATES: {
- infowindow_light: require('cartodb3/mustache-templates/infowindows/infowindow_light.jst.mustache'),
- infowindow_dark: require('cartodb3/mustache-templates/infowindows/infowindow_dark.jst.mustache'),
- infowindow_color: require('cartodb3/mustache-templates/infowindows/infowindow_color.jst.mustache'),
- infowindow_header_with_image: require('cartodb3/mustache-templates/infowindows/infowindow_header_with_image.jst.mustache'),
- custom_infowindow_light: require('cartodb3/mustache-templates/infowindows_custom/infowindow_light.jst.mustache'),
- custom_infowindow_dark: require('cartodb3/mustache-templates/infowindows_custom/infowindow_dark.jst.mustache'),
- custom_infowindow_color: require('cartodb3/mustache-templates/infowindows_custom/infowindow_color.jst.mustache'),
- custom_infowindow_header_with_image: require('cartodb3/mustache-templates/infowindows_custom/infowindow_header_with_image.jst.mustache')
+ infowindow_light: require('builder/mustache-templates/infowindows/infowindow_light.jst.mustache'),
+ infowindow_dark: require('builder/mustache-templates/infowindows/infowindow_dark.jst.mustache'),
+ infowindow_color: require('builder/mustache-templates/infowindows/infowindow_color.jst.mustache'),
+ infowindow_header_with_image: require('builder/mustache-templates/infowindows/infowindow_header_with_image.jst.mustache'),
+ custom_infowindow_light: require('builder/mustache-templates/infowindows_custom/infowindow_light.jst.mustache'),
+ custom_infowindow_dark: require('builder/mustache-templates/infowindows_custom/infowindow_dark.jst.mustache'),
+ custom_infowindow_color: require('builder/mustache-templates/infowindows_custom/infowindow_color.jst.mustache'),
+ custom_infowindow_header_with_image: require('builder/mustache-templates/infowindows_custom/infowindow_header_with_image.jst.mustache')
},
_transformTemplate: function (template) {
diff --git a/lib/assets/javascripts/cartodb3/data/infowindow-definition-model.js b/lib/assets/javascripts/builder/data/infowindow-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/infowindow-definition-model.js
rename to lib/assets/javascripts/builder/data/infowindow-definition-model.js
diff --git a/lib/assets/javascripts/builder/data/infowindow-hover-model.js b/lib/assets/javascripts/builder/data/infowindow-hover-model.js
new file mode 100755
index 0000000000..5733a07302
--- /dev/null
+++ b/lib/assets/javascripts/builder/data/infowindow-hover-model.js
@@ -0,0 +1,24 @@
+var InfowindowDefinitionModel = require('./infowindow-definition-model');
+
+module.exports = InfowindowDefinitionModel.extend({
+
+ defaults: {
+ vertical_offset: 0,
+ horizontal_offset: 0,
+ position: 'top|center',
+ template_name: '',
+ template: ''
+ },
+
+ TEMPLATES: {
+ tooltip_dark: require('builder/mustache-templates/tooltips/tooltip_dark.jst.mustache'),
+ tooltip_light: require('builder/mustache-templates/tooltips/tooltip_light.jst.mustache'),
+ custom_tooltip_dark: require('builder/mustache-templates/tooltips_custom/tooltip_dark.jst.mustache'),
+ custom_tooltip_light: require('builder/mustache-templates/tooltips_custom/tooltip_light.jst.mustache')
+ },
+
+ setDefault: function () {
+ this.setTemplate(this.defaults.template_name);
+ }
+
+});
diff --git a/lib/assets/javascripts/cartodb3/data/layer-colors.js b/lib/assets/javascripts/builder/data/layer-colors.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/layer-colors.js
rename to lib/assets/javascripts/builder/data/layer-colors.js
diff --git a/lib/assets/javascripts/cartodb3/data/layer-content-model.js b/lib/assets/javascripts/builder/data/layer-content-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/data/layer-content-model.js
rename to lib/assets/javascripts/builder/data/layer-content-model.js
index de43ae01d7..5f59300ff7 100644
--- a/lib/assets/javascripts/cartodb3/data/layer-content-model.js
+++ b/lib/assets/javascripts/builder/data/layer-content-model.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var STATES = require('./query-base-status');
var CONTEXTS = {
diff --git a/lib/assets/javascripts/cartodb3/data/layer-definition-model.js b/lib/assets/javascripts/builder/data/layer-definition-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/layer-definition-model.js
rename to lib/assets/javascripts/builder/data/layer-definition-model.js
index 6e0e4f2dd3..ca49341b15 100755
--- a/lib/assets/javascripts/cartodb3/data/layer-definition-model.js
+++ b/lib/assets/javascripts/builder/data/layer-definition-model.js
@@ -1,13 +1,13 @@
var Backbone = require('backbone');
var _ = require('underscore');
var syncAbort = require('./backbone/sync-abort');
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
-var StyleCartoCSSModel = require('cartodb3/editor/style/style-cartocss-model');
-var DataSQLModel = require('cartodb3/editor/layers/layer-content-views/data/data-sql-model');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
+var StyleCartoCSSModel = require('builder/editor/style/style-cartocss-model');
+var DataSQLModel = require('builder/editor/layers/layer-content-views/data/data-sql-model');
var layerTypesAndKinds = require('./layer-types-and-kinds');
var InfowindowModel = require('./infowindow-click-model');
var TooltipModel = require('./infowindow-hover-model');
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
+var TableNameUtils = require('builder/helpers/table-name-utils');
var layerColors = require('./layer-colors');
// from_layer_id and from_letter are not attributes for the model, but are sent to the layer creation
diff --git a/lib/assets/javascripts/cartodb3/data/layer-definitions-collection.js b/lib/assets/javascripts/builder/data/layer-definitions-collection.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/layer-definitions-collection.js
rename to lib/assets/javascripts/builder/data/layer-definitions-collection.js
index df44affc7a..4f58bf1713 100755
--- a/lib/assets/javascripts/cartodb3/data/layer-definitions-collection.js
+++ b/lib/assets/javascripts/builder/data/layer-definitions-collection.js
@@ -4,11 +4,11 @@ var Backbone = require('backbone');
var LayerDefinitionModel = require('./layer-definition-model');
var layerLetters = require('./layer-letters');
var layerColors = require('./layer-colors');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
var layerTypesAndKinds = require('./layer-types-and-kinds');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var SQLUtils = require('builder/helpers/sql-utils');
+var TableNameUtils = require('builder/helpers/table-name-utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodesCollection',
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/layer-letters.js b/lib/assets/javascripts/builder/data/layer-letters.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/layer-letters.js
rename to lib/assets/javascripts/builder/data/layer-letters.js
diff --git a/lib/assets/javascripts/cartodb3/data/layer-types-and-kinds.js b/lib/assets/javascripts/builder/data/layer-types-and-kinds.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/layer-types-and-kinds.js
rename to lib/assets/javascripts/builder/data/layer-types-and-kinds.js
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-base-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-base-definition-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-base-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-base-definition-model.js
index 51ec638863..361333f766 100755
--- a/lib/assets/javascripts/cartodb3/data/legends/legend-base-definition-model.js
+++ b/lib/assets/javascripts/builder/data/legends/legend-base-definition-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var syncAbort = require('cartodb3/data/backbone/sync-abort');
+var syncAbort = require('builder/data/backbone/sync-abort');
var LegendsState = require('./legends-state');
/*
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-bubble-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-bubble-definition-model.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-bubble-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-bubble-definition-model.js
index 65a7ae9870..2c42e1dae2 100755
--- a/lib/assets/javascripts/cartodb3/data/legends/legend-bubble-definition-model.js
+++ b/lib/assets/javascripts/builder/data/legends/legend-bubble-definition-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var LegendBaseDefModel = require('./legend-base-definition-model');
-var LegendColorHelper = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-color-helper');
+var LegendColorHelper = require('builder/editor/layers/layer-content-views/legend/form/legend-color-helper');
var DEFAULT_BUBBLES_COLOR = '#999999';
module.exports = LegendBaseDefModel.extend({
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-category-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-category-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-category-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-category-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-choropleth-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-choropleth-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-choropleth-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-choropleth-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-custom-choropleth-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-custom-choropleth-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-custom-choropleth-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-custom-choropleth-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-custom-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-custom-definition-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-custom-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-custom-definition-model.js
index 8f8aa5465e..8945686b28 100755
--- a/lib/assets/javascripts/cartodb3/data/legends/legend-custom-definition-model.js
+++ b/lib/assets/javascripts/builder/data/legends/legend-custom-definition-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var LegendBaseDefModel = require('./legend-base-definition-model');
-var StyleHelper = require('cartodb3/helpers/style');
+var StyleHelper = require('builder/helpers/style');
module.exports = LegendBaseDefModel.extend({
defaults: _.extend({}, LegendBaseDefModel.prototype.defaults,
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-definitions-collection.js b/lib/assets/javascripts/builder/data/legends/legend-definitions-collection.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-definitions-collection.js
rename to lib/assets/javascripts/builder/data/legends/legend-definitions-collection.js
index 9335fa4c64..ba4e83eeae 100755
--- a/lib/assets/javascripts/cartodb3/data/legends/legend-definitions-collection.js
+++ b/lib/assets/javascripts/builder/data/legends/legend-definitions-collection.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
var LegendBaseDefModel = require('./legend-base-definition-model');
-var layerTypesAndKinds = require('cartodb3/data/layer-types-and-kinds');
+var layerTypesAndKinds = require('builder/data/layer-types-and-kinds');
var CategoryModel = require('./legend-category-definition-model');
var BubbleModel = require('./legend-bubble-definition-model');
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legend-torque-definition-model.js b/lib/assets/javascripts/builder/data/legends/legend-torque-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/legends/legend-torque-definition-model.js
rename to lib/assets/javascripts/builder/data/legends/legend-torque-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legends-metadata.js b/lib/assets/javascripts/builder/data/legends/legends-metadata.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/legends/legends-metadata.js
rename to lib/assets/javascripts/builder/data/legends/legends-metadata.js
diff --git a/lib/assets/javascripts/cartodb3/data/legends/legends-state.js b/lib/assets/javascripts/builder/data/legends/legends-state.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/legends/legends-state.js
rename to lib/assets/javascripts/builder/data/legends/legends-state.js
diff --git a/lib/assets/javascripts/cartodb3/data/map-definition-model.js b/lib/assets/javascripts/builder/data/map-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/map-definition-model.js
rename to lib/assets/javascripts/builder/data/map-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/map-settings.js b/lib/assets/javascripts/builder/data/map-settings.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/map-settings.js
rename to lib/assets/javascripts/builder/data/map-settings.js
diff --git a/lib/assets/javascripts/cartodb3/data/mapcaps-collection.js b/lib/assets/javascripts/builder/data/mapcaps-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/mapcaps-collection.js
rename to lib/assets/javascripts/builder/data/mapcaps-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/organization-assets-collection.js b/lib/assets/javascripts/builder/data/organization-assets-collection.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/data/organization-assets-collection.js
rename to lib/assets/javascripts/builder/data/organization-assets-collection.js
index 11f7ce16f7..f57157d1ef 100644
--- a/lib/assets/javascripts/cartodb3/data/organization-assets-collection.js
+++ b/lib/assets/javascripts/builder/data/organization-assets-collection.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var AssetModel = require('./asset-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/organization-model.js b/lib/assets/javascripts/builder/data/organization-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/organization-model.js
rename to lib/assets/javascripts/builder/data/organization-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/overlays-definition-collection.js b/lib/assets/javascripts/builder/data/overlays-definition-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/overlays-definition-collection.js
rename to lib/assets/javascripts/builder/data/overlays-definition-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/permission-model.js b/lib/assets/javascripts/builder/data/permission-model.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/data/permission-model.js
rename to lib/assets/javascripts/builder/data/permission-model.js
index c99ca2a102..e55921c65b 100755
--- a/lib/assets/javascripts/cartodb3/data/permission-model.js
+++ b/lib/assets/javascripts/builder/data/permission-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var UserModel = require('./user-model');
var OrganizationModel = require('./organization-model');
var GroupModel = require('./group-model');
diff --git a/lib/assets/javascripts/cartodb3/data/query-base-model.js b/lib/assets/javascripts/builder/data/query-base-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-base-model.js
rename to lib/assets/javascripts/builder/data/query-base-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-base-status.js b/lib/assets/javascripts/builder/data/query-base-status.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-base-status.js
rename to lib/assets/javascripts/builder/data/query-base-status.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-column-model.js b/lib/assets/javascripts/builder/data/query-column-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-column-model.js
rename to lib/assets/javascripts/builder/data/query-column-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-columns-collection.js b/lib/assets/javascripts/builder/data/query-columns-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-columns-collection.js
rename to lib/assets/javascripts/builder/data/query-columns-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-geometry-model.js b/lib/assets/javascripts/builder/data/query-geometry-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-geometry-model.js
rename to lib/assets/javascripts/builder/data/query-geometry-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-row-model.js b/lib/assets/javascripts/builder/data/query-row-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-row-model.js
rename to lib/assets/javascripts/builder/data/query-row-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-rows-collection.js b/lib/assets/javascripts/builder/data/query-rows-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/query-rows-collection.js
rename to lib/assets/javascripts/builder/data/query-rows-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/query-schema-model.js b/lib/assets/javascripts/builder/data/query-schema-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/query-schema-model.js
rename to lib/assets/javascripts/builder/data/query-schema-model.js
index a141f58a5b..8e12a3f661 100755
--- a/lib/assets/javascripts/cartodb3/data/query-schema-model.js
+++ b/lib/assets/javascripts/builder/data/query-schema-model.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var Backbone = require('backbone');
var BaseModel = require('./query-base-model');
var QueryRowsCollection = require('./query-rows-collection');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
+var SQLUtils = require('builder/helpers/sql-utils');
var STATUS = require('./query-base-status');
var DEFAULT_TABLE_QUERY_TEMPLATE = _.template('SELECT * FROM <%= tableName %>');
diff --git a/lib/assets/javascripts/cartodb3/data/state-definition-model.js b/lib/assets/javascripts/builder/data/state-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/state-definition-model.js
rename to lib/assets/javascripts/builder/data/state-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/static-asset-model.js b/lib/assets/javascripts/builder/data/static-asset-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/static-asset-model.js
rename to lib/assets/javascripts/builder/data/static-asset-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/static-assets-collection.js b/lib/assets/javascripts/builder/data/static-assets-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/static-assets-collection.js
rename to lib/assets/javascripts/builder/data/static-assets-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/synchronization-model.js b/lib/assets/javascripts/builder/data/synchronization-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/synchronization-model.js
rename to lib/assets/javascripts/builder/data/synchronization-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/table-columns-collection.js b/lib/assets/javascripts/builder/data/table-columns-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/table-columns-collection.js
rename to lib/assets/javascripts/builder/data/table-columns-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/table-model.js b/lib/assets/javascripts/builder/data/table-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/table-model.js
rename to lib/assets/javascripts/builder/data/table-model.js
index 5fb79575ea..e7319f2187 100755
--- a/lib/assets/javascripts/cartodb3/data/table-model.js
+++ b/lib/assets/javascripts/builder/data/table-model.js
@@ -4,7 +4,7 @@ var TableColumnsCollection = require('./table-columns-collection');
var getSimpleGeometryType = require('./get-simple-geometry-type');
var PermissionModel = require('./permission-model');
var SyncModel = require('./synchronization-model');
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
+var TableNameUtils = require('builder/helpers/table-name-utils');
/**
* Model representing a table.
diff --git a/lib/assets/javascripts/cartodb3/data/tables-collection.js b/lib/assets/javascripts/builder/data/tables-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/tables-collection.js
rename to lib/assets/javascripts/builder/data/tables-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/timezones.js b/lib/assets/javascripts/builder/data/timezones.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/timezones.js
rename to lib/assets/javascripts/builder/data/timezones.js
diff --git a/lib/assets/javascripts/cartodb3/data/undo-manager.js b/lib/assets/javascripts/builder/data/undo-manager.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/undo-manager.js
rename to lib/assets/javascripts/builder/data/undo-manager.js
diff --git a/lib/assets/javascripts/cartodb3/data/upload-model.js b/lib/assets/javascripts/builder/data/upload-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/upload-model.js
rename to lib/assets/javascripts/builder/data/upload-model.js
index 57c1348909..b1e310b2fb 100755
--- a/lib/assets/javascripts/cartodb3/data/upload-model.js
+++ b/lib/assets/javascripts/builder/data/upload-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var UploadConfig = require('cartodb3/config/upload-config');
-var Utils = require('cartodb3/helpers/utils.js');
+var UploadConfig = require('builder/config/upload-config');
+var Utils = require('builder/helpers/utils.js');
var moment = require('moment');
require('backbone-model-file-upload');
diff --git a/lib/assets/javascripts/cartodb3/data/user-actions.js b/lib/assets/javascripts/builder/data/user-actions.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/user-actions.js
rename to lib/assets/javascripts/builder/data/user-actions.js
index ca1095786f..2205aabf1c 100755
--- a/lib/assets/javascripts/cartodb3/data/user-actions.js
+++ b/lib/assets/javascripts/builder/data/user-actions.js
@@ -1,13 +1,13 @@
var $ = require('jquery');
var _ = require('underscore');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var SimpleStyleDefaults = require('cartodb3/editor/style/style-defaults/simple-style-defaults');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var SimpleStyleDefaults = require('builder/editor/style/style-defaults/simple-style-defaults');
var camshaftReference = require('./camshaft-reference');
var layerTypesAndKinds = require('./layer-types-and-kinds');
var layerColors = require('./layer-colors');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var resetStylePerNode = require('cartodb3/helpers/reset-style-per-node');
+var Notifier = require('builder/components/notifier/notifier');
+var resetStylePerNode = require('builder/helpers/reset-style-per-node');
var TABLE_ORIGIN = 'table';
diff --git a/lib/assets/javascripts/cartodb3/data/user-groups-collection.js b/lib/assets/javascripts/builder/data/user-groups-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/user-groups-collection.js
rename to lib/assets/javascripts/builder/data/user-groups-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/user-model.js b/lib/assets/javascripts/builder/data/user-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/user-model.js
rename to lib/assets/javascripts/builder/data/user-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/user-notifications.js b/lib/assets/javascripts/builder/data/user-notifications.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/user-notifications.js
rename to lib/assets/javascripts/builder/data/user-notifications.js
diff --git a/lib/assets/javascripts/cartodb3/data/users-group-collection.js b/lib/assets/javascripts/builder/data/users-group-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/users-group-collection.js
rename to lib/assets/javascripts/builder/data/users-group-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/users-group-fetcher.js b/lib/assets/javascripts/builder/data/users-group-fetcher.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/users-group-fetcher.js
rename to lib/assets/javascripts/builder/data/users-group-fetcher.js
diff --git a/lib/assets/javascripts/cartodb3/data/vis-definition-model.js b/lib/assets/javascripts/builder/data/vis-definition-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/vis-definition-model.js
rename to lib/assets/javascripts/builder/data/vis-definition-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/vis-metadata-model.js b/lib/assets/javascripts/builder/data/vis-metadata-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/vis-metadata-model.js
rename to lib/assets/javascripts/builder/data/vis-metadata-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/visualization-table-model.js b/lib/assets/javascripts/builder/data/visualization-table-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/data/visualization-table-model.js
rename to lib/assets/javascripts/builder/data/visualization-table-model.js
index cc512b64df..f450e20696 100755
--- a/lib/assets/javascripts/cartodb3/data/visualization-table-model.js
+++ b/lib/assets/javascripts/builder/data/visualization-table-model.js
@@ -3,7 +3,7 @@ var _ = require('underscore');
var TableModel = require('./table-model');
var PermissionModel = require('./permission-model');
var SynchronizationModel = require('./synchronization-model');
-var LikesModel = require('cartodb3/components/likes/likes-model');
+var LikesModel = require('builder/components/likes/likes-model');
/**
* Model that represents a table visualization (v3)
diff --git a/lib/assets/javascripts/cartodb3/data/visualizations-collection.js b/lib/assets/javascripts/builder/data/visualizations-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/visualizations-collection.js
rename to lib/assets/javascripts/builder/data/visualizations-collection.js
diff --git a/lib/assets/javascripts/cartodb3/data/visualizations-fetch-model.js b/lib/assets/javascripts/builder/data/visualizations-fetch-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/visualizations-fetch-model.js
rename to lib/assets/javascripts/builder/data/visualizations-fetch-model.js
diff --git a/lib/assets/javascripts/cartodb3/data/widget-definition-model.js b/lib/assets/javascripts/builder/data/widget-definition-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/widget-definition-model.js
rename to lib/assets/javascripts/builder/data/widget-definition-model.js
index ce4f9bff8e..1774f1b741 100755
--- a/lib/assets/javascripts/cartodb3/data/widget-definition-model.js
+++ b/lib/assets/javascripts/builder/data/widget-definition-model.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var Backbone = require('backbone');
var CartoColor = require('cartocolor');
var syncAbort = require('./backbone/sync-abort');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/widget-definitions-collection.js b/lib/assets/javascripts/builder/data/widget-definitions-collection.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/data/widget-definitions-collection.js
rename to lib/assets/javascripts/builder/data/widget-definitions-collection.js
index 49a3948367..6ea52c7311 100755
--- a/lib/assets/javascripts/cartodb3/data/widget-definitions-collection.js
+++ b/lib/assets/javascripts/builder/data/widget-definitions-collection.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
var WidgetDefinitionModel = require('./widget-definition-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/data/wms-service.js b/lib/assets/javascripts/builder/data/wms-service.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/data/wms-service.js
rename to lib/assets/javascripts/builder/data/wms-service.js
diff --git a/lib/assets/javascripts/cartodb3/dataset.js b/lib/assets/javascripts/builder/dataset.js
similarity index 79%
rename from lib/assets/javascripts/cartodb3/dataset.js
rename to lib/assets/javascripts/builder/dataset.js
index 72a883273c..8f10cd3222 100755
--- a/lib/assets/javascripts/cartodb3/dataset.js
+++ b/lib/assets/javascripts/builder/dataset.js
@@ -13,23 +13,23 @@ window._t = polyglot.t.bind(polyglot);
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var ModalsServiceModel = require('cartodb3/components/modals/modals-service-model');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var TableModel = require('cartodb3/data/table-model');
-var VisTableModel = require('cartodb3/data/visualization-table-model');
-var DatasetUnlockModalView = require('cartodb3/dataset/dataset-unlock-modal-view');
-var EditorModel = require('cartodb3/data/editor-model');
-var UserModel = require('cartodb3/data/user-model');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var UserGroupFetcher = require('cartodb3/data/users-group-fetcher');
-var SQLUtils = require('cartodb3/helpers/sql-utils');
-var BuilderActivatedNotification = require('cartodb3/components/onboardings/builder-activated/builder-activated-notification-view');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var layerTypesAndKinds = require('cartodb3/data/layer-types-and-kinds');
-var DatasetView = require('cartodb3/dataset/dataset-view');
+var ConfigModel = require('builder/data/config-model');
+var ModalsServiceModel = require('builder/components/modals/modals-service-model');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var TableModel = require('builder/data/table-model');
+var VisTableModel = require('builder/data/visualization-table-model');
+var DatasetUnlockModalView = require('builder/dataset/dataset-unlock-modal-view');
+var EditorModel = require('builder/data/editor-model');
+var UserModel = require('builder/data/user-model');
+var Notifier = require('builder/components/notifier/notifier');
+var UserGroupFetcher = require('builder/data/users-group-fetcher');
+var SQLUtils = require('builder/helpers/sql-utils');
+var BuilderActivatedNotification = require('builder/components/onboardings/builder-activated/builder-activated-notification-view');
+var UserNotifications = require('builder/data/user-notifications');
+var layerTypesAndKinds = require('builder/data/layer-types-and-kinds');
+var DatasetView = require('builder/dataset/dataset-view');
var userData = window.userData;
var visData = window.visualizationData;
diff --git a/lib/assets/javascripts/cartodb3/dataset/data-sql-model.js b/lib/assets/javascripts/builder/dataset/data-sql-model.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/dataset/data-sql-model.js
rename to lib/assets/javascripts/builder/dataset/data-sql-model.js
index 05472a669b..64510b22ae 100755
--- a/lib/assets/javascripts/cartodb3/dataset/data-sql-model.js
+++ b/lib/assets/javascripts/builder/dataset/data-sql-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var UndoManager = require('cartodb3/data/undo-manager.js');
+var UndoManager = require('builder/data/undo-manager.js');
/**
* Data SQL Undo-redo model
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-options-view.js b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-options-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options-view.js
index 3237932cdc..3e06fceddb 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-options-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options-view.js
@@ -1,8 +1,8 @@
var CoreView = require('backbone/core-view');
-var ModalExportDataView = require('cartodb3/components/modals/export-data/modal-export-data-view');
+var ModalExportDataView = require('builder/components/modals/export-data/modal-export-data-view');
var SyncInfoView = require('./dataset-content-sync-view');
var template = require('./dataset-content-options.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodeModel',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-options.tpl b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-options.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-sync-view.js b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-sync-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-sync-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-sync-view.js
index 1eb9ae4a0d..f4e417e775 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-sync-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-sync-view.js
@@ -1,11 +1,11 @@
var CoreView = require('backbone/core-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var CreationModalView = require('cartodb3/components/modals/creation/modal-creation-view');
-var SyncOptionsModalView = require('cartodb3/components/modals/sync-options/sync-options-modal-view');
-var SyncModel = require('cartodb3/data/synchronization-model');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var CreationModalView = require('builder/components/modals/creation/modal-creation-view');
+var SyncOptionsModalView = require('builder/components/modals/sync-options/sync-options-modal-view');
+var SyncModel = require('builder/data/synchronization-model');
var template = require('./dataset-content-sync.tpl');
var moment = require('moment');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'syncModel',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-sync.tpl b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-sync.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-sync.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-sync.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-view.js b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-view.js
index f98680c5c0..8e1b97c16f 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-content/dataset-content-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
-var TableManager = require('cartodb3/components/table/table-manager');
+var TableManager = require('builder/components/table/table-manager');
var DatasetContentOptionsView = require('./dataset-content-options-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodeModel',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-header/create-context-menu.js b/lib/assets/javascripts/builder/dataset/dataset-header/create-context-menu.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-header/create-context-menu.js
rename to lib/assets/javascripts/builder/dataset/dataset-header/create-context-menu.js
index 7a02836f06..73d100a61d 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-header/create-context-menu.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-header/create-context-menu.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
var REQUIRED_OPTS = [
'ev',
'isTableOwner',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-header/dataset-header-view.js b/lib/assets/javascripts/builder/dataset/dataset-header/dataset-header-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-header/dataset-header-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-header/dataset-header-view.js
index e93d7e9d22..eacf81c27f 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-header/dataset-header-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-header/dataset-header-view.js
@@ -1,24 +1,24 @@
var CoreView = require('backbone/core-view');
var template = require('./dataset-header.tpl');
var moment = require('moment');
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var renameTableOperation = require('cartodb3/dataset/operations/table-rename-operation');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var renameTableOperation = require('builder/dataset/operations/table-rename-operation');
var templateInlineEditor = require('./inline-editor.tpl');
-var ConfirmationModalView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var RemoveDatasetModalView = require('cartodb3/components/modals/remove-dataset/remove-dataset-view');
-var PublishView = require('cartodb3/components/modals/publish/publish-view');
-var PrivacyDropdown = require('cartodb3/components/privacy-dropdown/privacy-dropdown-view');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var CreatePrivacyOptions = require('cartodb3/components/modals/publish/create-privacy-options');
-var ShareWith = require('cartodb3/components/modals/publish/share-with-view');
-var CreationModalView = require('cartodb3/components/modals/creation/modal-creation-view');
-var EditMetadataView = require('cartodb3/components/modals/dataset-metadata/dataset-metadata-view');
-var VisTableModel = require('cartodb3/data/visualization-table-model');
+var ConfirmationModalView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var RemoveDatasetModalView = require('builder/components/modals/remove-dataset/remove-dataset-view');
+var PublishView = require('builder/components/modals/publish/publish-view');
+var PrivacyDropdown = require('builder/components/privacy-dropdown/privacy-dropdown-view');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var CreatePrivacyOptions = require('builder/components/modals/publish/create-privacy-options');
+var ShareWith = require('builder/components/modals/publish/share-with-view');
+var CreationModalView = require('builder/components/modals/creation/modal-creation-view');
+var EditMetadataView = require('builder/components/modals/dataset-metadata/dataset-metadata-view');
+var VisTableModel = require('builder/data/visualization-table-model');
var templateConfirmation = require('./rename-confirmation-modal.tpl');
var createContextMenu = require('./create-context-menu');
-var tableDuplicationOperation = require('cartodb3/dataset/operations/table-duplication-operation');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var tableDuplicationOperation = require('builder/dataset/operations/table-duplication-operation');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var TITLE_SUFFIX = ' | CARTO';
var PRIVACY_MAP = {
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-header/dataset-header.tpl b/lib/assets/javascripts/builder/dataset/dataset-header/dataset-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-header/dataset-header.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-header/dataset-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-header/inline-editor.tpl b/lib/assets/javascripts/builder/dataset/dataset-header/inline-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-header/inline-editor.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-header/inline-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-header/rename-confirmation-modal.tpl b/lib/assets/javascripts/builder/dataset/dataset-header/rename-confirmation-modal.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-header/rename-confirmation-modal.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-header/rename-confirmation-modal.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/code-mirror-error.tpl b/lib/assets/javascripts/builder/dataset/dataset-options/code-mirror-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/code-mirror-error.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-options/code-mirror-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions-edition-view.js b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions-edition-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions-edition-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions-edition-view.js
index f447eb8cbe..41433be37f 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions-edition-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions-edition-view.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./dataset-actions.tpl');
-var UndoButtons = require('cartodb3/components/undo-redo/undo-redo-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var UndoButtons = require('builder/components/undo-redo/undo-redo-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'mapAction',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions-view.js b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions-view.js
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions.tpl b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-actions.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-options/dataset-actions.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-options-view.js b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-options-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-options-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-options/dataset-options-view.js
index add149854c..2d95cd13bb 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-options-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-options-view.js
@@ -1,22 +1,22 @@
var Backbone = require('backbone');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var CreationModalView = require('cartodb3/components/modals/creation/modal-creation-view');
-var DatasetBaseView = require('cartodb3/components/dataset/dataset-base-view');
-var errorParser = require('cartodb3/helpers/error-parser');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var Toggler = require('cartodb3/components/toggler/toggler-view');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var CreationModalView = require('builder/components/modals/creation/modal-creation-view');
+var DatasetBaseView = require('builder/components/dataset/dataset-base-view');
+var errorParser = require('builder/helpers/error-parser');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var Toggler = require('builder/components/toggler/toggler-view');
var DatasetEditorView = require('./dataset-sql-view');
var ActionView = require('./dataset-actions-view');
var PreviewMapView = require('./preview-map-view');
var ActionViewEdition = require('./dataset-actions-edition-view');
-var DataSQLModel = require('cartodb3/dataset/data-sql-model');
-var SQLNotifications = require('cartodb3/sql-notifications');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var DataSQLModel = require('builder/dataset/data-sql-model');
+var SQLNotifications = require('builder/sql-notifications');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodeModel',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-options.tpl b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-options.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-options.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-options/dataset-options.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-sql-view.js b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-sql-view.js
similarity index 82%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-sql-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-options/dataset-sql-view.js
index 3544c847ff..4ced6a7050 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-options/dataset-sql-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-options/dataset-sql-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
var ErrorTemplate = require('./code-mirror-error.tpl');
-var FactoryHints = require('cartodb3/editor/editor-hints/factory-hints');
-var SQLHints = require('cartodb3/editor/editor-hints/sql-hints');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var FactoryHints = require('builder/editor/editor-hints/factory-hints');
+var SQLHints = require('builder/editor/editor-hints/sql-hints');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'codemirrorModel',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/preview-map-view.js b/lib/assets/javascripts/builder/dataset/dataset-options/preview-map-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/preview-map-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-options/preview-map-view.js
index e6ebf87eae..a73df7a86b 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-options/preview-map-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-options/preview-map-view.js
@@ -1,11 +1,11 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var CreationModalView = require('cartodb3/components/modals/creation/modal-creation-view');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var errorParser = require('cartodb3/helpers/error-parser');
+var CreationModalView = require('builder/components/modals/creation/modal-creation-view');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var errorParser = require('builder/helpers/error-parser');
var template = require('./preview-map.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var ESC_KEY_CODE = 27;
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-options/preview-map.tpl b/lib/assets/javascripts/builder/dataset/dataset-options/preview-map.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-options/preview-map.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-options/preview-map.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-unlock-modal-view.js b/lib/assets/javascripts/builder/dataset/dataset-unlock-modal-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-unlock-modal-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-unlock-modal-view.js
index 8d814823d6..2054ac3735 100755
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-unlock-modal-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-unlock-modal-view.js
@@ -1,10 +1,10 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var _ = require('underscore');
-var errorParser = require('cartodb3/helpers/error-parser');
+var errorParser = require('builder/helpers/error-parser');
var template = require('./dataset-unlock-modal.tpl');
-var renderLoading = require('cartodb3/components/loading/render-loading');
-var ErrorView = require('cartodb3/components/error/error-view');
+var renderLoading = require('builder/components/loading/render-loading');
+var ErrorView = require('builder/components/error/error-view');
var REQUIRED_OPTS = [
'tableName',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-unlock-modal.tpl b/lib/assets/javascripts/builder/dataset/dataset-unlock-modal.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-unlock-modal.tpl
rename to lib/assets/javascripts/builder/dataset/dataset-unlock-modal.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset-view.js b/lib/assets/javascripts/builder/dataset/dataset-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/dataset/dataset-view.js
rename to lib/assets/javascripts/builder/dataset/dataset-view.js
index 2a74ca0108..292435762b 100644
--- a/lib/assets/javascripts/cartodb3/dataset/dataset-view.js
+++ b/lib/assets/javascripts/builder/dataset/dataset-view.js
@@ -3,8 +3,8 @@ var template = require('./dataset.tpl');
var HeaderView = require('./dataset-header/dataset-header-view');
var DatasetContentView = require('./dataset-content/dataset-content-view');
var DatasetOptionsView = require('./dataset-options/dataset-options-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'router',
diff --git a/lib/assets/javascripts/cartodb3/dataset/dataset.tpl b/lib/assets/javascripts/builder/dataset/dataset.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/dataset/dataset.tpl
rename to lib/assets/javascripts/builder/dataset/dataset.tpl
diff --git a/lib/assets/javascripts/cartodb3/dataset/operations/table-delete-operation.js b/lib/assets/javascripts/builder/dataset/operations/table-delete-operation.js
similarity index 84%
rename from lib/assets/javascripts/cartodb3/dataset/operations/table-delete-operation.js
rename to lib/assets/javascripts/builder/dataset/operations/table-delete-operation.js
index d1bf6849cb..950266eaf5 100755
--- a/lib/assets/javascripts/cartodb3/dataset/operations/table-delete-operation.js
+++ b/lib/assets/javascripts/builder/dataset/operations/table-delete-operation.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.visModel) { throw new Error('visModel is required'); }
diff --git a/lib/assets/javascripts/cartodb3/dataset/operations/table-duplication-operation.js b/lib/assets/javascripts/builder/dataset/operations/table-duplication-operation.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/dataset/operations/table-duplication-operation.js
rename to lib/assets/javascripts/builder/dataset/operations/table-duplication-operation.js
index 84a6e1c0a7..d13d2146c3 100755
--- a/lib/assets/javascripts/cartodb3/dataset/operations/table-duplication-operation.js
+++ b/lib/assets/javascripts/builder/dataset/operations/table-duplication-operation.js
@@ -1,4 +1,4 @@
-var ImportModel = require('cartodb3/data/background-importer/import-model');
+var ImportModel = require('builder/data/background-importer/import-model');
module.exports = function (opts) {
if (!opts.tableModel) throw new Error('tableModel is required');
diff --git a/lib/assets/javascripts/cartodb3/dataset/operations/table-rename-operation.js b/lib/assets/javascripts/builder/dataset/operations/table-rename-operation.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/dataset/operations/table-rename-operation.js
rename to lib/assets/javascripts/builder/dataset/operations/table-rename-operation.js
index 825772acab..9dce9bc3fc 100755
--- a/lib/assets/javascripts/cartodb3/dataset/operations/table-rename-operation.js
+++ b/lib/assets/javascripts/builder/dataset/operations/table-rename-operation.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.visModel) { throw new Error('visModel is required'); }
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/analyses-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/analyses-integration.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/analyses-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/analyses-integration.js
index 70f1cef9d0..9ef5cea7a4 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/analyses-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/analyses-integration.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var AnalysisOnboardingLauncher = require('cartodb3/components/onboardings/analysis/analysis-launcher');
-var AnalysisNotifications = require('cartodb3/editor/layers/analysis-views/analysis-notifications');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var AnalysisOnboardingLauncher = require('builder/components/onboardings/analysis/analysis-launcher');
+var AnalysisNotifications = require('builder/editor/layers/analysis-views/analysis-notifications');
var REQUIRED_OPTS = [
'diDashboardHelpers',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/deep-insights-helpers.js b/lib/assets/javascripts/builder/deep-insights-integration/deep-insights-helpers.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/deep-insights-helpers.js
rename to lib/assets/javascripts/builder/deep-insights-integration/deep-insights-helpers.js
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/edit-feature-overlay.js b/lib/assets/javascripts/builder/deep-insights-integration/edit-feature-overlay.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/edit-feature-overlay.js
rename to lib/assets/javascripts/builder/deep-insights-integration/edit-feature-overlay.js
index c8edd14932..e9ff50bc58 100755
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/edit-feature-overlay.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/edit-feature-overlay.js
@@ -1,12 +1,12 @@
var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var ConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
+var ConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
var templateConfirmation = require('./start-edition-confirmation.tpl');
var templateEditGeometry = require('./edit-geometry.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var Router = require('cartodb3/routes/router');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var Notifier = require('builder/components/notifier/notifier');
+var Router = require('builder/routes/router');
var EditFeatureOverlay = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/edit-geometry.tpl b/lib/assets/javascripts/builder/deep-insights-integration/edit-geometry.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/edit-geometry.tpl
rename to lib/assets/javascripts/builder/deep-insights-integration/edit-geometry.tpl
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/features-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/features-integration.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/features-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/features-integration.js
index 4375c19627..22274f61ac 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/features-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/features-integration.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var FeatureDefinitionModel = require('cartodb3/data/feature-definition-model');
-var AppNotifications = require('cartodb3/app-notifications');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var FeatureDefinitionModel = require('builder/data/feature-definition-model');
+var AppNotifications = require('builder/app-notifications');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/layers-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/layers-integration.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/layers-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/layers-integration.js
index 9f9e0632aa..e5d2decd15 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/layers-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/layers-integration.js
@@ -3,11 +3,11 @@ var Backbone = require('backbone');
var LegendManager = require('./legend-manager');
var linkLayerInfowindow = require('./link-layer-infowindow');
var linkLayerTooltip = require('./link-layer-tooltip');
-var layerTypesAndKinds = require('cartodb3/data/layer-types-and-kinds');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var NotificationErrorMessageHandler = require('cartodb3/editor/layers/notification-error-message-handler');
-var basemapProvidersAndCategories = require('cartodb3/data/basemap-providers-and-categories');
+var layerTypesAndKinds = require('builder/data/layer-types-and-kinds');
+var Notifier = require('builder/components/notifier/notifier');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var NotificationErrorMessageHandler = require('builder/editor/layers/notification-error-message-handler');
+var basemapProvidersAndCategories = require('builder/data/basemap-providers-and-categories');
var REQUIRED_OPTS = [
'analysisDefinitionNodesCollection',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/legend-manager.js b/lib/assets/javascripts/builder/deep-insights-integration/legend-manager.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/legend-manager.js
rename to lib/assets/javascripts/builder/deep-insights-integration/legend-manager.js
index 8d6a811d38..0d7d0141ff 100755
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/legend-manager.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/legend-manager.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var LegendColorHelper = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-color-helper');
-var StyleHelper = require('cartodb3/helpers/style');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var LegendColorHelper = require('builder/editor/layers/layer-content-views/legend/form/legend-color-helper');
+var StyleHelper = require('builder/helpers/style');
var DEFAULT_BUBBLES_COLOR = '#999999';
var onChange = function (layerDefModel) {
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/legends-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/legends-integration.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/legends-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/legends-integration.js
index a1a6e150f9..1ea82e4bf9 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/legends-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/legends-integration.js
@@ -1,4 +1,4 @@
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'diDashboardHelpers',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/link-layer-infowindow.js b/lib/assets/javascripts/builder/deep-insights-integration/link-layer-infowindow.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/link-layer-infowindow.js
rename to lib/assets/javascripts/builder/deep-insights-integration/link-layer-infowindow.js
index b87c258fe2..17a11741e2 100755
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/link-layer-infowindow.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/link-layer-infowindow.js
@@ -1,4 +1,4 @@
-var infowindowNoneTemplate = require('cartodb3/mustache-templates/infowindows/infowindow_none.tpl');
+var infowindowNoneTemplate = require('builder/mustache-templates/infowindows/infowindow_none.tpl');
module.exports = function linkLayerInfowindow (layerDef, visMap) {
if (!layerDef.infowindowModel) return;
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/link-layer-tooltip.js b/lib/assets/javascripts/builder/deep-insights-integration/link-layer-tooltip.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/link-layer-tooltip.js
rename to lib/assets/javascripts/builder/deep-insights-integration/link-layer-tooltip.js
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/map-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/map-integration.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/map-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/map-integration.js
index 1a62642f93..dc716b3cbd 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/map-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/map-integration.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var VisNotifications = require('cartodb3/vis-notifications');
-var AppNotifications = require('cartodb3/app-notifications');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var VisNotifications = require('builder/vis-notifications');
+var AppNotifications = require('builder/app-notifications');
var REQUIRED_OPTS = [
'diDashboardHelpers',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/overlays-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/overlays-integration.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/overlays-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/overlays-integration.js
index 743f2acb25..cbddb53269 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/overlays-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/overlays-integration.js
@@ -1,4 +1,4 @@
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'diDashboardHelpers',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/start-edition-confirmation.tpl b/lib/assets/javascripts/builder/deep-insights-integration/start-edition-confirmation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/start-edition-confirmation.tpl
rename to lib/assets/javascripts/builder/deep-insights-integration/start-edition-confirmation.tpl
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integration/widgets-integration.js b/lib/assets/javascripts/builder/deep-insights-integration/widgets-integration.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/deep-insights-integration/widgets-integration.js
rename to lib/assets/javascripts/builder/deep-insights-integration/widgets-integration.js
index d622e2f4c4..5cd0fc9ce9 100644
--- a/lib/assets/javascripts/cartodb3/deep-insights-integration/widgets-integration.js
+++ b/lib/assets/javascripts/builder/deep-insights-integration/widgets-integration.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var WidgetsService = require('cartodb3/editor/widgets/widgets-service');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
-var WidgetsNotifications = require('cartodb3/widgets-notifications');
-var getStylesWithoutAutostyles = require('cartodb3/helpers/styles-without-autostyle');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var WidgetsService = require('builder/editor/widgets/widgets-service');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
+var WidgetsNotifications = require('builder/widgets-notifications');
+var getStylesWithoutAutostyles = require('builder/helpers/styles-without-autostyle');
var WIDGET_STYLE_PARAMS = [
'widget_style_definition',
diff --git a/lib/assets/javascripts/cartodb3/deep-insights-integrations.js b/lib/assets/javascripts/builder/deep-insights-integrations.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/deep-insights-integrations.js
rename to lib/assets/javascripts/builder/deep-insights-integrations.js
index 1c9257e6f7..99fe513799 100755
--- a/lib/assets/javascripts/cartodb3/deep-insights-integrations.js
+++ b/lib/assets/javascripts/builder/deep-insights-integrations.js
@@ -7,7 +7,7 @@ var OverlaysIntegration = require('./deep-insights-integration/overlays-integrat
var FeaturesIntegration = require('./deep-insights-integration/features-integration');
var DIDashboardHelpers = require('./deep-insights-integration/deep-insights-helpers');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodesCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor.js b/lib/assets/javascripts/builder/editor.js
similarity index 80%
rename from lib/assets/javascripts/cartodb3/editor.js
rename to lib/assets/javascripts/builder/editor.js
index ba272b0cca..bcd0b436d6 100755
--- a/lib/assets/javascripts/cartodb3/editor.js
+++ b/lib/assets/javascripts/builder/editor.js
@@ -14,57 +14,57 @@ var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
var deepInsights = require('deep-insights/index');
-var ConfigModel = require('cartodb3/data/config-model');
-var EditorMapView = require('cartodb3/editor/editor-map-view');
-var MapDefinitionModel = require('cartodb3/data/map-definition-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionsCollection = require('cartodb3/data/analysis-definitions-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var WidgetDefinitionsCollection = require('cartodb3/data/widget-definitions-collection');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var createEditorMenuTabPane = require('cartodb3/components/tab-pane/create-editor-menu-tab-pane');
-var editorPaneTemplate = require('cartodb3/editor/editor-pane.tpl');
-var editorPaneIconItemTemplate = require('cartodb3/editor/editor-pane-icon.tpl');
-var ModalsServiceModel = require('cartodb3/components/modals/modals-service-model');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
-var BuilderOnboardingLauncher = require('cartodb3/components/onboardings/builder/launcher');
-var viewFactory = require('cartodb3/components/view-factory');
-var UserModel = require('cartodb3/data/user-model');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var EditorModel = require('cartodb3/data/editor-model');
-var UserActions = require('cartodb3/data/user-actions');
-var ImporterManager = require('cartodb3/components/background-importer/background-importer');
-var BackgroundPollingModel = require('cartodb3/data/editor-background-polling-model');
-var StyleManager = require('cartodb3/editor/style/style-manager');
+var ConfigModel = require('builder/data/config-model');
+var EditorMapView = require('builder/editor/editor-map-view');
+var MapDefinitionModel = require('builder/data/map-definition-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionsCollection = require('builder/data/analysis-definitions-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var WidgetDefinitionsCollection = require('builder/data/widget-definitions-collection');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var createEditorMenuTabPane = require('builder/components/tab-pane/create-editor-menu-tab-pane');
+var editorPaneTemplate = require('builder/editor/editor-pane.tpl');
+var editorPaneIconItemTemplate = require('builder/editor/editor-pane-icon.tpl');
+var ModalsServiceModel = require('builder/components/modals/modals-service-model');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
+var BuilderOnboardingLauncher = require('builder/components/onboardings/builder/launcher');
+var viewFactory = require('builder/components/view-factory');
+var UserModel = require('builder/data/user-model');
+var UserNotifications = require('builder/data/user-notifications');
+var EditorModel = require('builder/data/editor-model');
+var UserActions = require('builder/data/user-actions');
+var ImporterManager = require('builder/components/background-importer/background-importer');
+var BackgroundPollingModel = require('builder/data/editor-background-polling-model');
+var StyleManager = require('builder/editor/style/style-manager');
var DeepInsightsIntegrations = require('./deep-insights-integrations');
var EditFeatureOverlay = require('./deep-insights-integration/edit-feature-overlay');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-// var WebGLMetrics = require('cartodb3/components/metrics/webgl-metrics');
-var FeedbackButtonView = require('cartodb3/editor/feedback/feedback-button-view');
-var SettingsOptions = require('cartodb3/data/map-settings');
-var SettingsView = require('cartodb3/editor/editor-settings-view');
-var OverlaysCollection = require('cartodb3/data/overlays-definition-collection');
-var MapcapsCollection = require('cartodb3/data/mapcaps-collection');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var CreatePrivacyOptions = require('cartodb3/components/modals/publish/create-privacy-options');
-var UserGroupFetcher = require('cartodb3/data/users-group-fetcher');
-var State = require('cartodb3/data/state-definition-model');
-var LegendDefinitionsCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var LegendsState = require('cartodb3/data/legends/legends-state');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var EditorVisualizationWarningView = require('cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view');
+var Notifier = require('builder/components/notifier/notifier');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+// var WebGLMetrics = require('builder/components/metrics/webgl-metrics');
+var FeedbackButtonView = require('builder/editor/feedback/feedback-button-view');
+var SettingsOptions = require('builder/data/map-settings');
+var SettingsView = require('builder/editor/editor-settings-view');
+var OverlaysCollection = require('builder/data/overlays-definition-collection');
+var MapcapsCollection = require('builder/data/mapcaps-collection');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var CreatePrivacyOptions = require('builder/components/modals/publish/create-privacy-options');
+var UserGroupFetcher = require('builder/data/users-group-fetcher');
+var State = require('builder/data/state-definition-model');
+var LegendDefinitionsCollection = require('builder/data/legends/legend-definitions-collection');
+var LegendsState = require('builder/data/legends/legends-state');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var EditorVisualizationWarningView = require('builder/components/modals/editor-visualization-warning/editor-visualization-warning-view');
var MapModeModel = require('./map-mode-model');
-var BuilderActivatedNotification = require('cartodb3/components/onboardings/builder-activated/builder-activated-notification-view');
+var BuilderActivatedNotification = require('builder/components/onboardings/builder-activated/builder-activated-notification-view');
var NodeGeometryTracker = require('./node-geometry-tracker');
-var WidgetsService = require('cartodb3/editor/widgets/widgets-service');
-var DataServicesApiCheck = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var WidgetsService = require('builder/editor/widgets/widgets-service');
+var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
var AppNotifications = require('./app-notifications');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var Router = require('cartodb3/routes/router');
-var handleAnalysesRoute = require('cartodb3/routes/handle-analyses-route');
-var handleModalsRoute = require('cartodb3/routes/handle-modals-route');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var Router = require('builder/routes/router');
+var handleAnalysesRoute = require('builder/routes/handle-analyses-route');
+var handleModalsRoute = require('builder/routes/handle-modals-route');
// JSON data passed from entry point (editor/visualizations/show.html):
var vizJSON = window.vizJSON;
diff --git a/lib/assets/javascripts/cartodb3/editor/components/modals/export-map/export-map-confirmation.tpl b/lib/assets/javascripts/builder/editor/components/modals/export-map/export-map-confirmation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/components/modals/export-map/export-map-confirmation.tpl
rename to lib/assets/javascripts/builder/editor/components/modals/export-map/export-map-confirmation.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/components/modals/export-map/export-map-download.tpl b/lib/assets/javascripts/builder/editor/components/modals/export-map/export-map-download.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/components/modals/export-map/export-map-download.tpl
rename to lib/assets/javascripts/builder/editor/components/modals/export-map/export-map-download.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/components/modals/export-map/modal-export-map-view.js b/lib/assets/javascripts/builder/editor/components/modals/export-map/modal-export-map-view.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/editor/components/modals/export-map/modal-export-map-view.js
rename to lib/assets/javascripts/builder/editor/components/modals/export-map/modal-export-map-view.js
index 17b2d52abd..f1bb7ba817 100755
--- a/lib/assets/javascripts/cartodb3/editor/components/modals/export-map/modal-export-map-view.js
+++ b/lib/assets/javascripts/builder/editor/components/modals/export-map/modal-export-map-view.js
@@ -1,10 +1,10 @@
var CoreView = require('backbone/core-view');
var $ = require('jquery');
var _ = require('underscore');
-var renderLoading = require('cartodb3/components/loading/render-loading.js');
-var templateExportMapConfirmation = require('cartodb3/editor/components/modals/export-map/export-map-confirmation.tpl');
-var templateExportMapDownload = require('cartodb3/editor/components/modals/export-map/export-map-download.tpl');
-var ErrorView = require('cartodb3/components/error/error-view.js');
+var renderLoading = require('builder/components/loading/render-loading.js');
+var templateExportMapConfirmation = require('builder/editor/components/modals/export-map/export-map-confirmation.tpl');
+var templateExportMapDownload = require('builder/editor/components/modals/export-map/export-map-download.tpl');
+var ErrorView = require('builder/components/error/error-view.js');
var ENTER_KEY_CODE = 13;
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/editor/components/overlay/overlay-view.js b/lib/assets/javascripts/builder/editor/components/overlay/overlay-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/components/overlay/overlay-view.js
rename to lib/assets/javascripts/builder/editor/components/overlay/overlay-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/components/overlay/overlay.tpl b/lib/assets/javascripts/builder/editor/components/overlay/overlay.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/components/overlay/overlay.tpl
rename to lib/assets/javascripts/builder/editor/components/overlay/overlay.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/delete-map-confirmation.tpl b/lib/assets/javascripts/builder/editor/delete-map-confirmation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/delete-map-confirmation.tpl
rename to lib/assets/javascripts/builder/editor/delete-map-confirmation.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-header.js b/lib/assets/javascripts/builder/editor/editor-header.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/editor/editor-header.js
rename to lib/assets/javascripts/builder/editor/editor-header.js
index da505631d6..a2853582ac 100755
--- a/lib/assets/javascripts/cartodb3/editor/editor-header.js
+++ b/lib/assets/javascripts/builder/editor/editor-header.js
@@ -2,22 +2,22 @@ var CoreView = require('backbone/core-view');
var _ = require('underscore');
var template = require('./editor-header.tpl');
var moment = require('moment');
-var ConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var EditMetadataView = require('cartodb3/components/modals/map-metadata/map-metadata-view');
+var ConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var EditMetadataView = require('builder/components/modals/map-metadata/map-metadata-view');
var templateConfirmation = require('./delete-map-confirmation.tpl');
-var ExportView = require('cartodb3/editor/components/modals/export-map/modal-export-map-view');
-var ExportMapModel = require('cartodb3/data/export-map-definition-model.js');
+var ExportView = require('builder/editor/components/modals/export-map/modal-export-map-view');
+var ExportMapModel = require('builder/data/export-map-definition-model.js');
var removeMap = require('./map-operations/remove-map');
var renameMap = require('./map-operations/rename-map');
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
var templateInlineEditor = require('./inline-editor.tpl');
-var CreationModalView = require('cartodb3/components/modals/creation/modal-creation-view');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var errorParser = require('cartodb3/helpers/error-parser');
-var ShareWith = require('cartodb3/components/modals/publish/share-with-view');
-var ContextMenuFactory = require('cartodb3/components/context-menu-factory-view');
-var PrivacyDropdown = require('cartodb3/components/privacy-dropdown/privacy-dropdown-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var CreationModalView = require('builder/components/modals/creation/modal-creation-view');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var errorParser = require('builder/helpers/error-parser');
+var ShareWith = require('builder/components/modals/publish/share-with-view');
+var ContextMenuFactory = require('builder/components/context-menu-factory-view');
+var PrivacyDropdown = require('builder/components/privacy-dropdown/privacy-dropdown-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-header.tpl b/lib/assets/javascripts/builder/editor/editor-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/editor-header.tpl
rename to lib/assets/javascripts/builder/editor/editor-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-hints/css-hints.js b/lib/assets/javascripts/builder/editor/editor-hints/css-hints.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/editor-hints/css-hints.js
rename to lib/assets/javascripts/builder/editor/editor-hints/css-hints.js
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-hints/factory-hints.js b/lib/assets/javascripts/builder/editor/editor-hints/factory-hints.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/editor-hints/factory-hints.js
rename to lib/assets/javascripts/builder/editor/editor-hints/factory-hints.js
index 6a4185b1be..0642d37ea4 100755
--- a/lib/assets/javascripts/cartodb3/editor/editor-hints/factory-hints.js
+++ b/lib/assets/javascripts/builder/editor/editor-hints/factory-hints.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
+var TableNameUtils = require('builder/helpers/table-name-utils');
var memo = {};
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-hints/sql-hints.js b/lib/assets/javascripts/builder/editor/editor-hints/sql-hints.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/editor-hints/sql-hints.js
rename to lib/assets/javascripts/builder/editor/editor-hints/sql-hints.js
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-map-view.js b/lib/assets/javascripts/builder/editor/editor-map-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/editor-map-view.js
rename to lib/assets/javascripts/builder/editor/editor-map-view.js
index ce864d679b..08bd59a5ee 100755
--- a/lib/assets/javascripts/cartodb3/editor/editor-map-view.js
+++ b/lib/assets/javascripts/builder/editor/editor-map-view.js
@@ -1,15 +1,15 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var EditorView = require('./editor-view');
var AnalysesService = require('./layers/layer-content-views/analyses/analyses-service');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
var BasemapContentView = require('./layers/basemap-content-view');
var LayerContentView = require('./layers/layer-content-view');
var EditFeatureContentView = require('./layers/edit-feature-content-view');
var WidgetsFormContentView = require('./widgets/widgets-form/widgets-form-content-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var Router = require('cartodb3/routes/router');
+var Notifier = require('builder/components/notifier/notifier');
+var Router = require('builder/routes/router');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-pane-icon.tpl b/lib/assets/javascripts/builder/editor/editor-pane-icon.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/editor-pane-icon.tpl
rename to lib/assets/javascripts/builder/editor/editor-pane-icon.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-pane.js b/lib/assets/javascripts/builder/editor/editor-pane.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/editor-pane.js
rename to lib/assets/javascripts/builder/editor/editor-pane.js
index a5dfdacfab..6b1a0a840c 100755
--- a/lib/assets/javascripts/cartodb3/editor/editor-pane.js
+++ b/lib/assets/javascripts/builder/editor/editor-pane.js
@@ -2,22 +2,22 @@ var $ = require('jquery');
var Backbone = require('backbone');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var createTextLabelsTabPaneRouted = require('cartodb3/components/tab-pane/create-text-labels-tab-pane-routed');
+var createTextLabelsTabPaneRouted = require('builder/components/tab-pane/create-text-labels-tab-pane-routed');
var Header = require('./editor-header.js');
var EditorTabPaneTemplate = require('./editor-tab-pane.tpl');
var EditorWidgetsView = require('./widgets/widgets-view');
var LayersView = require('./layers/layers-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
var ShareButtonView = require('./layers/share-button-view');
-var PublishView = require('cartodb3/components/modals/publish/publish-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
-var AppNotifications = require('cartodb3/app-notifications');
+var PublishView = require('builder/components/modals/publish/publish-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
+var AppNotifications = require('builder/app-notifications');
var zoomToData = require('./map-operations/zoom-to-data');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-pane.tpl b/lib/assets/javascripts/builder/editor/editor-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/editor-pane.tpl
rename to lib/assets/javascripts/builder/editor/editor-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-settings-pane.js b/lib/assets/javascripts/builder/editor/editor-settings-pane.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/editor-settings-pane.js
rename to lib/assets/javascripts/builder/editor/editor-settings-pane.js
index c47b1343d6..2cb2bf8dff 100644
--- a/lib/assets/javascripts/cartodb3/editor/editor-settings-pane.js
+++ b/lib/assets/javascripts/builder/editor/editor-settings-pane.js
@@ -1,11 +1,11 @@
var CoreView = require('backbone/core-view');
var OptionsView = require('./settings/preview/preview-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
var Header = require('./editor-header.js');
-var PublishView = require('cartodb3/components/modals/publish/publish-view');
+var PublishView = require('builder/components/modals/publish/publish-view');
var ShareButtonView = require('./layers/share-button-view');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-settings-view.js b/lib/assets/javascripts/builder/editor/editor-settings-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/editor-settings-view.js
rename to lib/assets/javascripts/builder/editor/editor-settings-view.js
index 53c7066e21..7fc2160693 100755
--- a/lib/assets/javascripts/cartodb3/editor/editor-settings-view.js
+++ b/lib/assets/javascripts/builder/editor/editor-settings-view.js
@@ -2,10 +2,10 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var EditorSettingsPane = require('./editor-settings-pane');
var ExportImagePane = require('./export-image-pane/export-image-pane');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
+var Notifier = require('builder/components/notifier/notifier');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
'editorModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-tab-pane.tpl b/lib/assets/javascripts/builder/editor/editor-tab-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/editor-tab-pane.tpl
rename to lib/assets/javascripts/builder/editor/editor-tab-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/editor-view.js b/lib/assets/javascripts/builder/editor/editor-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/editor-view.js
rename to lib/assets/javascripts/builder/editor/editor-view.js
index 30e862cd09..6f10e3a991 100755
--- a/lib/assets/javascripts/cartodb3/editor/editor-view.js
+++ b/lib/assets/javascripts/builder/editor/editor-view.js
@@ -2,8 +2,8 @@ var CoreView = require('backbone/core-view');
var Backbone = require('backbone');
var EditorPane = require('./editor-pane');
var ExportImagePane = require('./export-image-pane/export-image-pane');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form-model.js b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-form-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form-model.js
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-form-model.js
index cd68f8f4e1..87b5c78c13 100644
--- a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form-model.js
+++ b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-form-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userModel',
'hasGoogleBasemap'
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form-view.js b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-form-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form-view.js
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-form-view.js
index 0bb004d336..e5fc755024 100644
--- a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form-view.js
+++ b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-form-view.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./export-image-form.tpl');
-require('cartodb3/components/form-components/index');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+require('builder/components/form-components/index');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'formModel'
];
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form.tpl b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-form.tpl
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-pane.js b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-pane.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-pane.js
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-pane.js
index ee5546a138..360e7313af 100755
--- a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-pane.js
+++ b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-pane.js
@@ -6,14 +6,14 @@ var ExportImageFormView = require('./export-image-form-view.js');
var ExportImageFormModel = require('./export-image-form-model');
var ExportImageWidget = require('./export-image-widget');
var template = require('./export-image-pane.tpl');
-var Utils = require('cartodb3/helpers/utils');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var browser = require('cartodb3/helpers/browser-detect');
+var Utils = require('builder/helpers/utils');
+var Notifier = require('builder/components/notifier/notifier');
+var browser = require('builder/helpers/browser-detect');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxView = require('cartodb3/components/infobox/infobox-view');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxView = require('builder/components/infobox/infobox-view');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
var DEFAULT_EXPORT_FORMAT = 'png';
var DEFAULT_EXPORT_WIDTH = 300;
@@ -29,7 +29,7 @@ var LOGO_PATH = '/unversioned/images/carto.png';
var GMAPS_DIMENSION_LIMIT = 640;
var GMAPS_DIMENSION_LIMIT_PREMIUM = 2048;
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'canvasClassName',
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-pane.tpl b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-pane.tpl
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-widget.js b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-widget.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-widget.js
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-widget.js
index 25d98f8006..8380a7970b 100644
--- a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-widget.js
+++ b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-widget.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
var template = require('./export-image-widget.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var TRACK_CONTEXT_CLASS = 'track-ImageExport';
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-widget.tpl b/lib/assets/javascripts/builder/editor/export-image-pane/export-image-widget.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/export-image-widget.tpl
rename to lib/assets/javascripts/builder/editor/export-image-pane/export-image-widget.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/footer/footer-view.js b/lib/assets/javascripts/builder/editor/export-image-pane/footer/footer-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/footer/footer-view.js
rename to lib/assets/javascripts/builder/editor/export-image-pane/footer/footer-view.js
index b9b9e37d2c..3aff420365 100644
--- a/lib/assets/javascripts/cartodb3/editor/export-image-pane/footer/footer-view.js
+++ b/lib/assets/javascripts/builder/editor/export-image-pane/footer/footer-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./footer.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var LOADING = 'loading';
diff --git a/lib/assets/javascripts/cartodb3/editor/export-image-pane/footer/footer.tpl b/lib/assets/javascripts/builder/editor/export-image-pane/footer/footer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/export-image-pane/footer/footer.tpl
rename to lib/assets/javascripts/builder/editor/export-image-pane/footer/footer.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/feedback/feedback-button-view.js b/lib/assets/javascripts/builder/editor/feedback/feedback-button-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/editor/feedback/feedback-button-view.js
rename to lib/assets/javascripts/builder/editor/feedback/feedback-button-view.js
index b4136a7755..e12d7f19c0 100755
--- a/lib/assets/javascripts/cartodb3/editor/feedback/feedback-button-view.js
+++ b/lib/assets/javascripts/builder/editor/feedback/feedback-button-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
-var ViewFactory = require('cartodb3/components/view-factory');
+var ViewFactory = require('builder/components/view-factory');
var template = require('./feedback-button.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var feedbackModalTemplate = require('./feedback-modal.tpl');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/feedback/feedback-button.tpl b/lib/assets/javascripts/builder/editor/feedback/feedback-button.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/feedback/feedback-button.tpl
rename to lib/assets/javascripts/builder/editor/feedback/feedback-button.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/feedback/feedback-modal.tpl b/lib/assets/javascripts/builder/editor/feedback/feedback-modal.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/feedback/feedback-modal.tpl
rename to lib/assets/javascripts/builder/editor/feedback/feedback-modal.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/inline-editor.tpl b/lib/assets/javascripts/builder/editor/inline-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/inline-editor.tpl
rename to lib/assets/javascripts/builder/editor/inline-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/analyses-tooltip-error.js b/lib/assets/javascripts/builder/editor/layers/analysis-views/analyses-tooltip-error.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/analyses-tooltip-error.js
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/analyses-tooltip-error.js
index 663812f27d..c8eef4c6f1 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/analyses-tooltip-error.js
+++ b/lib/assets/javascripts/builder/editor/layers/analysis-views/analyses-tooltip-error.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
var cdb = require('cartodb.js');
var CoreView = require('backbone/core-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view.js');
-var NotificationErrorMessageHandler = require('cartodb3/editor/layers/notification-error-message-handler');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view.js');
+var NotificationErrorMessageHandler = require('builder/editor/layers/notification-error-message-handler');
module.exports = CoreView.extend({
initialize: function (opts) {
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/analysis-notifications.js b/lib/assets/javascripts/builder/editor/layers/analysis-views/analysis-notifications.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/analysis-notifications.js
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/analysis-notifications.js
index b7d3c25288..aa47cea77e 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/analysis-notifications.js
+++ b/lib/assets/javascripts/builder/editor/layers/analysis-views/analysis-notifications.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var NotificationErrorMessageHandler = require('cartodb3/editor/layers/notification-error-message-handler');
+var Notifier = require('builder/components/notifier/notifier');
+var NotificationErrorMessageHandler = require('builder/editor/layers/notification-error-message-handler');
var DEFAULT_DELAY = Notifier.DEFAULT_DELAY;
var STATUS_READY = 'ready';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/composite-layer-analysis-view.js b/lib/assets/javascripts/builder/editor/layers/analysis-views/composite-layer-analysis-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/composite-layer-analysis-view.js
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/composite-layer-analysis-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/composite-layer-analysis-view.tpl b/lib/assets/javascripts/builder/editor/layers/analysis-views/composite-layer-analysis-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/composite-layer-analysis-view.tpl
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/composite-layer-analysis-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/default-layer-analysis-view.js b/lib/assets/javascripts/builder/editor/layers/analysis-views/default-layer-analysis-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/default-layer-analysis-view.js
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/default-layer-analysis-view.js
index 4e871d2361..7de42761b6 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/default-layer-analysis-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/analysis-views/default-layer-analysis-view.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
-var layerColors = require('cartodb3/data/layer-colors');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
+var layerColors = require('builder/data/layer-colors');
var template = require('./default-layer-analysis-view.tpl');
-var Analyses = require('cartodb3/data/analyses');
+var Analyses = require('builder/data/analyses');
var AnalysisTooltip = require('./analyses-tooltip-error');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
/**
* View for an analysis node with a single input
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/default-layer-analysis-view.tpl b/lib/assets/javascripts/builder/editor/layers/analysis-views/default-layer-analysis-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/default-layer-analysis-view.tpl
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/default-layer-analysis-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/ref-layer-analysis-view.js b/lib/assets/javascripts/builder/editor/layers/analysis-views/ref-layer-analysis-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/ref-layer-analysis-view.js
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/ref-layer-analysis-view.js
index 6c88048763..1fc5ab0578 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/ref-layer-analysis-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/analysis-views/ref-layer-analysis-view.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var analyses = require('cartodb3/data/analyses');
+var analyses = require('builder/data/analyses');
var template = require('./ref-layer-analysis-view.tpl');
/**
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/ref-layer-analysis-view.tpl b/lib/assets/javascripts/builder/editor/layers/analysis-views/ref-layer-analysis-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/ref-layer-analysis-view.tpl
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/ref-layer-analysis-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/source-layer-analysis-view.js b/lib/assets/javascripts/builder/editor/layers/analysis-views/source-layer-analysis-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/source-layer-analysis-view.js
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/source-layer-analysis-view.js
index 49e00ff6c0..75f5ce1cf8 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/source-layer-analysis-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/analysis-views/source-layer-analysis-view.js
@@ -3,7 +3,7 @@ var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./source-layer-analysis-view.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
var moment = require('moment');
/**
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/analysis-views/source-layer-analysis-view.tpl b/lib/assets/javascripts/builder/editor/layers/analysis-views/source-layer-analysis-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/analysis-views/source-layer-analysis-view.tpl
rename to lib/assets/javascripts/builder/editor/layers/analysis-views/source-layer-analysis-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-view.js
index 74c247c134..8a055581fe 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-view.js
@@ -1,16 +1,16 @@
var Backbone = require('backbone');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
var template = require('./basemap-content.tpl');
var BasemapHeaderView = require('./basemap-content-views/basemap-header-view');
var BasemapModelFactory = require('./basemap-content-views/basemap-model-factory');
var BasemapsCollection = require('./basemap-content-views/basemaps-collection');
var BasemapInnerView = require('./basemap-content-views/basemap-inner-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var Router = require('cartodb3/routes/router');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var Notifier = require('builder/components/notifier/notifier');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var Router = require('builder/routes/router');
var NOTIFICATION_ID = 'basemapNotification';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-carousel.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-carousel.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-carousel.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-carousel.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-categories-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-categories-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-categories-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-categories-view.js
index fa0b76d013..3814df9af3 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-categories-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-categories-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./basemap-categories.tpl');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
+var CarouselFormView = require('builder/components/carousel-form-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-categories.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-categories.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-categories.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-categories.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-form-model.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-form-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-form-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-form.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-header-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-header-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-header-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-header-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-header.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-header.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-carto.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-carto.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-carto.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-carto.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-color.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-color.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-color.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-color.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-custom.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-custom.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-custom.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-custom.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-gmaps.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-gmaps.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-gmaps.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-gmaps.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-here.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-here.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-here.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-here.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-mapbox.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-mapbox.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-mapbox.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-mapbox.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-nasa.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-nasa.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-nasa.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-nasa.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-stamen.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-stamen.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-stamen.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-stamen.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-tilejson.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-tilejson.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-tilejson.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-tilejson.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-wms.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-wms.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-icons/basemap-wms.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-icons/basemap-wms.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-inner-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-inner-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-inner-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-inner-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-inner.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-inner.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-inner.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-inner.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-model-factory.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-model-factory.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-model-factory.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-model-factory.js
index 38652b6175..fe6f7a0bb0 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-model-factory.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-model-factory.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var basemapProvidersAndCategories = require('cartodb3/data/basemap-providers-and-categories');
-var mosaicThumbnail = require('cartodb3/components/mosaic/mosaic-thumbnail.tpl');
+var basemapProvidersAndCategories = require('builder/data/basemap-providers-and-categories');
+var mosaicThumbnail = require('builder/components/mosaic/mosaic-thumbnail.tpl');
var BasemapModel = require('./basemap-model');
var DEFAULT_SUBDOMAIN = 'a';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-model.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-model.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-add-item-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-add-item-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-add-item-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-add-item-view.js
index 94414f2f85..1bb0d90b0b 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-add-item-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-add-item-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
-var template = require('cartodb3/components/mosaic/mosaic-item.tpl');
-var AddBasemapView = require('cartodb3/components/modals/add-basemap/add-basemap-view');
-var AddBasemapModel = require('cartodb3/components/modals/add-basemap/add-basemap-model');
+var template = require('builder/components/mosaic/mosaic-item.tpl');
+var AddBasemapView = require('builder/components/modals/add-basemap/add-basemap-view');
+var AddBasemapModel = require('builder/components/modals/add-basemap/add-basemap-model');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-form-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-form-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-form-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-form-view.js
index 99a31b8d1c..b3bdc37e26 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-form-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-form-view.js
@@ -1,6 +1,6 @@
var BasemapMosaicView = require('./basemap-mosaic-view');
var BasemapMosaicModel = require('./basemap-mosaic-model');
-var MosaicFormView = require('cartodb3/components/mosaic-form-view');
+var MosaicFormView = require('builder/components/mosaic-form-view');
/**
* Mosaic form view
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-item-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-item-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-item-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-item-view.js
index 640fbe3f46..7975236493 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-item-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-item-view.js
@@ -1,7 +1,7 @@
/* global Image */
-var template = require('cartodb3/components/mosaic/mosaic-item.tpl');
-var MosaicItemView = require('cartodb3/components/mosaic/mosaic-item-view');
+var template = require('builder/components/mosaic/mosaic-item.tpl');
+var MosaicItemView = require('builder/components/mosaic/mosaic-item-view');
var BasemapMosaicRemoveView = require('./basemap-mosaic-remove-view');
var DEFAULT_SUBDOMAIN = 'a';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-model.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-model.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-remove-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-remove-view.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-remove-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-remove-view.js
index 1d65afcc8c..3a425d9362 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-remove-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-remove-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var template = require('./basemap-mosaic-remove.tpl');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-remove.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-remove.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-remove.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-remove.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-view.js
index 31e8a74ced..1e2b7dd5a2 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic-view.js
@@ -1,6 +1,6 @@
-var template = require('cartodb3/components/mosaic/mosaic.tpl');
-var MosaicView = require('cartodb3/components/mosaic/mosaic-view');
-var MosaicItemModel = require('cartodb3/components/mosaic/mosaic-item-model');
+var template = require('builder/components/mosaic/mosaic.tpl');
+var MosaicView = require('builder/components/mosaic/mosaic-view');
+var MosaicItemModel = require('builder/components/mosaic/mosaic-item-model');
var BasemapMosaicItemView = require('./basemap-mosaic-item-view');
var MosaicAddItemView = require('./basemap-mosaic-add-item-view');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-mosaic.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-mosaic.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-select-view.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-select-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-select-view.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-select-view.js
index 435a590769..9e66f41598 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-select-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-select-view.js
@@ -1,10 +1,10 @@
var CoreView = require('backbone/core-view');
var template = require('./basemap-select.tpl');
-var MosaicFormView = require('cartodb3/components/mosaic-form-view');
+var MosaicFormView = require('builder/components/mosaic-form-view');
var BasemapFormView = require('./basemap-form-view');
-var MosaicCollection = require('cartodb3/components/mosaic/mosaic-collection');
+var MosaicCollection = require('builder/components/mosaic/mosaic-collection');
var BasemapMosaicFormView = require('./basemap-mosaic-form-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'layerDefinitionsCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-select.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-select.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemap-select.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemap-select.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemaps-collection.js b/lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemaps-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content-views/basemaps-collection.js
rename to lib/assets/javascripts/builder/editor/layers/basemap-content-views/basemaps-collection.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/basemap-content.tpl b/lib/assets/javascripts/builder/editor/layers/basemap-content.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/basemap-content.tpl
rename to lib/assets/javascripts/builder/editor/layers/basemap-content.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/change-view-buttons.tpl b/lib/assets/javascripts/builder/editor/layers/change-view-buttons.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/change-view-buttons.tpl
rename to lib/assets/javascripts/builder/editor/layers/change-view-buttons.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/delete-layer-confirmation.tpl b/lib/assets/javascripts/builder/editor/layers/delete-layer-confirmation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/delete-layer-confirmation.tpl
rename to lib/assets/javascripts/builder/editor/layers/delete-layer-confirmation.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-view.js
index 183b1fc6eb..6c45372742 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-view.js
@@ -5,16 +5,16 @@ var template = require('./edit-feature-content.tpl');
var EditFeatureActionView = require('./edit-feature-content-views/edit-feature-action-view');
var EditFeatureControlView = require('./edit-feature-content-views/edit-feature-control-view');
var EditFeatureHeaderView = require('./edit-feature-content-views/edit-feature-header-view');
-var VisTableModel = require('cartodb3/data/visualization-table-model');
+var VisTableModel = require('builder/data/visualization-table-model');
var EditFeatureInnerView = require('./edit-feature-content-views/edit-feature-inner-view');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var Notifier = require('builder/components/notifier/notifier');
var EditFeatureGeometryFormModel = require('./edit-feature-content-views/edit-feature-geometry-form-model');
var EditFeatureGeometryPointFormModel = require('./edit-feature-content-views/edit-feature-geometry-point-form-model');
var EditFeatureAttributesFormModel = require('./edit-feature-content-views/edit-feature-attributes-form-model');
-var StyleHelper = require('cartodb3/helpers/style');
-var Router = require('cartodb3/routes/router');
+var StyleHelper = require('builder/helpers/style');
+var Router = require('builder/routes/router');
var NOTIFICATION_ID = 'editFeatureNotification';
var NOTIFICATION_ERROR_TEMPLATE = _.template("
<%- title %>");
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/delete-feature-confirmation.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/delete-feature-confirmation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/delete-feature-confirmation.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/delete-feature-confirmation.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-action-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-action-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-action.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-action.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.js
index c8f85e56f2..bfe916a076 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var ColumnRowData = require('cartodb3/data/column-row-data');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var ColumnRowData = require('builder/data/column-row-data');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var FIELDTYPE_TO_FORMTYPE = {
string: 'Text',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-control-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-control-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-control.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-control.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-point-form-model.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-point-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-point-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-point-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header-view.js
index 4f53c25f8b..6bea377f1b 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header-view.js
@@ -1,8 +1,8 @@
var CoreView = require('backbone/core-view');
var template = require('./edit-feature-header.tpl');
-var ContextMenuFactory = require('cartodb3/components/context-menu-factory-view');
-var ConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var ContextMenuFactory = require('builder/components/context-menu-factory-view');
+var ConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var templateConfirmation = require('./delete-feature-confirmation.tpl');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-inner-view.js b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-inner-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content-views/edit-feature-inner-view.js
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-inner-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-feature-content.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-feature-content.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/edit-overlay.tpl b/lib/assets/javascripts/builder/editor/layers/edit-overlay.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/edit-overlay.tpl
rename to lib/assets/javascripts/builder/editor/layers/edit-overlay.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/inline-editor.tpl b/lib/assets/javascripts/builder/editor/layers/inline-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/inline-editor.tpl
rename to lib/assets/javascripts/builder/editor/layers/inline-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-analyses-view.js b/lib/assets/javascripts/builder/editor/layers/layer-analyses-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-analyses-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-analyses-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-draggable-view.js b/lib/assets/javascripts/builder/editor/layers/layer-analysis-draggable-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-draggable-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-analysis-draggable-view.js
index 34505360af..5690bf41cc 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-draggable-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-analysis-draggable-view.js
@@ -1,8 +1,8 @@
require('jquery-ui');
var CoreView = require('backbone/core-view');
var template = require('./layer-analysis-draggable.tpl');
-var analyses = require('cartodb3/data/analyses');
-var layerColors = require('cartodb3/data/layer-colors');
+var analyses = require('builder/data/analyses');
+var layerColors = require('builder/data/layer-colors');
/**
* Attach draggable behavior to an analysis node
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-draggable.tpl b/lib/assets/javascripts/builder/editor/layers/layer-analysis-draggable.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-draggable.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-analysis-draggable.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-view-factory.js b/lib/assets/javascripts/builder/editor/layers/layer-analysis-view-factory.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-analysis-view-factory.js
rename to lib/assets/javascripts/builder/editor/layers/layer-analysis-view-factory.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-view.js
index c8caea1c9e..c5e56370eb 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-view.js
@@ -2,29 +2,29 @@ var _ = require('underscore');
var $ = require('jquery');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var createTextLabelsTabPaneRouted = require('cartodb3/components/tab-pane/create-text-labels-tab-pane-routed');
+var createTextLabelsTabPaneRouted = require('builder/components/tab-pane/create-text-labels-tab-pane-routed');
var TabPaneTemplate = require('./layer-tab-pane.tpl');
var LayerHeaderView = require('./layer-header-view');
var LayerContentAnalysesView = require('./layer-content-views/analyses/analyses-view');
var LayerTabPanePlaceholderView = require('./layer-tab-pane-placeholder-view');
-var StyleView = require('cartodb3/editor/style/style-view');
+var StyleView = require('builder/editor/style/style-view');
var InfowindowsView = require('./layer-content-views/infowindow/infowindows-view');
-var TablesCollection = require('cartodb3/data/tables-collection');
+var TablesCollection = require('builder/data/tables-collection');
var AnalysisSourceOptionsModel = require('./layer-content-views/analyses/analysis-source-options-model');
var AnalysisFormsCollection = require('./layer-content-views/analyses/analysis-forms-collection');
-var TableManager = require('cartodb3/components/table/table-manager');
+var TableManager = require('builder/components/table/table-manager');
var changeViewButtons = require('./change-view-buttons.tpl');
var editOverlay = require('./edit-overlay.tpl');
var DataView = require('./layer-content-views/data/data-view');
var LegendsView = require('./layer-content-views/legend/legends-view');
-var FeatureDefinitionModel = require('cartodb3/data/feature-definition-model');
+var FeatureDefinitionModel = require('builder/data/feature-definition-model');
var AnalysesService = require('./layer-content-views/analyses/analyses-service');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var Toggler = require('cartodb3/components/toggler/toggler-view');
-var Router = require('cartodb3/routes/router');
-var fetchAllQueryObjectsIfNecessary = require('cartodb3/helpers/fetch-all-query-objects');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var Toggler = require('builder/components/toggler/toggler-view');
+var Router = require('builder/routes/router');
+var fetchAllQueryObjectsIfNecessary = require('builder/helpers/fetch-all-query-objects');
+var LayerContentModel = require('builder/data/layer-content-model');
var TABS = {
data: 'data',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-content-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-content-view.js
similarity index 82%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-content-view.js
index 78dea83970..5bdb6d3124 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-content-view.js
@@ -1,18 +1,18 @@
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var ViewFactory = require('cartodb3/components/view-factory');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var analysisPlaceholderTemplate = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl');
-var analysisSQLErrorTemplate = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl');
-var AnalysisFormView = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-view');
-var AnalysesWorkflowView = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-view');
-var AnalysisControlsView = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-controls-view');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var ViewFactory = require('builder/components/view-factory');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var analysisPlaceholderTemplate = require('builder/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl');
+var analysisSQLErrorTemplate = require('builder/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl');
+var AnalysisFormView = require('builder/editor/layers/layer-content-views/analyses/analysis-form-view');
+var AnalysesWorkflowView = require('builder/editor/layers/layer-content-views/analyses/analyses-workflow-view');
+var AnalysisControlsView = require('builder/editor/layers/layer-content-views/analyses/analysis-controls-view');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
var AnalysesQuotaInfo = require('./analyses-quota/analyses-quota-info');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
-var Router = require('cartodb3/routes/router');
-var utils = require('cartodb3/helpers/utils');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
+var Router = require('builder/routes/router');
+var utils = require('builder/helpers/utils');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough.js
index 6ee2fc388d..46859376b1 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var errorParse = require('cartodb3/helpers/error-parser');
+var errorParse = require('builder/helpers/error-parser');
var ENOUGH_QUOTA_QUERY = _.template("select cdb_dataservices_client.cdb_enough_quota('<%= analysis %>', <%= rows %>);");
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input.js
index 881a68e65a..d1d2776819 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var $ = require('jquery');
var cdb = require('cartodb.js');
-var errorParse = require('cartodb3/helpers/error-parser');
+var errorParse = require('builder/helpers/error-parser');
var ESTIMATION_QUOTA_QUERY = _.template('SELECT CDB_EstimateRowCount($$<%= query %>;$$) AS row_count;');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info.js
index 08ae5d1762..eb0c669fe4 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
var cdb = require('cartodb.js');
-var errorParse = require('cartodb3/helpers/error-parser');
+var errorParse = require('builder/helpers/error-parser');
var SERVICE_QUOTA_QUERY = 'select * from cdb_dataservices_client.cdb_service_quota_info();';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter.js
index e2b18d794d..d2f5dd445d 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var AnalysesQuotaOptions = require('./analyses-quota-options');
var CONTACT_LINK_TEMPLATE = _.template("
<%- contact %>");
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-provider.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-provider.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-provider.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-provider.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-service.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-service.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-service.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-service.js
index 65aad91d00..1789ddb9ff 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-service.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-service.js
@@ -1,8 +1,8 @@
// Make common analyses actions available whin editor context
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var AddAnalysisView = require('cartodb3/components/modals/add-analysis/add-analysis-view');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var AddAnalysisView = require('builder/components/modals/add-analysis/add-analysis-view');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
var REQUIRED_OPTS = [
'onboardings',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-view.js
similarity index 85%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-view.js
index a69c8e4236..eb94de2671 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-view.js
@@ -1,15 +1,15 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
var panelTemplate = require('./panel-with-options.tpl');
var AnalysesContentView = require('./analyses-content-view');
-var OnboardingLauncher = require('cartodb3/components/onboardings/generic/generic-onboarding-launcher');
-var OnboardingView = require('cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view');
-var layerOnboardingKey = require('cartodb3/components/onboardings/layers/layer-onboarding-key');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var OnboardingLauncher = require('builder/components/onboardings/generic/generic-onboarding-launcher');
+var OnboardingView = require('builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view');
+var layerOnboardingKey = require('builder/components/onboardings/layers/layer-onboarding-key');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-item-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-item-view.js
similarity index 85%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-item-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-item-view.js
index 19ac282891..f1976983ed 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-item-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-item-view.js
@@ -1,11 +1,11 @@
var CoreView = require('backbone/core-view');
var template = require('./analyses-workflow-item.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var Analyses = require('cartodb3/data/analyses');
-var NotificationErrorMessageHandler = require('cartodb3/editor/layers/notification-error-message-handler');
-var nodeIds = require('cartodb3/value-objects/analysis-node-ids');
-var layerColors = require('cartodb3/data/layer-colors');
-var Router = require('cartodb3/routes/router');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var Analyses = require('builder/data/analyses');
+var NotificationErrorMessageHandler = require('builder/editor/layers/notification-error-message-handler');
+var nodeIds = require('builder/value-objects/analysis-node-ids');
+var layerColors = require('builder/data/layer-colors');
+var Router = require('builder/routes/router');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-item.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-item.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-list-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-list-view.js
similarity index 87%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-list-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-list-view.js
index 69c3a331cb..8c394c87be 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-list-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-list-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
var AnalysesWorkflowItemView = require('./analyses-workflow-item-view');
var template = require('./analyses-workflow-list.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var utils = require('cartodb3/helpers/utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var utils = require('builder/helpers/utils');
var REQUIRED_OPTS = [
'analysisDefinitionNodesCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-list.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-list.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-view.js
index 0a418fe7a2..38f8c8020d 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analyses-workflow-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var AnalysesWorkflowListView = require('./analyses-workflow-list-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'analysisDefinitionNodesCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-buttons-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-buttons-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-buttons-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-buttons-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-buttons.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-buttons.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-buttons.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-buttons.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-controls-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-controls-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-controls-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-controls-view.js
index e1cb7a95a3..9d09b99ac2 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-controls-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-controls-view.js
@@ -1,16 +1,16 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var Utils = require('cartodb3/helpers/utils');
-var InfoboxFactory = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
+var Utils = require('builder/helpers/utils');
+var InfoboxFactory = require('builder/components/infobox/infobox-factory');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
var AnalysesQuotaPresenter = require('./analyses-quota/analyses-quota-presenter');
var AnalysesQuotaOptions = require('./analyses-quota/analyses-quota-options');
var AnalysesQuotaProvider = require('./analyses-quota/analyses-quota-provider');
var AnalysesQuotaEstimation = require('./analyses-quota/analyses-quota-estimation-input');
var AnalysesQuotaEnough = require('./analyses-quota/analyses-quota-enough');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var AnalysisButtonsView = require('./analysis-buttons-view');
var AnalysisQuotaView = require('./analysis-quota-view');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model.js
index 93187e9a95..978cbd65ee 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./aggregate-intersection-form.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var AGGREGATE_FORMAT_FIELDS_NAMES = [
'type',
'aggregate_column',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/aggregate-intersection-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-buffer.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-buffer.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-buffer.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-buffer.js
index 7f852f09bc..6cb557e7e5 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-buffer.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-buffer.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var DistanceConverter = require('cartodb3/value-objects/distance-converter');
+var DistanceConverter = require('builder/value-objects/distance-converter');
var DEFAULT_DISTANCE = 'meters';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model.js
index c16ed4bcac..55bf4a8a10 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./area-of-influence-form.tpl');
-var DistanceConverter = require('cartodb3/value-objects/distance-converter');
+var DistanceConverter = require('builder/value-objects/distance-converter');
var AREA_OF_INFLUENCE_TYPES = require('./area-of-influence-types');
var TYPE_TO_META_MAP = {};
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-trade-area.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-trade-area.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-trade-area.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-trade-area.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/available-functions.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/available-functions.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/available-functions.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/available-functions.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model.js
index e41a17ca98..79bd06f784 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
+var camshaftReference = require('builder/data/camshaft-reference');
/**
* Base model for all analysis form models.
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model.js
index df2372228b..2793eb3297 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./centroid-form.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var FORMAT_FIELD_NAMES = 'category_column,aggregation,aggregation_column,weight_column';
var PARAMETERS_DATA_FIELDS = 'source,category,weight';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model.js
index 1611e9139e..4a2a273614 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model.js
@@ -1,5 +1,5 @@
var BaseAnalysisFormModel = require('./base-analysis-form-model');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var template = require('./closest-form.tpl');
var MAX_RESPONSES = 32;
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model.js
index 5d2a30f2f0..c0e3bcbd98 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./connect-with-lines.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var CONNECT_WITH_LINES = require('./connect-with-lines-types');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-types.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines-types.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-sequential.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-sequential.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-sequential.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-sequential.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-source-to-target.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-source-to-target.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-source-to-target.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-source-to-target.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-to-single-point.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-to-single-point.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-to-single-point.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/connect-with-lines/line-to-single-point.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model.js
index 9e3dce99c8..4a2b677bb8 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model.js
@@ -1,7 +1,7 @@
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./data-observatory-measure.tpl');
-var DataObservartoryMetadata = require('cartodb3/editor/layers/layer-content-views/analyses/data-observatory-metadata');
-var Utils = require('cartodb3/helpers/utils');
+var DataObservartoryMetadata = require('builder/editor/layers/layer-content-views/analyses/data-observatory-metadata');
+var Utils = require('builder/helpers/utils');
module.exports = BaseAnalysisFormModel.extend({
initialize: function () {
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list-item.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list-item.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model.js
index a6a1e83a4d..7ef04e6b48 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model.js
@@ -4,8 +4,8 @@ var template = require('./data-observatory-multiple-measure.tpl');
var templateList = require('./data-observatory-multiple-measure-list.tpl');
var templateItem = require('./data-observatory-multiple-measure-list-item.tpl');
var NestedMeasurement = require('./data-observatory-multiple-nested-measure-model');
-var DataObservatoryRegions = require('cartodb3/data/data-observatory/regions-collection');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
+var DataObservatoryRegions = require('builder/data/data-observatory/regions-collection');
+var camshaftReference = require('builder/data/camshaft-reference');
var itemRegionListTemplate = require('./data-observatory-multiple-region-list-item.tpl');
var DENOMINATORS_BLACKLIST = ['', 'area'];
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model.js
index f02a655377..ec2043b8b5 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model.js
@@ -1,12 +1,12 @@
var $ = require('jquery');
var Backbone = require('backbone');
var _ = require('underscore');
-var DataObservatoryNormalize = require('cartodb3/data/data-observatory/normalize-collection');
-var DataObservatoryTimespan = require('cartodb3/data/data-observatory/timespan-collection');
-var DataObservatoryBoundaries = require('cartodb3/data/data-observatory/boundaries-collection');
-var MeasurementModel = require('cartodb3/data/data-observatory/measurement-model');
-var DataObservatoryColumnName = require('cartodb3/data/data-observatory/column-name');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var DataObservatoryNormalize = require('builder/data/data-observatory/normalize-collection');
+var DataObservatoryTimespan = require('builder/data/data-observatory/timespan-collection');
+var DataObservatoryBoundaries = require('builder/data/data-observatory/boundaries-collection');
+var MeasurementModel = require('builder/data/data-observatory/measurement-model');
+var DataObservatoryColumnName = require('builder/data/data-observatory/column-name');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'regions',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-region-list-item.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-region-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-region-list-item.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-region-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model.js
index 09fd5e80c6..d8169e498f 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
var cdb = require('cartodb.js');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var availableFunctionsQuery = require('./available-functions.tpl');
var template = require('./deprecated-sql-function.tpl');
-var track = require('cartodb3/helpers/errorTracking.js');
+var track = require('builder/helpers/errorTracking.js');
var REQUIRED_OPTS = [
'configModel'
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model.js
index 7c0ca645ac..70a469b29e 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
+var camshaftReference = require('builder/data/camshaft-reference');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var ARRAY_SPLIT_COMBO = ',';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.js
index 10a17b36b8..29faf70b6c 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.js
@@ -1,6 +1,6 @@
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./filter-by-node-column.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
/**
* Form model for a centroid and weighted-centroid analysis
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-category-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-category-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-category-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-category-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model.js
index 84a1f3eeb9..2bbc293c96 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./filter-form.tpl');
-var ColumnData = require('cartodb3/editor/layers/layer-content-views/analyses/column-data');
-var ColumnRowData = require('cartodb3/data/column-row-data');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnData = require('builder/editor/layers/layer-content-views/analyses/column-data');
+var ColumnRowData = require('builder/data/column-row-data');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var FILTER_TYPES = require('./filter-types');
var TYPE_TO_META_MAP = {};
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model.js
index 4ac5f1a54f..ee15611d2a 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./filter-intersection-form.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
/**
* Filter points in polygon model
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-intersection-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-range-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-range-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-range-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-range-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-types.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-types.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-admin-region-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-admin-region-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-admin-region-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-admin-region-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-city-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-city-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-city-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-city-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-country-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-country-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-country-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-country-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js
index c940049ea5..3ca677144a 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./georeference-form.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var GEOREFERENCE_TYPES = require('./georeference-types');
var TYPE_TO_META_MAP = {};
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-ip-address-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-ip-address-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-ip-address-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-ip-address-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-long-lat-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-long-lat-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-long-lat-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-long-lat-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-placeholder.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-placeholder.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-placeholder.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-placeholder.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-postal-code-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-postal-code-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-postal-code-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-postal-code-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-street-address-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-street-address-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-street-address-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-street-address-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-types.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-types.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model.js
index 7d10764ee6..18de27012a 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./group-points.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var ANALYSES_TYPES = require('./group-points-types');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-types.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-types.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-box.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-box.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-box.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-box.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-circle.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-circle.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-circle.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/bounding-circle.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/concave-hull.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/concave-hull.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/concave-hull.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/concave-hull.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/convex-hull.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/convex-hull.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/convex-hull.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points/convex-hull.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/kmeans-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js
index 7e42326018..91d9148214 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./merge-form.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
var MERGE_FIELDS = 'join_operator,left_source_column,right_source_column,source_geometry_selector,left_source_columns,right_source_columns';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model.js
index 885e591d59..fd7b001195 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form-model.js
@@ -1,6 +1,6 @@
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./moran-form.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
/**
* Form model for a moran analysis
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/moran-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/sampling-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model.js
index 7842d7c42a..e62e8edf92 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend-model.js
@@ -1,6 +1,6 @@
var BaseAnalysisFormModel = require('./base-analysis-form-model');
var template = require('./spatial-markov-trend.tpl');
-var ColumnOptions = require('cartodb3/editor/layers/layer-content-views/analyses/column-options');
+var ColumnOptions = require('builder/editor/layers/layer-content-views/analyses/column-options');
module.exports = BaseAnalysisFormModel.extend({
initialize: function () {
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/spatial-markov-trend.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-view.js
index 9567f0b608..ad829e1865 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-view.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var TableStats = require('cartodb3/components/modals/add-widgets/tablestats');
-var Utils = require('cartodb3/helpers/utils');
+var TableStats = require('builder/components/modals/add-widgets/tablestats');
+var Utils = require('builder/helpers/utils');
var linkTemplate = require('./more-info-link.tpl');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
var CHECK_FORM_VALIDATION_TOO = {validate: true};
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-forms-collection.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-forms-collection.js
index 78009ec77c..cda9cc3644 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-forms-collection.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var Analyses = require('cartodb3/data/analyses');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
+var Analyses = require('builder/data/analyses');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
module.exports = Backbone.Collection.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-quota-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-quota-view.js
similarity index 80%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-quota-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-quota-view.js
index 38aec74808..662d5e8691 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-quota-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-quota-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var InfoboxView = require('cartodb3/components/infobox/infobox-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var InfoboxView = require('builder/components/infobox/infobox-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'infoboxModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-source-options-model.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-source-options-model.js
index 5d1a2c0579..852e047c11 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-source-options-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var queueAsync = require('queue-async');
var Backbone = require('backbone');
-var analyses = require('cartodb3/data/analyses');
+var analyses = require('builder/data/analyses');
/**
* Analysis source options are not trivial to get and requires some coordination of events.
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/column-data.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/column-data.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/column-data.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/column-data.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/column-options.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/column-options.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/column-options.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/column-options.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/data-observatory-metadata.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/data-observatory-metadata.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/data-observatory-metadata.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/data-observatory-metadata.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/more-info-link.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/more-info-link.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/more-info-link.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/more-info-link.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/panel-with-options.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/panel-with-options.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/analyses/panel-with-options.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/panel-with-options.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/code-mirror-error.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/code-mirror-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/code-mirror-error.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/code-mirror-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/create-tuples-items.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/create-tuples-items.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/create-tuples-items.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/create-tuples-items.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-columns-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-columns-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-columns-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-columns-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-error.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-error.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-nogeometry.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-nogeometry.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-nogeometry.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-nogeometry.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-not-ready.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-not-ready.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-not-ready.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-not-ready.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-view.js
index a1b747625d..e25e46d7ed 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-content-view.js
@@ -5,12 +5,12 @@ var StatView = require('./stat-view');
var dataNotReadyTemplate = require('./data-content-not-ready.tpl');
var dataErrorTemplate = require('./data-content-error.tpl');
var dataNoGeometryTemplate = require('./data-content-nogeometry.tpl');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
-var addFeaturePointIcon = require('cartodb3/components/icon/templates/add-feature-point.tpl');
-var addFeatureLineIcon = require('cartodb3/components/icon/templates/add-feature-line.tpl');
-var addFeaturePolygonIcon = require('cartodb3/components/icon/templates/add-feature-polygon.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var STATES = require('cartodb3/data/query-base-status');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
+var addFeaturePointIcon = require('builder/components/icon/templates/add-feature-point.tpl');
+var addFeatureLineIcon = require('builder/components/icon/templates/add-feature-line.tpl');
+var addFeaturePolygonIcon = require('builder/components/icon/templates/add-feature-polygon.tpl');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var STATES = require('builder/data/query-base-status');
var REQUIRED_OPTS = [
'columnsModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-sql-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-sql-model.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-sql-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-sql-model.js
index 05472a669b..64510b22ae 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-sql-model.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-sql-model.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var UndoManager = require('cartodb3/data/undo-manager.js');
+var UndoManager = require('builder/data/undo-manager.js');
/**
* Data SQL Undo-redo model
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-sql-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-sql-view.js
similarity index 86%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-sql-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-sql-view.js
index a5387087a3..9e17d83156 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-sql-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-sql-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
var ErrorTemplate = require('./code-mirror-error.tpl');
-var FactoryHints = require('cartodb3/editor/editor-hints/factory-hints');
-var SQLHints = require('cartodb3/editor/editor-hints/sql-hints');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var FactoryHints = require('builder/editor/editor-hints/factory-hints');
+var SQLHints = require('builder/editor/editor-hints/sql-hints');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'layerDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-view.js
similarity index 90%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-view.js
index 0114b9cc8a..deb539d3a2 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/data-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/data-view.js
@@ -1,27 +1,27 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var DatasetBaseView = require('cartodb3/components/dataset/dataset-base-view');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var DatasetBaseView = require('builder/components/dataset/dataset-base-view');
var DataContentView = require('./data-content-view');
var DataSQLView = require('./data-sql-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var Toggler = require('cartodb3/components/toggler/toggler-view');
-var UndoButtons = require('cartodb3/components/undo-redo/undo-redo-view');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
-var TableStats = require('cartodb3/components/modals/add-widgets/tablestats');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var Toggler = require('builder/components/toggler/toggler-view');
+var UndoButtons = require('builder/components/undo-redo/undo-redo-view');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
+var TableStats = require('builder/components/modals/add-widgets/tablestats');
var DataColumnsModel = require('./data-columns-model');
-var SQLNotifications = require('cartodb3/sql-notifications');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var OnboardingLauncher = require('cartodb3/components/onboardings/generic/generic-onboarding-launcher');
-var OnboardingView = require('cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view');
-var layerOnboardingKey = require('cartodb3/components/onboardings/layers/layer-onboarding-key');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var LocaleHelper = require('cartodb3/helpers/locale');
+var SQLNotifications = require('builder/sql-notifications');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var OnboardingLauncher = require('builder/components/onboardings/generic/generic-onboarding-launcher');
+var OnboardingView = require('builder/components/onboardings/layers/data-onboarding/data-onboarding-view');
+var layerOnboardingKey = require('builder/components/onboardings/layers/layer-onboarding-key');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var LocaleHelper = require('builder/helpers/locale');
var REQUIRED_OPTS = [
'widgetDefinitionsCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-category.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-category.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-category.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-category.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-formula.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-formula.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-formula.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-formula.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-histogram.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-histogram.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-histogram.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-histogram.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-view.js
index 62b8baf4cb..c99b33bf06 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat-view.js
@@ -1,12 +1,12 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./stat.tpl');
-var utils = require('cartodb3/helpers/utils');
+var utils = require('builder/helpers/utils');
var templateCategory = require('./stat-category.tpl');
var templateHistogram = require('./stat-histogram.tpl');
var templateFormula = require('./stat-formula.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var Router = require('cartodb3/routes/router');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var Router = require('builder/routes/router');
module.exports = CoreView.extend({
module: 'editor/layers/layer-content-views/data/stat-view',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/stat.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/stat.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/widgets-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/widgets-types.js
similarity index 78%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/widgets-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/data/widgets-types.js
index b332bfe454..46dc2cae8a 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/data/widgets-types.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/data/widgets-types.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
-var FormulaOptionModel = require('cartodb3/components/modals/add-widgets/formula/formula-option-model');
-var CategoryOptionModel = require('cartodb3/components/modals/add-widgets/category/category-option-model');
-var HistogramOptionModel = require('cartodb3/components/modals/add-widgets/histogram/histogram-option-model');
-var TimeSeriesOptionModel = require('cartodb3/components/modals/add-widgets/time-series/time-series-option-model');
+var FormulaOptionModel = require('builder/components/modals/add-widgets/formula/formula-option-model');
+var CategoryOptionModel = require('builder/components/modals/add-widgets/category/category-option-model');
+var HistogramOptionModel = require('builder/components/modals/add-widgets/histogram/histogram-option-model');
+var TimeSeriesOptionModel = require('builder/components/modals/add-widgets/time-series/time-series-option-model');
var CARTODB_ID = 'cartodb_id';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/code-mirror-error.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/code-mirror-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/code-mirror-error.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/code-mirror-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-base-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-base-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-base-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-base-view.js
index 568117c991..3609fe24ce 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-base-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-base-view.js
@@ -1,19 +1,19 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
var InfoWindowHTMLView = require('./infowindow-html-view');
var InfowindowContentView = require('./infowindow-content-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var Toggler = require('cartodb3/components/toggler/toggler-view');
-var ApplyButtonView = require('cartodb3/components/apply-button/apply-button-view');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var Toggler = require('builder/components/toggler/toggler-view');
+var ApplyButtonView = require('builder/components/apply-button/apply-button-view');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
var cdb = require('cartodb.js');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-carousel.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-carousel.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-carousel.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-carousel.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-click-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-click-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-click-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-click-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-content-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-content-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-content-view.js
index b40315e0c6..c6e650e800 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-content-view.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var CoreView = require('backbone/core-view');
var InfowindowSelectView = require('./infowindow-select-view');
var InfowindowItemsView = require('./infowindow-items-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
var REQUIRED_OPTS = [
'querySchemaModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-description-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-description-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-description-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-description-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-description.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-description.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-description.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-description.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-field-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-field-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-field-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-field-view.js
index e411b7d006..51e4550423 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-field-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-field-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./infowindow-field.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
/**
* View for an individual column model.
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-field.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-field.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-field.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-field.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-fields-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-fields-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-fields-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-fields-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-fields.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-fields.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-fields.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-fields.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-hover-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-hover-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-hover-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-hover-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-html-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-html-view.js
similarity index 87%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-html-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-html-view.js
index 12f91d1781..ec41079cc3 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-html-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-html-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
var ErrorTemplate = require('./code-mirror-error.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'codemirrorModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-color.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-color.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-color.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-color.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-dark.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-dark.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-dark.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-dark.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-image.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-image.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-image.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-image.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-light.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-light.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-light.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-light.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-none.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-none.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-none.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-none.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-items-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-items-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-items-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-items-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-items.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-items.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-items.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-items.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-select-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-select-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-select-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-select-view.js
index 999d805b81..532365f386 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-select-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-select-view.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
var template = require('./infowindow-select.tpl');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
+var CarouselFormView = require('builder/components/carousel-form-view');
var InfowindowFormView = require('./infowindow-form-view');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-select.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-select.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindow-select.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindow-select.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindows-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindows-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindows-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindows-view.js
index d14181cd07..829b33f650 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/infowindows-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/infowindows-view.js
@@ -2,10 +2,10 @@ var _ = require('underscore');
var CoreView = require('backbone/core-view');
var InfowindowClickView = require('./infowindow-click-view');
var TooltipView = require('./infowindow-hover-view');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
-var TabPaneTemplate = require('cartodb3/editor/tab-pane-submenu.tpl');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
+var TabPaneTemplate = require('builder/editor/tab-pane-submenu.tpl');
var popupPlaceholderTemplate = require('./popups-placeholder.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/popups-placeholder.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/popups-placeholder.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/popups-placeholder.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/popups-placeholder.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-dark.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-dark.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-dark.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-dark.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-light.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-light.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-light.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-light.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-none.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-none.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-none.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/infowindow/tooltip-icons/tooltip-none.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/bubble.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/bubble.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/bubble.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/bubble.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/category.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/category.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/category.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/category.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/custom.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/custom.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/custom.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/custom.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/none.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/none.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/carousel-icons/none.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/carousel-icons/none.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/code-mirror-error.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/code-mirror-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/code-mirror-error.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/code-mirror-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-color-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-color-types.js
similarity index 80%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-color-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-color-types.js
index a92ed0e878..7f61450f61 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-color-types.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-color-types.js
@@ -1,16 +1,16 @@
var _ = require('underscore');
-var styleHelper = require('cartodb3/helpers/style');
+var styleHelper = require('builder/helpers/style');
module.exports = [
{
value: 'none',
tooltipTranslationKey: 'editor.legend.tooltips.style.none',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/none.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/none.tpl'),
label: _t('editor.legend.types.none')
}, {
value: 'category',
tooltipTranslationKey: 'editor.legend.tooltips.style.category',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/category.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/category.tpl'),
label: _t('editor.legend.types.category'),
isStyleCompatible: function (styleModel) {
var type = styleModel.get('type');
@@ -24,7 +24,7 @@ module.exports = [
}, {
value: 'torque',
tooltipTranslationKey: 'editor.legend.tooltips.style.torque',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/category.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/category.tpl'),
label: _t('editor.legend.types.category'),
isStyleCompatible: function (styleModel) {
var type = styleModel.get('type');
@@ -37,7 +37,7 @@ module.exports = [
}, {
value: 'choropleth',
tooltipTranslationKey: 'editor.legend.tooltips.style.choropleth',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl'),
label: _t('editor.legend.types.gradient'),
isStyleCompatible: function (styleModel) {
var type = styleModel.get('type');
@@ -57,7 +57,7 @@ module.exports = [
}, {
value: 'custom_choropleth',
tooltipTranslationKey: 'editor.legend.tooltips.style.custom_choropleth',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/gradient.tpl'),
label: _t('editor.legend.types.gradient'),
isStyleCompatible: function (styleModel) {
var type = styleModel.get('type');
@@ -73,7 +73,7 @@ module.exports = [
}, {
value: 'custom',
tooltipTranslationKey: 'editor.legend.tooltips.style.custom',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/custom.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/custom.tpl'),
label: _t('editor.legend.types.custom')
}
];
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-color-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-color-view.js
similarity index 68%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-color-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-color-view.js
index 24ac0cf234..392f07cbde 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-color-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-color-view.js
@@ -1,5 +1,5 @@
var LegendTypes = require('./legend-color-types');
-var LegendTypeBaseView = require('cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view');
+var LegendTypeBaseView = require('builder/editor/layers/layer-content-views/legend/legend-base-type-view');
module.exports = LegendTypeBaseView.extend({
initialize: function (opts) {
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-custom-template.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-custom-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/color/legend-custom-template.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/color/legend-custom-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/empty.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/empty.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/empty.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/empty.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-base-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-base-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-base-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-base-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-bubble-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-bubble-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-bubble-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-bubble-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-category-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-category-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-category-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-category-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-choropleth-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-choropleth-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-choropleth-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-choropleth-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-color-helper.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-color-helper.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-color-helper.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-color-helper.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-color-range.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-color-range.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-color-range.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-color-range.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-custom-choropleth-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-custom-choropleth-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-custom-choropleth-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-custom-choropleth-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-custom-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-custom-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-custom-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-custom-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-list-item.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-list-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-list-item.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-list-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-list.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-list.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-list.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-list.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-nested-category-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-nested-category-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-nested-category-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-nested-category-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-torque-definition-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-torque-definition-form-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/form/legend-torque-definition-form-model.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/form/legend-torque-definition-form-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-base-type-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-base-type-view.js
index d2252c2eab..741a154d3a 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-base-type-view.js
@@ -2,21 +2,21 @@ var cdb = require('cartodb.js');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
var LegendContentView = require('./legend-content-view');
var LegendEditorView = require('./legend-editor-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var Toggler = require('cartodb3/components/toggler/toggler-view');
-var ApplyButtonView = require('cartodb3/components/apply-button/apply-button-view');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
-var LegendDefinitionModel = require('cartodb3/data/legends/legend-base-definition-model');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var Toggler = require('builder/components/toggler/toggler-view');
+var ApplyButtonView = require('builder/components/apply-button/apply-button-view');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
+var LegendDefinitionModel = require('builder/data/legends/legend-base-definition-model');
var LegendFactory = require('./legend-factory');
var htmlTemplate = require('./color/legend-custom-template.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
var REQUIRED_OPTS = [
'mapDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-buffer.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-buffer.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-buffer.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-buffer.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content-sql-error.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content-sql-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content-sql-error.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content-sql-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content-view.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content-view.js
index a925369bd1..e63ca3730d 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content-view.js
@@ -1,10 +1,10 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var styleHelper = require('cartodb3/helpers/style');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var styleHelper = require('builder/helpers/style');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CarouselFormView = require('builder/components/carousel-form-view');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
var FormView = require('./legend-properties-form');
var CustomFormModel = require('./form/legend-custom-definition-form-model');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-content.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-content.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-editor-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-editor-view.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-editor-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-editor-view.js
index e816fea848..63055f791d 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-editor-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-editor-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
var ErrorTemplate = require('./code-mirror-error.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'codemirrorModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-factory.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-factory.js
similarity index 86%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-factory.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-factory.js
index 2c2f84d819..ce492774bc 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-factory.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-factory.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
-var CategoryModel = require('cartodb3/data/legends/legend-category-definition-model');
-var BubbleModel = require('cartodb3/data/legends/legend-bubble-definition-model');
-var ChoroplethModel = require('cartodb3/data/legends/legend-choropleth-definition-model');
-var CustomChoroplethModel = require('cartodb3/data/legends/legend-custom-choropleth-definition-model');
-var CustomModel = require('cartodb3/data/legends/legend-custom-definition-model');
-var TorqueModel = require('cartodb3/data/legends/legend-torque-definition-model');
+var CategoryModel = require('builder/data/legends/legend-category-definition-model');
+var BubbleModel = require('builder/data/legends/legend-bubble-definition-model');
+var ChoroplethModel = require('builder/data/legends/legend-choropleth-definition-model');
+var CustomChoroplethModel = require('builder/data/legends/legend-custom-choropleth-definition-model');
+var CustomModel = require('builder/data/legends/legend-custom-definition-model');
+var TorqueModel = require('builder/data/legends/legend-torque-definition-model');
var Validations = require('./legend-validations');
var Buffer = require('./legend-buffer');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-form-types.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-form-types.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-form-types.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-form-types.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-no-geometry-template.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-no-geometry-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-no-geometry-template.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-no-geometry-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-not-ready.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-not-ready.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-not-ready.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-not-ready.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-properties-form.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-properties-form.js
similarity index 95%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-properties-form.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-properties-form.js
index 4cbfae5da9..6bd0be68bb 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-properties-form.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-properties-form.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./legend-properties-form.tpl');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-properties-form.tpl b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-properties-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-properties-form.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-properties-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-validations.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-validations.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-validations.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legend-validations.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legends-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legends-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legends-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legends-view.js
index 0527edb799..7803420eac 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/legends-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/legends-view.js
@@ -4,13 +4,13 @@ var CoreView = require('backbone/core-view');
var LegendColorView = require('./color/legend-color-view');
var LegendSizeView = require('./size/legend-size-view');
var LegendSizeTypes = require('./size/legend-size-types');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
-var TabPaneTemplate = require('cartodb3/editor/tab-pane-submenu.tpl');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
+var TabPaneTemplate = require('builder/editor/tab-pane-submenu.tpl');
var sqlErrorTemplate = require('./legend-content-sql-error.tpl');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
var legendNoGeometryTemplate = require('./legend-no-geometry-template.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
var REQUIRED_OPTS = [
'mapDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/size/legend-size-types.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/size/legend-size-types.js
similarity index 76%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/size/legend-size-types.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/size/legend-size-types.js
index 1ce5dd811b..433d6df198 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/size/legend-size-types.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/size/legend-size-types.js
@@ -4,12 +4,12 @@ module.exports = [
{
value: 'none',
tooltipTranslationKey: 'editor.legend.tooltips.style.none',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/none.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/none.tpl'),
label: _t('editor.legend.types.none')
}, {
value: 'bubble',
tooltipTranslationKey: 'editor.legend.tooltips.style.bubble',
- legendIcon: require('cartodb3/editor/layers/layer-content-views/legend/carousel-icons/bubble.tpl'),
+ legendIcon: require('builder/editor/layers/layer-content-views/legend/carousel-icons/bubble.tpl'),
label: _t('editor.legend.types.bubble'),
isStyleCompatible: function (styleModel) {
var fill = styleModel.get('fill');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/size/legend-size-view.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/size/legend-size-view.js
similarity index 68%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/size/legend-size-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/size/legend-size-view.js
index 5a9c6c5e26..51323c915a 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-content-views/legend/size/legend-size-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/legend/size/legend-size-view.js
@@ -1,5 +1,5 @@
var LegendTypes = require('./legend-size-types');
-var LegendTypeBaseView = require('cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view');
+var LegendTypeBaseView = require('builder/editor/layers/layer-content-views/legend/legend-base-type-view');
module.exports = LegendTypeBaseView.extend({
initialize: function (opts) {
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-draw-geometry-buttons.js b/lib/assets/javascripts/builder/editor/layers/layer-draw-geometry-buttons.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-draw-geometry-buttons.js
rename to lib/assets/javascripts/builder/editor/layers/layer-draw-geometry-buttons.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-header-view.js b/lib/assets/javascripts/builder/editor/layers/layer-header-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-header-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-header-view.js
index 733c8099dc..0eab943f11 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-header-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-header-view.js
@@ -2,18 +2,18 @@ var CoreView = require('backbone/core-view');
var Backbone = require('backbone');
var template = require('./layer-header.tpl');
var SyncInfoView = require('./sync-info/sync-info-view');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var VisTableModel = require('cartodb3/data/visualization-table-model');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var VisTableModel = require('builder/data/visualization-table-model');
var renameLayer = require('./operations/rename-layer');
-var DeleteLayerConfirmationView = require('cartodb3/components/modals/remove-layer/delete-layer-confirmation-view');
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
-var ModalExportDataView = require('cartodb3/components/modals/export-data/modal-export-data-view');
+var DeleteLayerConfirmationView = require('builder/components/modals/remove-layer/delete-layer-confirmation-view');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
+var ModalExportDataView = require('builder/components/modals/export-data/modal-export-data-view');
var templateInlineEditor = require('./inline-editor.tpl');
-var zoomToData = require('cartodb3/editor/map-operations/zoom-to-data');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var IconView = require('cartodb3/components/icon/icon-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var zoomToData = require('builder/editor/map-operations/zoom-to-data');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var IconView = require('builder/components/icon/icon-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'modals',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-header.tpl b/lib/assets/javascripts/builder/editor/layers/layer-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-header.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-tab-pane-placeholder-view.js b/lib/assets/javascripts/builder/editor/layers/layer-tab-pane-placeholder-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-tab-pane-placeholder-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-tab-pane-placeholder-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-tab-pane-placeholder.tpl b/lib/assets/javascripts/builder/editor/layers/layer-tab-pane-placeholder.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-tab-pane-placeholder.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-tab-pane-placeholder.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-tab-pane.tpl b/lib/assets/javascripts/builder/editor/layers/layer-tab-pane.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-tab-pane.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-tab-pane.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-view-factory.js b/lib/assets/javascripts/builder/editor/layers/layer-view-factory.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-view-factory.js
rename to lib/assets/javascripts/builder/editor/layers/layer-view-factory.js
index eca669196e..1cb4655d11 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-view-factory.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-view-factory.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var layerTypesAndKinds = require('cartodb3/data/layer-types-and-kinds');
+var layerTypesAndKinds = require('builder/data/layer-types-and-kinds');
var BaseTiledLayerView = require('./layer-views/base-tiled-layer-view');
var PlainColorLayerView = require('./layer-views/plain-color-layer-view');
var BackgroundImageLayerView = require('./layer-views/background-image-layer-view');
@@ -9,7 +9,7 @@ var ErroredDataLayerView = require('./layer-views/errored-data-layer-view');
var LabelsLayerView = require('./layer-views/labels-layer-view');
var LayerAnalysesView = require('./layer-analyses-view');
var LayerAnalysisViewFactory = require('./layer-analysis-view-factory');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/background-image-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/background-image-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/background-image-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/background-image-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/base-layer-view-base.js b/lib/assets/javascripts/builder/editor/layers/layer-views/base-layer-view-base.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/base-layer-view-base.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/base-layer-view-base.js
index 637ff04e6d..f0e503a891 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/base-layer-view-base.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-views/base-layer-view-base.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
/**
* Base view for all base layer views.
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/base-tiled-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/base-tiled-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/base-tiled-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/base-tiled-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer-fetching.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/data-layer-fetching.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer-fetching.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/data-layer-fetching.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/data-layer-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/data-layer-view.js
index a1c2ae0ac4..8e430546ba 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-views/data-layer-view.js
@@ -2,22 +2,22 @@ var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./data-layer.tpl');
var fetchingTemplate = require('./data-layer-fetching.tpl');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var renameLayer = require('cartodb3/editor/layers/operations/rename-layer');
-var DeleteLayerConfirmationView = require('cartodb3/components/modals/remove-layer/delete-layer-confirmation-view');
-var ModalExportDataView = require('cartodb3/components/modals/export-data/modal-export-data-view');
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var zoomToData = require('cartodb3/editor/map-operations/zoom-to-data');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var renameLayer = require('builder/editor/layers/operations/rename-layer');
+var DeleteLayerConfirmationView = require('builder/components/modals/remove-layer/delete-layer-confirmation-view');
+var ModalExportDataView = require('builder/components/modals/export-data/modal-export-data-view');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var zoomToData = require('builder/editor/map-operations/zoom-to-data');
var templateInlineEditor = require('./inline-editor.tpl');
var geometryNoneTemplate = require('./geometry-none.tpl');
var geometryPointsTemplate = require('./geometry-points.tpl');
var geometryLinesTemplate = require('./geometry-lines.tpl');
var geometryPolygonsTemplate = require('./geometry-polygons.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var fetchAllQueryObjectsIfNecessary = require('cartodb3/helpers/fetch-all-query-objects');
-var Router = require('cartodb3/routes/router');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var fetchAllQueryObjectsIfNecessary = require('builder/helpers/fetch-all-query-objects');
+var Router = require('builder/routes/router');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/data-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/data-layer.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/data-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/errored-data-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/errored-data-layer-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/errored-data-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/errored-data-layer-view.js
index 1cfefcadeb..1d058f7768 100644
--- a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/errored-data-layer-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layer-views/errored-data-layer-view.js
@@ -1,10 +1,10 @@
var $ = require('jquery');
var DataLayerView = require('./data-layer-view');
var template = require('./data-layer.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var geometryNoneTemplate = require('./geometry-none.tpl');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var defaultLayerAnalysisView = require('cartodb3/editor/layers/analysis-views/default-layer-analysis-view.tpl');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var defaultLayerAnalysisView = require('builder/editor/layers/analysis-views/default-layer-analysis-view.tpl');
var BROKEN_NODE_LAYER_COLOR = '#CCC';
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-lines.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/geometry-lines.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-lines.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/geometry-lines.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-none.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/geometry-none.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-none.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/geometry-none.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-points.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/geometry-points.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-points.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/geometry-points.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-polygons.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/geometry-polygons.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/geometry-polygons.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/geometry-polygons.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/google-maps-base-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/google-maps-base-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/google-maps-base-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/google-maps-base-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/image-thumbnail-layer.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/image-thumbnail-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/image-thumbnail-layer.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/image-thumbnail-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/inline-editor.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/inline-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/inline-editor.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/inline-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/labels-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/labels-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/labels-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/labels-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/plain-color-layer-view.js b/lib/assets/javascripts/builder/editor/layers/layer-views/plain-color-layer-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/plain-color-layer-view.js
rename to lib/assets/javascripts/builder/editor/layers/layer-views/plain-color-layer-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layer-views/plain-color-layer.tpl b/lib/assets/javascripts/builder/editor/layers/layer-views/plain-color-layer.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layer-views/plain-color-layer.tpl
rename to lib/assets/javascripts/builder/editor/layers/layer-views/plain-color-layer.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layers-view.js b/lib/assets/javascripts/builder/editor/layers/layers-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/layers/layers-view.js
rename to lib/assets/javascripts/builder/editor/layers/layers-view.js
index 21b812b190..1475df09a3 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/layers-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/layers-view.js
@@ -2,13 +2,13 @@ require('jquery-ui');
var _ = require('underscore');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var Notifier = require('builder/components/notifier/notifier');
var template = require('./layers.tpl');
var LayerViewFactory = require('./layer-view-factory');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var AddLayerView = require('cartodb3/components/modals/add-layer/add-layer-view');
-var AddLayerModel = require('cartodb3/components/modals/add-layer/add-layer-model');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var AddLayerView = require('builder/components/modals/add-layer/add-layer-view');
+var AddLayerModel = require('builder/components/modals/add-layer/add-layer-model');
var SORTABLE_SELECTOR = '.js-layers';
var SORTABLE_ITEMS_SELECTOR = '.js-layer.js-sortable-item';
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/layers.tpl b/lib/assets/javascripts/builder/editor/layers/layers.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/layers.tpl
rename to lib/assets/javascripts/builder/editor/layers/layers.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/notification-error-message-handler.js b/lib/assets/javascripts/builder/editor/layers/notification-error-message-handler.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/layers/notification-error-message-handler.js
rename to lib/assets/javascripts/builder/editor/layers/notification-error-message-handler.js
index 60a4216781..c9b9ac6e15 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/notification-error-message-handler.js
+++ b/lib/assets/javascripts/builder/editor/layers/notification-error-message-handler.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Messages = require('./notification-error-messages.json');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
var CONTACT_LINK_TEMPLATE;
var SAMPLE_LINK_TEMPLATE;
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/notification-error-messages.json b/lib/assets/javascripts/builder/editor/layers/notification-error-messages.json
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/notification-error-messages.json
rename to lib/assets/javascripts/builder/editor/layers/notification-error-messages.json
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/operations/remove-layer.js b/lib/assets/javascripts/builder/editor/layers/operations/remove-layer.js
similarity index 87%
rename from lib/assets/javascripts/cartodb3/editor/layers/operations/remove-layer.js
rename to lib/assets/javascripts/builder/editor/layers/operations/remove-layer.js
index ea6533fd37..1069e9c2d1 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/operations/remove-layer.js
+++ b/lib/assets/javascripts/builder/editor/layers/operations/remove-layer.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.layerDefinitionModel) throw new Error('layerDefinitionModel is required');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/operations/rename-layer.js b/lib/assets/javascripts/builder/editor/layers/operations/rename-layer.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/editor/layers/operations/rename-layer.js
rename to lib/assets/javascripts/builder/editor/layers/operations/rename-layer.js
index 1689542167..b75946d769 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/operations/rename-layer.js
+++ b/lib/assets/javascripts/builder/editor/layers/operations/rename-layer.js
@@ -1,6 +1,6 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
-var utils = require('cartodb3/helpers/utils');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
+var utils = require('builder/helpers/utils');
module.exports = function (opts) {
if (!opts.userActions) throw new Error('userActions is required');
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/panel-loading-template.tpl b/lib/assets/javascripts/builder/editor/layers/panel-loading-template.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/panel-loading-template.tpl
rename to lib/assets/javascripts/builder/editor/layers/panel-loading-template.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/publish-button.tpl b/lib/assets/javascripts/builder/editor/layers/publish-button.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/publish-button.tpl
rename to lib/assets/javascripts/builder/editor/layers/publish-button.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/share-button-view.js b/lib/assets/javascripts/builder/editor/layers/share-button-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/share-button-view.js
rename to lib/assets/javascripts/builder/editor/layers/share-button-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/sql-error-action.tpl b/lib/assets/javascripts/builder/editor/layers/sql-error-action.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/sql-error-action.tpl
rename to lib/assets/javascripts/builder/editor/layers/sql-error-action.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/sync-info/sync-info-view.js b/lib/assets/javascripts/builder/editor/layers/sync-info/sync-info-view.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/editor/layers/sync-info/sync-info-view.js
rename to lib/assets/javascripts/builder/editor/layers/sync-info/sync-info-view.js
index 1d6fa0dd5a..2e5c74ab44 100755
--- a/lib/assets/javascripts/cartodb3/editor/layers/sync-info/sync-info-view.js
+++ b/lib/assets/javascripts/builder/editor/layers/sync-info/sync-info-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
var template = require('./sync-info.tpl');
var moment = require('moment');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var SyncOptionsModalView = require('cartodb3/components/modals/sync-options/sync-options-modal-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var SyncOptionsModalView = require('builder/components/modals/sync-options/sync-options-modal-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'modals',
diff --git a/lib/assets/javascripts/cartodb3/editor/layers/sync-info/sync-info.tpl b/lib/assets/javascripts/builder/editor/layers/sync-info/sync-info.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/layers/sync-info/sync-info.tpl
rename to lib/assets/javascripts/builder/editor/layers/sync-info/sync-info.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/map-operations/remove-map.js b/lib/assets/javascripts/builder/editor/map-operations/remove-map.js
similarity index 84%
rename from lib/assets/javascripts/cartodb3/editor/map-operations/remove-map.js
rename to lib/assets/javascripts/builder/editor/map-operations/remove-map.js
index 238e634da2..f2bf23086e 100755
--- a/lib/assets/javascripts/cartodb3/editor/map-operations/remove-map.js
+++ b/lib/assets/javascripts/builder/editor/map-operations/remove-map.js
@@ -1,5 +1,5 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
module.exports = function (opts) {
if (!opts.visDefinitionModel) throw new Error('visDefinitionModel is required');
diff --git a/lib/assets/javascripts/cartodb3/editor/map-operations/rename-map.js b/lib/assets/javascripts/builder/editor/map-operations/rename-map.js
similarity index 81%
rename from lib/assets/javascripts/cartodb3/editor/map-operations/rename-map.js
rename to lib/assets/javascripts/builder/editor/map-operations/rename-map.js
index e4fca655a7..813b689365 100755
--- a/lib/assets/javascripts/cartodb3/editor/map-operations/rename-map.js
+++ b/lib/assets/javascripts/builder/editor/map-operations/rename-map.js
@@ -1,8 +1,8 @@
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
-var utils = require('cartodb3/helpers/utils');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
+var utils = require('builder/helpers/utils');
-var TITLE_SUFIX = require('cartodb3/components/modals/visualization-title-suffix-metadata');
+var TITLE_SUFIX = require('builder/components/modals/visualization-title-suffix-metadata');
module.exports = function (opts) {
if (!opts.visDefinitionModel) throw new Error('visDefinitionModel is required');
diff --git a/lib/assets/javascripts/cartodb3/editor/map-operations/zoom-to-data.js b/lib/assets/javascripts/builder/editor/map-operations/zoom-to-data.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/map-operations/zoom-to-data.js
rename to lib/assets/javascripts/builder/editor/map-operations/zoom-to-data.js
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/preview/enabler.tpl b/lib/assets/javascripts/builder/editor/settings/preview/enabler.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/settings/preview/enabler.tpl
rename to lib/assets/javascripts/builder/editor/settings/preview/enabler.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/preview/options-not-ready.tpl b/lib/assets/javascripts/builder/editor/settings/preview/options-not-ready.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/settings/preview/options-not-ready.tpl
rename to lib/assets/javascripts/builder/editor/settings/preview/options-not-ready.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options-item-view.js b/lib/assets/javascripts/builder/editor/settings/preview/preview-options-item-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options-item-view.js
rename to lib/assets/javascripts/builder/editor/settings/preview/preview-options-item-view.js
index 8a044f0cc3..f936f418dd 100755
--- a/lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options-item-view.js
+++ b/lib/assets/javascripts/builder/editor/settings/preview/preview-options-item-view.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var enablerTemplate = require('./enabler.tpl');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
var REQUIRED_OPTS = [
'model'
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options-view.js b/lib/assets/javascripts/builder/editor/settings/preview/preview-options-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options-view.js
rename to lib/assets/javascripts/builder/editor/settings/preview/preview-options-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options.tpl b/lib/assets/javascripts/builder/editor/settings/preview/preview-options.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/settings/preview/preview-options.tpl
rename to lib/assets/javascripts/builder/editor/settings/preview/preview-options.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/preview/preview-view.js b/lib/assets/javascripts/builder/editor/settings/preview/preview-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/settings/preview/preview-view.js
rename to lib/assets/javascripts/builder/editor/settings/preview/preview-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/settings/settings.tpl b/lib/assets/javascripts/builder/editor/settings/settings.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/settings/settings.tpl
rename to lib/assets/javascripts/builder/editor/settings/settings.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-cartocss-model.js b/lib/assets/javascripts/builder/editor/style/style-cartocss-model.js
similarity index 92%
rename from lib/assets/javascripts/cartodb3/editor/style/style-cartocss-model.js
rename to lib/assets/javascripts/builder/editor/style/style-cartocss-model.js
index d89ec0bd09..6baef1e44e 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-cartocss-model.js
+++ b/lib/assets/javascripts/builder/editor/style/style-cartocss-model.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var UndoManager = require('cartodb3/data/undo-manager.js');
+var UndoManager = require('builder/data/undo-manager.js');
var _ = require('underscore');
/**
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-cartocss-view.js b/lib/assets/javascripts/builder/editor/style/style-cartocss-view.js
similarity index 86%
rename from lib/assets/javascripts/cartodb3/editor/style/style-cartocss-view.js
rename to lib/assets/javascripts/builder/editor/style/style-cartocss-view.js
index b33cc327d3..3fb9e07389 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-cartocss-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-cartocss-view.js
@@ -1,8 +1,8 @@
var CoreView = require('backbone/core-view');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
-var FactoryHints = require('cartodb3/editor/editor-hints/factory-hints');
-var CSSHints = require('cartodb3/editor/editor-hints/css-hints');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
+var FactoryHints = require('builder/editor/editor-hints/factory-hints');
+var CSSHints = require('builder/editor/editor-hints/css-hints');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'layerDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-content-sql-error.tpl b/lib/assets/javascripts/builder/editor/style/style-content-sql-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-content-sql-error.tpl
rename to lib/assets/javascripts/builder/editor/style/style-content-sql-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-content-view.js b/lib/assets/javascripts/builder/editor/style/style-content-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/style/style-content-view.js
rename to lib/assets/javascripts/builder/editor/style/style-content-view.js
index 9bc4e4d665..c665d60dfa 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-content-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-content-view.js
@@ -2,13 +2,13 @@ var CoreView = require('backbone/core-view');
var _ = require('underscore');
var StyleFormView = require('./style-form/style-form-view');
var StylesFactory = require('./styles-factory');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CarouselFormView = require('builder/components/carousel-form-view');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
var styleSQLErrorTemplate = require('./style-content-sql-error.tpl');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var Notifier = require('builder/components/notifier/notifier');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'configModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-converter.js b/lib/assets/javascripts/builder/editor/style/style-converter.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/style/style-converter.js
rename to lib/assets/javascripts/builder/editor/style/style-converter.js
index c1cc044028..17e5285efb 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-converter.js
+++ b/lib/assets/javascripts/builder/editor/style/style-converter.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
-var Utils = require('cartodb3/helpers/utils');
-var InputQualitativeRamps = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js');
+var camshaftReference = require('builder/data/camshaft-reference');
+var Utils = require('builder/helpers/utils');
+var InputQualitativeRamps = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.js');
var CONFIG = {
GENERIC_STYLE: camshaftReference.getDefaultCartoCSSForType(),
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/animation-style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/animation-style-defaults.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/animation-style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/animation-style-defaults.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/heatmap-style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/heatmap-style-defaults.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/heatmap-style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/heatmap-style-defaults.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/hexabins-aggregation-style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/hexabins-aggregation-style-defaults.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/hexabins-aggregation-style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/hexabins-aggregation-style-defaults.js
index 1d09309a82..d71f3ee75c 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/hexabins-aggregation-style-defaults.js
+++ b/lib/assets/javascripts/builder/editor/style/style-defaults/hexabins-aggregation-style-defaults.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var SimpleStyleDefaults = require('./simple-style-defaults');
-var DefaultFormValues = require('cartodb3/data/default-form-styles.json');
-var Utils = require('cartodb3/helpers/utils');
+var DefaultFormValues = require('builder/data/default-form-styles.json');
+var Utils = require('builder/helpers/utils');
var rampList = require('cartocolor');
module.exports = _.defaults({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/regions-aggregation-style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/regions-aggregation-style-defaults.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/regions-aggregation-style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/regions-aggregation-style-defaults.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/simple-style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/simple-style-defaults.js
similarity index 85%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/simple-style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/simple-style-defaults.js
index 7319fb3ef5..c4d918fac4 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/simple-style-defaults.js
+++ b/lib/assets/javascripts/builder/editor/style/style-defaults/simple-style-defaults.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var StyleDefaults = require('./style-defaults');
-var DefaultCartography = require('cartodb3/data/default-cartography.json');
-var DefaultFormValues = require('cartodb3/data/default-form-styles.json');
-var Utils = require('cartodb3/helpers/utils');
+var DefaultCartography = require('builder/data/default-cartography.json');
+var DefaultFormValues = require('builder/data/default-form-styles.json');
+var Utils = require('builder/helpers/utils');
module.exports = _.defaults({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/squares-aggregation-style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/squares-aggregation-style-defaults.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/squares-aggregation-style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/squares-aggregation-style-defaults.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-defaults/style-defaults.js b/lib/assets/javascripts/builder/editor/style/style-defaults/style-defaults.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-defaults/style-defaults.js
rename to lib/assets/javascripts/builder/editor/style/style-defaults/style-defaults.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-definition-model.js b/lib/assets/javascripts/builder/editor/style/style-definition-model.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/style/style-definition-model.js
rename to lib/assets/javascripts/builder/editor/style/style-definition-model.js
index b043c0891a..1caede5e70 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-definition-model.js
+++ b/lib/assets/javascripts/builder/editor/style/style-definition-model.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
var StylesFactory = require('./styles-factory');
-var UndoManager = require('cartodb3/data/undo-manager');
+var UndoManager = require('builder/data/undo-manager');
module.exports = Backbone.Model.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form-types.tpl b/lib/assets/javascripts/builder/editor/style/style-form-types.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form-types.tpl
rename to lib/assets/javascripts/builder/editor/style/style-form-types.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/none-form-message.tpl b/lib/assets/javascripts/builder/editor/style/style-form/none-form-message.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/none-form-message.tpl
rename to lib/assets/javascripts/builder/editor/style/style-form/none-form-message.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form-view.js
index ce90913050..aee7dd5ca8 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form-view.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
var StyleShapeFormModel = require('./style-aggregation-properties-form-model');
var template = require('./style-aggregation-form.tpl');
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl b/lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl
rename to lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-properties-form-model.js b/lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-properties-form-model.js
similarity index 68%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-properties-form-model.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-properties-form-model.js
index 83dd8eb1fa..7b4e1ddd72 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-properties-form-model.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-aggregation-form/style-aggregation-properties-form-model.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var StyleFormDefaultModel = require('cartodb3/editor/style/style-form/style-form-default-model');
+var StyleFormDefaultModel = require('builder/editor/style/style-form/style-form-default-model');
module.exports = StyleFormDefaultModel.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-components-dictionary.js b/lib/assets/javascripts/builder/editor/style/style-form/style-form-components-dictionary.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-components-dictionary.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-form-components-dictionary.js
index fc29952f36..0fadcb85b2 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-components-dictionary.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-form-components-dictionary.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var StylesFactory = require('cartodb3/editor/style/styles-factory');
+var StylesFactory = require('builder/editor/style/styles-factory');
var FONTS_LIST = [
'DejaVu Sans Book',
'Unifont Medium',
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-default-model.js b/lib/assets/javascripts/builder/editor/style/style-form/style-form-default-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-default-model.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-form-default-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-form-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-model.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-animated-properties-form-model.js
similarity index 89%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-model.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-animated-properties-form-model.js
index fb97756c6f..b5a6780eb9 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-model.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-animated-properties-form-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var StyleFormDefaultModel = require('cartodb3/editor/style/style-form/style-form-default-model');
-var StyleFormComponents = require('cartodb3/editor/style/style-form/style-form-components-dictionary');
+var StyleFormDefaultModel = require('builder/editor/style/style-form/style-form-default-model');
+var StyleFormComponents = require('builder/editor/style/style-form/style-form-components-dictionary');
module.exports = StyleFormDefaultModel.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-animated-properties-form-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-animated-properties-form-view.js
index d945ec1982..6526ff7f47 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-animated-properties-form-view.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
var StyleAnimatedFormModel = require('./style-animated-properties-form-model');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-model.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-labels-properties-form-model.js
similarity index 80%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-model.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-labels-properties-form-model.js
index cee85d826b..9e73d41d6e 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-model.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-labels-properties-form-model.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var StyleFormDefaultModel = require('cartodb3/editor/style/style-form/style-form-default-model');
+var StyleFormDefaultModel = require('builder/editor/style/style-form/style-form-default-model');
module.exports = StyleFormDefaultModel.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-labels-properties-form-view.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-labels-properties-form-view.js
index 15ea1b194e..521aa2033a 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-labels-properties-form-view.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
var StyleLabelsFormModel = require('./style-labels-properties-form-model');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-properties-form-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-properties-form-view.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-properties-form-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-properties-form-view.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-properties-form.tpl b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-properties-form.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-properties-form.tpl
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-properties-form.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-model.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-shape-properties-form-model.js
similarity index 80%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-model.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-shape-properties-form-model.js
index 4b940c3311..3ff77de714 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-model.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-shape-properties-form-model.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var StylesFactory = require('cartodb3/editor/style/styles-factory');
-var StyleFormDefaultModel = require('cartodb3/editor/style/style-form/style-form-default-model');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var StylesFactory = require('builder/editor/style/styles-factory');
+var StyleFormDefaultModel = require('builder/editor/style/style-form/style-form-default-model');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
var TYPES = {
HEATMAP: 'heatmap',
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-shape-properties-form-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-shape-properties-form-view.js
index f7d48b95be..5dee76e3aa 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-shape-properties-form-view.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-require('cartodb3/components/form-components/index');
+require('builder/components/form-components/index');
var StyleShapeFormModel = require('./style-shape-properties-form-model');
module.exports = CoreView.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-unanimatable-view.js b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-unanimatable-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-unanimatable-view.js
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-unanimatable-view.js
index 967cc7e782..765795c88b 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-unanimatable-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-unanimatable-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
var template = require('./style-unanimatable.tpl');
-var VisTableModel = require('cartodb3/data/visualization-table-model');
+var VisTableModel = require('builder/data/visualization-table-model');
var linkTemplate = _.template('
<%- label %>');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-unanimatable.tpl b/lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-unanimatable.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-form/style-properties-form/style-unanimatable.tpl
rename to lib/assets/javascripts/builder/editor/style/style-form/style-properties-form/style-unanimatable.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-icons/animated.tpl b/lib/assets/javascripts/builder/editor/style/style-icons/animated.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-icons/animated.tpl
rename to lib/assets/javascripts/builder/editor/style/style-icons/animated.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-icons/heatmap.tpl b/lib/assets/javascripts/builder/editor/style/style-icons/heatmap.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-icons/heatmap.tpl
rename to lib/assets/javascripts/builder/editor/style/style-icons/heatmap.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-icons/hexabins.tpl b/lib/assets/javascripts/builder/editor/style/style-icons/hexabins.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-icons/hexabins.tpl
rename to lib/assets/javascripts/builder/editor/style/style-icons/hexabins.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-icons/points.tpl b/lib/assets/javascripts/builder/editor/style/style-icons/points.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-icons/points.tpl
rename to lib/assets/javascripts/builder/editor/style/style-icons/points.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-icons/regions.tpl b/lib/assets/javascripts/builder/editor/style/style-icons/regions.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-icons/regions.tpl
rename to lib/assets/javascripts/builder/editor/style/style-icons/regions.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-icons/squares.tpl b/lib/assets/javascripts/builder/editor/style/style-icons/squares.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-icons/squares.tpl
rename to lib/assets/javascripts/builder/editor/style/style-icons/squares.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-manager.js b/lib/assets/javascripts/builder/editor/style/style-manager.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-manager.js
rename to lib/assets/javascripts/builder/editor/style/style-manager.js
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-redo-buttons.tpl b/lib/assets/javascripts/builder/editor/style/style-redo-buttons.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/style-redo-buttons.tpl
rename to lib/assets/javascripts/builder/editor/style/style-redo-buttons.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/style/style-view.js b/lib/assets/javascripts/builder/editor/style/style-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/style/style-view.js
rename to lib/assets/javascripts/builder/editor/style/style-view.js
index 22cb484b7f..674b4ee5ea 100755
--- a/lib/assets/javascripts/cartodb3/editor/style/style-view.js
+++ b/lib/assets/javascripts/builder/editor/style/style-view.js
@@ -1,25 +1,25 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
var StyleContentView = require('./style-content-view');
var StyleCartoCSSView = require('./style-cartocss-view');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
-var Toggler = require('cartodb3/components/toggler/toggler-view');
-var UndoButtons = require('cartodb3/components/undo-redo/undo-redo-view');
-var ParserCSS = require('cartodb3/helpers/parser-css');
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var CartoCSSNotifications = require('cartodb3/cartocss-notifications');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var OnboardingLauncher = require('cartodb3/components/onboardings/generic/generic-onboarding-launcher');
-var OnboardingView = require('cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view');
-var layerOnboardingKey = require('cartodb3/components/onboardings/layers/layer-onboarding-key');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
+var Toggler = require('builder/components/toggler/toggler-view');
+var UndoButtons = require('builder/components/undo-redo/undo-redo-view');
+var ParserCSS = require('builder/helpers/parser-css');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
+var Notifier = require('builder/components/notifier/notifier');
+var CartoCSSNotifications = require('builder/cartocss-notifications');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var OnboardingLauncher = require('builder/components/onboardings/generic/generic-onboarding-launcher');
+var OnboardingView = require('builder/components/onboardings/layers/style-onboarding/style-onboarding-view');
+var layerOnboardingKey = require('builder/components/onboardings/layers/layer-onboarding-key');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'layerDefinitionsCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor/style/styles-factory.js b/lib/assets/javascripts/builder/editor/style/styles-factory.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/style/styles-factory.js
rename to lib/assets/javascripts/builder/editor/style/styles-factory.js
diff --git a/lib/assets/javascripts/cartodb3/editor/tab-pane-submenu.tpl b/lib/assets/javascripts/builder/editor/tab-pane-submenu.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/tab-pane-submenu.tpl
rename to lib/assets/javascripts/builder/editor/tab-pane-submenu.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/delete-widget-confirmation.tpl b/lib/assets/javascripts/builder/editor/widgets/delete-widget-confirmation.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/delete-widget-confirmation.tpl
rename to lib/assets/javascripts/builder/editor/widgets/delete-widget-confirmation.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/inline-editor.tpl b/lib/assets/javascripts/builder/editor/widgets/inline-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/inline-editor.tpl
rename to lib/assets/javascripts/builder/editor/widgets/inline-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/time-series-query-model.js b/lib/assets/javascripts/builder/editor/widgets/time-series-query-model.js
similarity index 98%
rename from lib/assets/javascripts/cartodb3/editor/widgets/time-series-query-model.js
rename to lib/assets/javascripts/builder/editor/widgets/time-series-query-model.js
index 3d074a12d1..9938d11a6d 100644
--- a/lib/assets/javascripts/cartodb3/editor/widgets/time-series-query-model.js
+++ b/lib/assets/javascripts/builder/editor/widgets/time-series-query-model.js
@@ -2,7 +2,7 @@ var Backbone = require('backbone');
var cdb = require('cartodb.js');
var _ = require('underscore');
var moment = require('moment');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var QUERY_TEMPLATE = _.template('SELECT MAX(<%= column %>), MIN(<%= column %>) FROM (<%= table %>) __wrapped');
var STATUS = {
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-category.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-category.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-category.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-category.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-formula.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-formula.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-formula.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-formula.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-histogram.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-histogram.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-histogram.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-histogram.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-category.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-category.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-category.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-category.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-formula.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-formula.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-formula.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-formula.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-histogram.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-histogram.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-histogram.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-histogram.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-timeSeries.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-timeSeries.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-layer-timeSeries.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-layer-timeSeries.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-timeSeries.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-icon-timeSeries.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-icon-timeSeries.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-icon-timeSeries.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-view.js b/lib/assets/javascripts/builder/editor/widgets/widget-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-view.js
rename to lib/assets/javascripts/builder/editor/widgets/widget-view.js
index 013e8c4c2e..deccddc00b 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widget-view.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widget-view.js
@@ -1,11 +1,11 @@
var CoreView = require('backbone/core-view');
var template = require('./widget-view.tpl');
-var ContextMenuFactory = require('cartodb3/components/context-menu-factory-view');
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
+var ContextMenuFactory = require('builder/components/context-menu-factory-view');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
var templateInlineEditor = require('./inline-editor.tpl');
var WidgetsService = require('./widgets-service');
-var Analyses = require('cartodb3/data/analyses');
-var Router = require('cartodb3/routes/router');
+var Analyses = require('builder/data/analyses');
+var Router = require('builder/routes/router');
var widgetIconTemplateMap = {
category: require('./widget-icon-layer-category.tpl'),
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widget-view.tpl b/lib/assets/javascripts/builder/editor/widgets/widget-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widget-view.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widget-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-content-error.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-content-error.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-content-error.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-content-error.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-content-not-ready.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-content-not-ready.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-content-not-ready.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-content-not-ready.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/inline-editor.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-form/inline-editor.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/inline-editor.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/inline-editor.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-base-schema-model.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-base-schema-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-base-schema-model.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-base-schema-model.js
index 92e21f42dc..b7f4b43875 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-base-schema-model.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-base-schema-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
module.exports = Backbone.Model.extend({
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-schema-model.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-category-schema-model.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-schema-model.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-category-schema-model.js
index 7647b6fe11..3bf0334dc3 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-schema-model.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-category-schema-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var WidgetsFormBaseSchema = require('./widgets-form-base-schema-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'columnOptionsFactory',
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.js
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.js
index 05e8517a27..52de00c47d 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var WidgetsFormBaseSchema = require('./widgets-form-base-schema-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var NUMBER_TYPE = 'number';
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.js
index 15c2b775b0..106b38f374 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var WidgetsFormBaseSchema = require('./widgets-form-base-schema-model');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var TimeSeriesQueryModel = require('cartodb3/editor/widgets/time-series-query-model');
-var timezones = require('cartodb3/data/timezones');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var TimeSeriesQueryModel = require('builder/editor/widgets/time-series-query-model');
+var timezones = require('builder/data/timezones');
var moment = require('moment');
require('moment-timezone');
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widget-header.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widget-header.js
similarity index 87%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widget-header.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widget-header.js
index 0b254fde61..39ecb27411 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widget-header.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widget-header.js
@@ -1,13 +1,13 @@
var CoreView = require('backbone/core-view');
var template = require('./widget-header.tpl');
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
-var VisTableModel = require('cartodb3/data/visualization-table-model');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
+var VisTableModel = require('builder/data/visualization-table-model');
var templateInlineEditor = require('./inline-editor.tpl');
-var ContextMenuFactory = require('cartodb3/components/context-menu-factory-view');
-var WidgetsService = require('cartodb3/editor/widgets/widgets-service');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var analyses = require('cartodb3/data/analyses');
-var Router = require('cartodb3/routes/router');
+var ContextMenuFactory = require('builder/components/context-menu-factory-view');
+var WidgetsService = require('builder/editor/widgets/widgets-service');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var analyses = require('builder/data/analyses');
+var Router = require('builder/routes/router');
var REQUIRED_OPTS = [
'layerDefinitionModel',
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widget-header.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widget-header.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widget-header.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widget-header.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-column-options-factory.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-column-options-factory.js
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-content-view.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-content-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-content-view.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-content-view.js
index 602c9e7dc8..ec1b7164c7 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-content-view.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-content-view.js
@@ -1,9 +1,9 @@
var CoreView = require('backbone/core-view');
var WidgetsFormView = require('./widgets-form-view');
var WidgetHeaderView = require('./widget-header.js');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var Router = require('cartodb3/routes/router');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var Router = require('builder/routes/router');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-factory.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-factory.js
similarity index 88%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-factory.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-factory.js
index e1679c4df3..441bf53e01 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-factory.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-factory.js
@@ -4,12 +4,12 @@ var WidgetsFormColumnOptionsFactory = require('./widgets-form-column-options-fac
var dataMap = {
category: {
labelTranslationKey: 'editor.widgets.widgets-form.type.category',
- iconTemplate: require('cartodb3/editor/widgets/widget-icon-category.tpl'),
+ iconTemplate: require('builder/editor/widgets/widget-icon-category.tpl'),
Class: require('./schema/widgets-form-category-schema-model')
},
formula: {
labelTranslationKey: 'editor.widgets.widgets-form.type.formula',
- iconTemplate: require('cartodb3/editor/widgets/widget-icon-formula.tpl'),
+ iconTemplate: require('builder/editor/widgets/widget-icon-formula.tpl'),
Class: require('./schema/widgets-form-formula-schema-model'),
checkIfValid: function (querySchemaModel) {
return querySchemaModel.columnsCollection.any(function (m) {
@@ -19,7 +19,7 @@ var dataMap = {
},
histogram: {
labelTranslationKey: 'editor.widgets.widgets-form.type.histogram',
- iconTemplate: require('cartodb3/editor/widgets/widget-icon-histogram.tpl'),
+ iconTemplate: require('builder/editor/widgets/widget-icon-histogram.tpl'),
Class: require('./schema/widgets-form-histogram-schema-model'),
checkIfValid: function (querySchemaModel) {
return querySchemaModel.columnsCollection.any(function (m) {
@@ -29,7 +29,7 @@ var dataMap = {
},
'time-series': {
labelTranslationKey: 'editor.widgets.widgets-form.type.time_series',
- iconTemplate: require('cartodb3/editor/widgets/widget-icon-timeSeries.tpl'),
+ iconTemplate: require('builder/editor/widgets/widget-icon-timeSeries.tpl'),
Class: require('./schema/widgets-form-time-series-schema-model'),
checkIfValid: function (querySchemaModel) {
return querySchemaModel.columnsCollection.any(function (m) {
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-fields-view.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-fields-view.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-fields-view.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-fields-view.js
index b538f6054b..b931f9c04a 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-fields-view.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-fields-view.js
@@ -3,8 +3,8 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var WidgetFormFactory = require('./widgets-form-factory');
var template = require('./widgets-form-fields.tpl');
-require('cartodb3/components/form-components/index');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+require('builder/components/form-components/index');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'userActions',
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-fields.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-fields.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-fields.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-fields.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-types.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-types.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-types.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-types.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-view.js b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-view.js
similarity index 91%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-view.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-view.js
index 2c98e3c15f..e47b03d81d 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-form/widgets-form-view.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-form/widgets-form-view.js
@@ -1,11 +1,11 @@
var CoreView = require('backbone/core-view');
var _ = require('underscore');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CarouselFormView = require('builder/components/carousel-form-view');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
var WidgetFormFactory = require('./widgets-form-factory');
var WidgetsFormFieldsView = require('./widgets-form-fields-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var loadingTemplate = require('cartodb3/editor/layers/panel-loading-template.tpl');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var loadingTemplate = require('builder/editor/layers/panel-loading-template.tpl');
var TIME_SERIES_TYPE = 'time-series';
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-placeholder.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-placeholder.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-placeholder.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-placeholder.tpl
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-service.js b/lib/assets/javascripts/builder/editor/widgets/widgets-service.js
similarity index 85%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-service.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-service.js
index 3a6f7b01bf..fd63e96c3f 100644
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-service.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-service.js
@@ -1,7 +1,7 @@
var removeWidgetConfirmationTemplate = require('./delete-widget-confirmation.tpl');
-var ConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var Router = require('cartodb3/routes/router');
+var ConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var Router = require('builder/routes/router');
var REQUIRED_OPTS = [
'analysisDefinitionNodesCollection',
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-view.js b/lib/assets/javascripts/builder/editor/widgets/widgets-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-view.js
rename to lib/assets/javascripts/builder/editor/widgets/widgets-view.js
index 70d3a971c1..6173955339 100755
--- a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-view.js
+++ b/lib/assets/javascripts/builder/editor/widgets/widgets-view.js
@@ -7,10 +7,10 @@ var template = require('./widgets-view.tpl');
var widgetPlaceholderTemplate = require('./widgets-placeholder.tpl');
var widgetsErrorTemplate = require('./widgets-content-error.tpl');
var widgetsNotReadyTemplate = require('./widgets-content-not-ready.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
-var AddWidgetsView = require('cartodb3/components/modals/add-widgets/add-widgets-view');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
-var Router = require('cartodb3/routes/router');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
+var AddWidgetsView = require('builder/components/modals/add-widgets/add-widgets-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
+var Router = require('builder/routes/router');
require('jquery-ui');
diff --git a/lib/assets/javascripts/cartodb3/editor/widgets/widgets-view.tpl b/lib/assets/javascripts/builder/editor/widgets/widgets-view.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/editor/widgets/widgets-view.tpl
rename to lib/assets/javascripts/builder/editor/widgets/widgets-view.tpl
diff --git a/lib/assets/javascripts/cartodb3/embed/embed-integrations.js b/lib/assets/javascripts/builder/embed/embed-integrations.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/embed/embed-integrations.js
rename to lib/assets/javascripts/builder/embed/embed-integrations.js
index 69852bedd8..0fe01a0d69 100644
--- a/lib/assets/javascripts/cartodb3/embed/embed-integrations.js
+++ b/lib/assets/javascripts/builder/embed/embed-integrations.js
@@ -1,4 +1,4 @@
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var LegendManager = require('./legend-manager');
var REQUIRED_OPTS = [
diff --git a/lib/assets/javascripts/cartodb3/embed/embed-overlay-view.js b/lib/assets/javascripts/builder/embed/embed-overlay-view.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/embed/embed-overlay-view.js
rename to lib/assets/javascripts/builder/embed/embed-overlay-view.js
index caa5967fcb..c539952a5c 100644
--- a/lib/assets/javascripts/cartodb3/embed/embed-overlay-view.js
+++ b/lib/assets/javascripts/builder/embed/embed-overlay-view.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var template = require('./embed-overlay.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'title',
diff --git a/lib/assets/javascripts/cartodb3/embed/embed-overlay.tpl b/lib/assets/javascripts/builder/embed/embed-overlay.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/embed/embed-overlay.tpl
rename to lib/assets/javascripts/builder/embed/embed-overlay.tpl
diff --git a/lib/assets/javascripts/cartodb3/embed/embed-title.tpl b/lib/assets/javascripts/builder/embed/embed-title.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/embed/embed-title.tpl
rename to lib/assets/javascripts/builder/embed/embed-title.tpl
diff --git a/lib/assets/javascripts/cartodb3/embed/embed-view.js b/lib/assets/javascripts/builder/embed/embed-view.js
similarity index 97%
rename from lib/assets/javascripts/cartodb3/embed/embed-view.js
rename to lib/assets/javascripts/builder/embed/embed-view.js
index 9899d3f04f..5dd2155f03 100644
--- a/lib/assets/javascripts/cartodb3/embed/embed-view.js
+++ b/lib/assets/javascripts/builder/embed/embed-view.js
@@ -2,7 +2,7 @@ var Backbone = require('backbone');
var _ = require('underscore');
var Ps = require('perfect-scrollbar');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var TabsView = require('./tabs/tabs-view');
var template = require('./embed.tpl');
var EmbedOverlay = require('./embed-overlay-view');
diff --git a/lib/assets/javascripts/cartodb3/embed/embed.tpl b/lib/assets/javascripts/builder/embed/embed.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/embed/embed.tpl
rename to lib/assets/javascripts/builder/embed/embed.tpl
diff --git a/lib/assets/javascripts/cartodb3/embed/legend-manager.js b/lib/assets/javascripts/builder/embed/legend-manager.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/embed/legend-manager.js
rename to lib/assets/javascripts/builder/embed/legend-manager.js
index f841a816ab..0c95c1faee 100644
--- a/lib/assets/javascripts/cartodb3/embed/legend-manager.js
+++ b/lib/assets/javascripts/builder/embed/legend-manager.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var legendsMetadata = require('cartodb3/data/legends/legends-metadata');
+var legendsMetadata = require('builder/data/legends/legends-metadata');
var legends;
diff --git a/lib/assets/javascripts/cartodb3/embed/style-collection.js b/lib/assets/javascripts/builder/embed/style-collection.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/embed/style-collection.js
rename to lib/assets/javascripts/builder/embed/style-collection.js
diff --git a/lib/assets/javascripts/cartodb3/embed/tabs/tab-item.tpl b/lib/assets/javascripts/builder/embed/tabs/tab-item.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/embed/tabs/tab-item.tpl
rename to lib/assets/javascripts/builder/embed/tabs/tab-item.tpl
diff --git a/lib/assets/javascripts/cartodb3/embed/tabs/tabs-view.js b/lib/assets/javascripts/builder/embed/tabs/tabs-view.js
similarity index 94%
rename from lib/assets/javascripts/cartodb3/embed/tabs/tabs-view.js
rename to lib/assets/javascripts/builder/embed/tabs/tabs-view.js
index e12b110902..5babaf88a5 100644
--- a/lib/assets/javascripts/cartodb3/embed/tabs/tabs-view.js
+++ b/lib/assets/javascripts/builder/embed/tabs/tabs-view.js
@@ -1,7 +1,7 @@
var CoreView = require('backbone/core-view');
var template = require('./tabs.tpl');
var tabItemTemplate = require('./tab-item.tpl');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'tabs'
diff --git a/lib/assets/javascripts/cartodb3/embed/tabs/tabs.tpl b/lib/assets/javascripts/builder/embed/tabs/tabs.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/embed/tabs/tabs.tpl
rename to lib/assets/javascripts/builder/embed/tabs/tabs.tpl
diff --git a/lib/assets/javascripts/cartodb3/helpers/browser-detect.js b/lib/assets/javascripts/builder/helpers/browser-detect.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/browser-detect.js
rename to lib/assets/javascripts/builder/helpers/browser-detect.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/carto-color.js b/lib/assets/javascripts/builder/helpers/carto-color.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/carto-color.js
rename to lib/assets/javascripts/builder/helpers/carto-color.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/color-keywords.js b/lib/assets/javascripts/builder/helpers/color-keywords.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/color-keywords.js
rename to lib/assets/javascripts/builder/helpers/color-keywords.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/error-parser.js b/lib/assets/javascripts/builder/helpers/error-parser.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/error-parser.js
rename to lib/assets/javascripts/builder/helpers/error-parser.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/errorTracking.js b/lib/assets/javascripts/builder/helpers/errorTracking.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/errorTracking.js
rename to lib/assets/javascripts/builder/helpers/errorTracking.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/fetch-all-query-objects.js b/lib/assets/javascripts/builder/helpers/fetch-all-query-objects.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/fetch-all-query-objects.js
rename to lib/assets/javascripts/builder/helpers/fetch-all-query-objects.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/ga-pusher.js b/lib/assets/javascripts/builder/helpers/ga-pusher.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/ga-pusher.js
rename to lib/assets/javascripts/builder/helpers/ga-pusher.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/locale.js b/lib/assets/javascripts/builder/helpers/locale.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/locale.js
rename to lib/assets/javascripts/builder/helpers/locale.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/magic-positioner.js b/lib/assets/javascripts/builder/helpers/magic-positioner.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/magic-positioner.js
rename to lib/assets/javascripts/builder/helpers/magic-positioner.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/mapcard-preview.js b/lib/assets/javascripts/builder/helpers/mapcard-preview.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/mapcard-preview.js
rename to lib/assets/javascripts/builder/helpers/mapcard-preview.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/navigate-through-router.js b/lib/assets/javascripts/builder/helpers/navigate-through-router.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/navigate-through-router.js
rename to lib/assets/javascripts/builder/helpers/navigate-through-router.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/parser-css.js b/lib/assets/javascripts/builder/helpers/parser-css.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/parser-css.js
rename to lib/assets/javascripts/builder/helpers/parser-css.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/point-geojson-parser.js b/lib/assets/javascripts/builder/helpers/point-geojson-parser.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/point-geojson-parser.js
rename to lib/assets/javascripts/builder/helpers/point-geojson-parser.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/required-opts.js b/lib/assets/javascripts/builder/helpers/required-opts.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/required-opts.js
rename to lib/assets/javascripts/builder/helpers/required-opts.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/reset-style-per-node.js b/lib/assets/javascripts/builder/helpers/reset-style-per-node.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/reset-style-per-node.js
rename to lib/assets/javascripts/builder/helpers/reset-style-per-node.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/sql-utils.js b/lib/assets/javascripts/builder/helpers/sql-utils.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/sql-utils.js
rename to lib/assets/javascripts/builder/helpers/sql-utils.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/style.js b/lib/assets/javascripts/builder/helpers/style.js
similarity index 93%
rename from lib/assets/javascripts/cartodb3/helpers/style.js
rename to lib/assets/javascripts/builder/helpers/style.js
index d60c2499c9..e0cba36fdf 100644
--- a/lib/assets/javascripts/cartodb3/helpers/style.js
+++ b/lib/assets/javascripts/builder/helpers/style.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var LegendColorHelper = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-color-helper');
+var LegendColorHelper = require('builder/editor/layers/layer-content-views/legend/form/legend-color-helper');
module.exports = {
getStyleAttrs: function (styleModel) {
diff --git a/lib/assets/javascripts/cartodb3/helpers/styles-without-autostyle.js b/lib/assets/javascripts/builder/helpers/styles-without-autostyle.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/styles-without-autostyle.js
rename to lib/assets/javascripts/builder/helpers/styles-without-autostyle.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/table-name-utils.js b/lib/assets/javascripts/builder/helpers/table-name-utils.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/table-name-utils.js
rename to lib/assets/javascripts/builder/helpers/table-name-utils.js
diff --git a/lib/assets/javascripts/cartodb3/helpers/utils.js b/lib/assets/javascripts/builder/helpers/utils.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/helpers/utils.js
rename to lib/assets/javascripts/builder/helpers/utils.js
diff --git a/lib/assets/javascripts/cartodb3/map-mode-model.js b/lib/assets/javascripts/builder/map-mode-model.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/map-mode-model.js
rename to lib/assets/javascripts/builder/map-mode-model.js
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_color.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_color.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_color.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_color.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_dark.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_dark.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_dark.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_dark.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_header_with_image.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_header_with_image.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_header_with_image.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_header_with_image.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_light.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_light.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_light.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_light.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_none.tpl b/lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_none.tpl
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_none.tpl
rename to lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_none.tpl
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_color.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_color.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_color.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_color.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_dark.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_dark.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_dark.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_dark.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_header_with_image.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_header_with_image.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_header_with_image.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_header_with_image.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_light.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_light.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_light.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_light.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_none.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_none.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/infowindows_custom/infowindow_none.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/infowindows_custom/infowindow_none.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/tooltips/tooltip_dark.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/tooltips/tooltip_dark.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/tooltips/tooltip_dark.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/tooltips/tooltip_dark.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/tooltips/tooltip_light.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/tooltips/tooltip_light.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/tooltips/tooltip_light.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/tooltips/tooltip_light.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/tooltips_custom/tooltip_dark.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/tooltips_custom/tooltip_dark.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/tooltips_custom/tooltip_dark.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/tooltips_custom/tooltip_dark.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/mustache-templates/tooltips_custom/tooltip_light.jst.mustache b/lib/assets/javascripts/builder/mustache-templates/tooltips_custom/tooltip_light.jst.mustache
similarity index 100%
rename from lib/assets/javascripts/cartodb3/mustache-templates/tooltips_custom/tooltip_light.jst.mustache
rename to lib/assets/javascripts/builder/mustache-templates/tooltips_custom/tooltip_light.jst.mustache
diff --git a/lib/assets/javascripts/cartodb3/node-geometry-tracker.js b/lib/assets/javascripts/builder/node-geometry-tracker.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/node-geometry-tracker.js
rename to lib/assets/javascripts/builder/node-geometry-tracker.js
diff --git a/lib/assets/javascripts/cartodb3/public_editor.js b/lib/assets/javascripts/builder/public_editor.js
similarity index 86%
rename from lib/assets/javascripts/cartodb3/public_editor.js
rename to lib/assets/javascripts/builder/public_editor.js
index 84d481fa5a..708f2e1f91 100755
--- a/lib/assets/javascripts/cartodb3/public_editor.js
+++ b/lib/assets/javascripts/builder/public_editor.js
@@ -5,14 +5,14 @@ FastClick.attach(document.body);
var $ = require('jquery');
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerStyleCollection = require('cartodb3/embed/style-collection');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var ConfigModel = require('builder/data/config-model');
+var LayerStyleCollection = require('builder/embed/style-collection');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
var deepInsights = require('deep-insights/index');
-var EmbedIntegrations = require('cartodb3/embed/embed-integrations');
+var EmbedIntegrations = require('builder/embed/embed-integrations');
var URLStateHelper = require('deep-insights/api/url-helper.js');
-var EmbedView = require('cartodb3/embed/embed-view');
-var utils = require('cartodb3/helpers/utils');
+var EmbedView = require('builder/embed/embed-view');
+var utils = require('builder/helpers/utils');
var vizJSON = window.vizJSON;
var authTokens = window.authTokens;
diff --git a/lib/assets/javascripts/cartodb3/routes/handle-analyses-route.js b/lib/assets/javascripts/builder/routes/handle-analyses-route.js
similarity index 68%
rename from lib/assets/javascripts/cartodb3/routes/handle-analyses-route.js
rename to lib/assets/javascripts/builder/routes/handle-analyses-route.js
index bf7ce8520e..6e6c364198 100644
--- a/lib/assets/javascripts/cartodb3/routes/handle-analyses-route.js
+++ b/lib/assets/javascripts/builder/routes/handle-analyses-route.js
@@ -1,4 +1,4 @@
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
module.exports = function (currentRoute) {
var routeName = currentRoute[0];
diff --git a/lib/assets/javascripts/cartodb3/routes/handle-modals-route.js b/lib/assets/javascripts/builder/routes/handle-modals-route.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/routes/handle-modals-route.js
rename to lib/assets/javascripts/builder/routes/handle-modals-route.js
diff --git a/lib/assets/javascripts/cartodb3/routes/helpers.js b/lib/assets/javascripts/builder/routes/helpers.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/routes/helpers.js
rename to lib/assets/javascripts/builder/routes/helpers.js
diff --git a/lib/assets/javascripts/cartodb3/routes/populate-route.js b/lib/assets/javascripts/builder/routes/populate-route.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/routes/populate-route.js
rename to lib/assets/javascripts/builder/routes/populate-route.js
diff --git a/lib/assets/javascripts/cartodb3/routes/router.js b/lib/assets/javascripts/builder/routes/router.js
similarity index 99%
rename from lib/assets/javascripts/cartodb3/routes/router.js
rename to lib/assets/javascripts/builder/routes/router.js
index 9a791f50e3..e1ac826d73 100644
--- a/lib/assets/javascripts/cartodb3/routes/router.js
+++ b/lib/assets/javascripts/builder/routes/router.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var populateRoute = require('./populate-route');
var ROUTE_LAYERS = 'layers';
diff --git a/lib/assets/javascripts/cartodb3/sql-notifications.js b/lib/assets/javascripts/builder/sql-notifications.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/sql-notifications.js
rename to lib/assets/javascripts/builder/sql-notifications.js
index db7b7e44e7..1af3f402d2 100755
--- a/lib/assets/javascripts/cartodb3/sql-notifications.js
+++ b/lib/assets/javascripts/builder/sql-notifications.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var Notifier = require('builder/components/notifier/notifier');
var NOTIFICATION_ERROR_TEMPLATE = _.template("
<%- title %>");
var NOTIFICATION_PREFIX = 'sql-notifications';
diff --git a/lib/assets/javascripts/cartodb3/value-objects/analysis-node-ids.js b/lib/assets/javascripts/builder/value-objects/analysis-node-ids.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/value-objects/analysis-node-ids.js
rename to lib/assets/javascripts/builder/value-objects/analysis-node-ids.js
diff --git a/lib/assets/javascripts/cartodb3/value-objects/distance-converter.js b/lib/assets/javascripts/builder/value-objects/distance-converter.js
similarity index 100%
rename from lib/assets/javascripts/cartodb3/value-objects/distance-converter.js
rename to lib/assets/javascripts/builder/value-objects/distance-converter.js
diff --git a/lib/assets/javascripts/cartodb3/vis-notifications.js b/lib/assets/javascripts/builder/vis-notifications.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/vis-notifications.js
rename to lib/assets/javascripts/builder/vis-notifications.js
index 7aea804248..b2b23ad002 100755
--- a/lib/assets/javascripts/cartodb3/vis-notifications.js
+++ b/lib/assets/javascripts/builder/vis-notifications.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var Notifier = require('builder/components/notifier/notifier');
var NOTIFICATION_ID = 'visNotification';
var NOTIFICATION_TEMPLATE = _.template("
<%= title %> <%= body %>");
diff --git a/lib/assets/javascripts/cartodb3/widgets-notifications.js b/lib/assets/javascripts/builder/widgets-notifications.js
similarity index 96%
rename from lib/assets/javascripts/cartodb3/widgets-notifications.js
rename to lib/assets/javascripts/builder/widgets-notifications.js
index 26bd7f4207..6e9fc41e27 100755
--- a/lib/assets/javascripts/cartodb3/widgets-notifications.js
+++ b/lib/assets/javascripts/builder/widgets-notifications.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var errorParser = require('cartodb3/helpers/error-parser');
+var Notifier = require('builder/components/notifier/notifier');
+var errorParser = require('builder/helpers/error-parser');
var NOTIFICATION_ERROR_TEMPLATE = _.template("
<%- title %>");
diff --git a/lib/assets/javascripts/cartodb/old_common/utils.js b/lib/assets/javascripts/cartodb/old_common/utils.js
index 8d0608e7cd..e7c7f62cd6 100644
--- a/lib/assets/javascripts/cartodb/old_common/utils.js
+++ b/lib/assets/javascripts/cartodb/old_common/utils.js
@@ -297,7 +297,7 @@
/*
* Returns a (double) quoted table name if needed (if it contains a dash, for example).
* Coupled to backend lib/carto/table_utils.rb#safe_table_name_quoting.
- * Duplicated at lib/assets/javascripts/cartodb3/helpers/utils.js to make it available for older models.
+ * Duplicated at lib/assets/javascripts/builder/helpers/utils.js to make it available for older models.
*/
cdb.Utils.safeTableNameQuoting = function (table_name) {
if (table_name === undefined || table_name.indexOf('-') === -1 || table_name[0] === '"' || table_name[table_name.length - 1] === '"') {
diff --git a/lib/assets/javascripts/cartodb3/data/infowindow-hover-model.js b/lib/assets/javascripts/cartodb3/data/infowindow-hover-model.js
deleted file mode 100755
index 9681e60211..0000000000
--- a/lib/assets/javascripts/cartodb3/data/infowindow-hover-model.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var InfowindowDefinitionModel = require('./infowindow-definition-model');
-
-module.exports = InfowindowDefinitionModel.extend({
-
- defaults: {
- vertical_offset: 0,
- horizontal_offset: 0,
- position: 'top|center',
- template_name: '',
- template: ''
- },
-
- TEMPLATES: {
- tooltip_dark: require('cartodb3/mustache-templates/tooltips/tooltip_dark.jst.mustache'),
- tooltip_light: require('cartodb3/mustache-templates/tooltips/tooltip_light.jst.mustache'),
- custom_tooltip_dark: require('cartodb3/mustache-templates/tooltips_custom/tooltip_dark.jst.mustache'),
- custom_tooltip_light: require('cartodb3/mustache-templates/tooltips_custom/tooltip_light.jst.mustache')
- },
-
- setDefault: function () {
- this.setTemplate(this.defaults.template_name);
- }
-
-});
diff --git a/lib/assets/javascripts/dashboard/components/mapcard-preview-view.js b/lib/assets/javascripts/dashboard/components/mapcard-preview-view.js
index 53fc1cf98e..172a5aaa67 100644
--- a/lib/assets/javascripts/dashboard/components/mapcard-preview-view.js
+++ b/lib/assets/javascripts/dashboard/components/mapcard-preview-view.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var TEMPLATES = {
// Using <%= %> instead of <%- %> because if not / characters (for example) will be escaped
diff --git a/lib/assets/javascripts/dashboard/data/user-model.js b/lib/assets/javascripts/dashboard/data/user-model.js
index e3eb4070ef..31c447ef09 100644
--- a/lib/assets/javascripts/dashboard/data/user-model.js
+++ b/lib/assets/javascripts/dashboard/data/user-model.js
@@ -1,4 +1,4 @@
-var UserModel = require('cartodb3/data/user-model');
+var UserModel = require('builder/data/user-model');
var UserUrlModel = require('dashboard/data/user-url-model');
module.exports = UserModel.extend({
diff --git a/lib/assets/javascripts/dashboard/util/scroll-tofixed-view.js b/lib/assets/javascripts/dashboard/util/scroll-tofixed-view.js
index 2805061738..27a9454bbc 100644
--- a/lib/assets/javascripts/dashboard/util/scroll-tofixed-view.js
+++ b/lib/assets/javascripts/dashboard/util/scroll-tofixed-view.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
var CoreView = require('backbone/core-view');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
var REQUIRED_OPTS = [
'el'
diff --git a/lib/assets/javascripts/dashboard/views/public-profile/feed-view.js b/lib/assets/javascripts/dashboard/views/public-profile/feed-view.js
index 34592a5f1a..b7a29ea13c 100644
--- a/lib/assets/javascripts/dashboard/views/public-profile/feed-view.js
+++ b/lib/assets/javascripts/dashboard/views/public-profile/feed-view.js
@@ -4,12 +4,12 @@ var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
var moment = require('moment');
-var Utils = require('cartodb3/helpers/utils');
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var Utils = require('builder/helpers/utils');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
-var randomQuote = require('cartodb3/components/loading/random-quote');
+var randomQuote = require('builder/components/loading/random-quote');
var Visualizations = require('./user-feed/feed-collection');
-var ViewFactory = require('cartodb3/components/view-factory');
+var ViewFactory = require('builder/components/view-factory');
var MapCardPreview = require('dashboard/components/mapcard-preview-view');
var LikeModel = require('dashboard/data/like-model');
var LikeView = require('dashboard/components/likes/like-view');
diff --git a/lib/assets/javascripts/deep-insights/widgets/category/title/search-title-view.js b/lib/assets/javascripts/deep-insights/widgets/category/title/search-title-view.js
index ed79956733..a22a571836 100644
--- a/lib/assets/javascripts/deep-insights/widgets/category/title/search-title-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/category/title/search-title-view.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
var $ = require('jquery');
var CoreView = require('backbone/core-view');
var DropdownView = require('../../dropdown/widget-dropdown-view');
-var TipsyTooltipView = require('../../../../cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('../../../../builder/components/tipsy-tooltip-view');
var template = require('./search-title-template.tpl');
var layerColors = require('../../../util/layer-colors');
var analyses = require('../../../data/analyses');
diff --git a/lib/assets/javascripts/deep-insights/widgets/dropdown/widget-dropdown-view.js b/lib/assets/javascripts/deep-insights/widgets/dropdown/widget-dropdown-view.js
index 0a485e70ad..a39cc96499 100644
--- a/lib/assets/javascripts/deep-insights/widgets/dropdown/widget-dropdown-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/dropdown/widget-dropdown-view.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var _ = require('underscore');
var CoreView = require('backbone/core-view');
var template = require('./template.tpl');
-var DropdownOverlay = require('../../../cartodb3/components/dropdown-overlay/dropdown-overlay-view');
+var DropdownOverlay = require('../../../builder/components/dropdown-overlay/dropdown-overlay-view');
/**
* Standard widget dropdown view
diff --git a/lib/assets/javascripts/deep-insights/widgets/formula/content-view.js b/lib/assets/javascripts/deep-insights/widgets/formula/content-view.js
index d28a737858..997db3664c 100644
--- a/lib/assets/javascripts/deep-insights/widgets/formula/content-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/formula/content-view.js
@@ -9,7 +9,7 @@ var AnimateValues = require('../animate-values.js');
var layerColors = require('../../util/layer-colors');
var Analyses = require('../../data/analyses');
var escapeHTML = require('../../util/escape-html');
-var TipsyTooltipView = require('../../../cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('../../../builder/components/tipsy-tooltip-view');
/**
* Default widget content view:
diff --git a/lib/assets/javascripts/deep-insights/widgets/histogram/content-view.js b/lib/assets/javascripts/deep-insights/widgets/histogram/content-view.js
index f14c6b7002..1de7243a52 100644
--- a/lib/assets/javascripts/deep-insights/widgets/histogram/content-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/histogram/content-view.js
@@ -6,7 +6,7 @@ var HistogramChartView = require('./chart');
var placeholder = require('./placeholder.tpl');
var template = require('./content.tpl');
var DropdownView = require('../dropdown/widget-dropdown-view');
-var TipsyTooltipView = require('../../../cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('../../../builder/components/tipsy-tooltip-view');
var AnimateValues = require('../animate-values.js');
var animationTemplate = require('./animation-template.tpl');
var layerColors = require('../../util/layer-colors');
diff --git a/lib/assets/javascripts/deep-insights/widgets/histogram/histogram-title-view.js b/lib/assets/javascripts/deep-insights/widgets/histogram/histogram-title-view.js
index 26a54685f7..1c715f4a96 100644
--- a/lib/assets/javascripts/deep-insights/widgets/histogram/histogram-title-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/histogram/histogram-title-view.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var TipsyTooltipView = require('../../../cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('../../../builder/components/tipsy-tooltip-view');
var template = require('./histogram-title-template.tpl');
/**
diff --git a/lib/assets/javascripts/deep-insights/widgets/time-series/histogram-view.js b/lib/assets/javascripts/deep-insights/widgets/time-series/histogram-view.js
index e549045c60..b22fe723fa 100644
--- a/lib/assets/javascripts/deep-insights/widgets/time-series/histogram-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/time-series/histogram-view.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var CoreView = require('backbone/core-view');
var HistogramChartView = require('../histogram/chart');
var viewportUtils = require('../../viewport-utils');
-var TipsyTooltipView = require('../../../cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('../../../builder/components/tipsy-tooltip-view');
/**
* Time-series histogram view.
diff --git a/lib/assets/javascripts/deep-insights/widgets/time-series/time-series-header-view.js b/lib/assets/javascripts/deep-insights/widgets/time-series/time-series-header-view.js
index 65de2ef062..4e3a0ccd99 100644
--- a/lib/assets/javascripts/deep-insights/widgets/time-series/time-series-header-view.js
+++ b/lib/assets/javascripts/deep-insights/widgets/time-series/time-series-header-view.js
@@ -5,7 +5,7 @@ var template = require('./time-series-header.tpl');
var formatter = require('../../formatter');
var AnimateValues = require('../animate-values.js');
var animationTemplate = require('./animation-template.tpl');
-var TipsyTooltipView = require('../../../cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('../../../builder/components/tipsy-tooltip-view');
/**
* View to reset render range.
diff --git a/lib/assets/test/spec/cartodb3/app-notifications.spec.js b/lib/assets/test/spec/builder/app-notifications.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/app-notifications.spec.js
rename to lib/assets/test/spec/builder/app-notifications.spec.js
index 13a6fe3576..09013b447a 100644
--- a/lib/assets/test/spec/cartodb3/app-notifications.spec.js
+++ b/lib/assets/test/spec/builder/app-notifications.spec.js
@@ -1,5 +1,5 @@
-var AppNotifications = require('cartodb3/app-notifications');
-var ConfigModel = require('cartodb3/data/config-model');
+var AppNotifications = require('builder/app-notifications');
+var ConfigModel = require('builder/data/config-model');
describe('app-notifications', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/apply-button/apply-button-view.spec.js b/lib/assets/test/spec/builder/components/apply-button/apply-button-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/apply-button/apply-button-view.spec.js
rename to lib/assets/test/spec/builder/components/apply-button/apply-button-view.spec.js
index 1ee629013c..2d3d287c6d 100644
--- a/lib/assets/test/spec/cartodb3/components/apply-button/apply-button-view.spec.js
+++ b/lib/assets/test/spec/builder/components/apply-button/apply-button-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var ApplyButtonView = require('cartodb3/components/apply-button/apply-button-view');
-var ApplyButtonTemplate = require('cartodb3/components/apply-button/apply-button.tpl');
+var ApplyButtonView = require('builder/components/apply-button/apply-button-view');
+var ApplyButtonTemplate = require('builder/components/apply-button/apply-button.tpl');
describe('components/apply-button-view', function () {
var view, overlayModel, onApplyClick;
diff --git a/lib/assets/test/spec/cartodb3/components/background-importer/background-import-item.spec.js b/lib/assets/test/spec/builder/components/background-importer/background-import-item.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/background-importer/background-import-item.spec.js
rename to lib/assets/test/spec/builder/components/background-importer/background-import-item.spec.js
index 41d89520bb..f951b2057b 100644
--- a/lib/assets/test/spec/cartodb3/components/background-importer/background-import-item.spec.js
+++ b/lib/assets/test/spec/builder/components/background-importer/background-import-item.spec.js
@@ -1,7 +1,7 @@
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var ImportsModel = require('cartodb3/data/background-importer/imports-model');
-var BackgroundImportItemView = require('cartodb3/components/background-importer/background-import-item-view');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var ImportsModel = require('builder/data/background-importer/imports-model');
+var BackgroundImportItemView = require('builder/components/background-importer/background-import-item-view');
var FactoryModals = require('../../factories/modals');
describe('editor/components/background-importer/background-import-item', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/background-importer/background-importer.spec.js b/lib/assets/test/spec/builder/components/background-importer/background-importer.spec.js
similarity index 73%
rename from lib/assets/test/spec/cartodb3/components/background-importer/background-importer.spec.js
rename to lib/assets/test/spec/builder/components/background-importer/background-importer.spec.js
index 3bd42edc56..754d80030d 100644
--- a/lib/assets/test/spec/cartodb3/components/background-importer/background-importer.spec.js
+++ b/lib/assets/test/spec/builder/components/background-importer/background-importer.spec.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
var cdb = require('cartodb.js');
var _ = require('underscore');
-var ImportsModel = require('cartodb3/data/background-importer/imports-model');
-var BackgroundImporter = require('cartodb3/components/background-importer/background-importer');
-var BackgroundPollingModel = require('cartodb3/data/background-importer/background-polling-model');
-var ImportsCollection = require('cartodb3/data/background-importer/background-importer-imports-collection');
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var ImportsModel = require('builder/data/background-importer/imports-model');
+var BackgroundImporter = require('builder/components/background-importer/background-importer');
+var BackgroundPollingModel = require('builder/data/background-importer/background-polling-model');
+var ImportsCollection = require('builder/data/background-importer/background-importer-imports-collection');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
var FactoryModals = require('../../factories/modals');
describe('editor/components/background-importer/background-importer', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/carousel-form-view.spec.js b/lib/assets/test/spec/builder/components/carousel-form-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/carousel-form-view.spec.js
rename to lib/assets/test/spec/builder/components/carousel-form-view.spec.js
index eacfc50d64..5b9004bb9d 100644
--- a/lib/assets/test/spec/cartodb3/components/carousel-form-view.spec.js
+++ b/lib/assets/test/spec/builder/components/carousel-form-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var CarouselFormView = require('cartodb3/components/carousel-form-view');
-var CustomCarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CarouselFormView = require('builder/components/carousel-form-view');
+var CustomCarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
describe('components/carousel-form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/code-mirror/code-mirror-view.spec.js b/lib/assets/test/spec/builder/components/code-mirror/code-mirror-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/code-mirror/code-mirror-view.spec.js
rename to lib/assets/test/spec/builder/components/code-mirror/code-mirror-view.spec.js
index bc51c50b3e..668d122a5f 100644
--- a/lib/assets/test/spec/cartodb3/components/code-mirror/code-mirror-view.spec.js
+++ b/lib/assets/test/spec/builder/components/code-mirror/code-mirror-view.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CodeMirror = require('codemirror');
-var CodeMirrorView = require('cartodb3/components/code-mirror/code-mirror-view');
+var CodeMirrorView = require('builder/components/code-mirror/code-mirror-view');
var SPACE_KEYCODE = 32;
diff --git a/lib/assets/test/spec/cartodb3/components/code-mirror/colorpicker.code-mirror.spec.js b/lib/assets/test/spec/builder/components/code-mirror/colorpicker.code-mirror.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/code-mirror/colorpicker.code-mirror.spec.js
rename to lib/assets/test/spec/builder/components/code-mirror/colorpicker.code-mirror.spec.js
index a1ee9dc450..0bdcbdc071 100644
--- a/lib/assets/test/spec/cartodb3/components/code-mirror/colorpicker.code-mirror.spec.js
+++ b/lib/assets/test/spec/builder/components/code-mirror/colorpicker.code-mirror.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var CodeMirror = require('codemirror');
-require('cartodb3/components/code-mirror/cartocss.code-mirror')(CodeMirror);
-var ColorpickerView = require('cartodb3/components/code-mirror/colorpicker.code-mirror');
+require('builder/components/code-mirror/cartocss.code-mirror')(CodeMirror);
+var ColorpickerView = require('builder/components/code-mirror/colorpicker.code-mirror');
var Pos = CodeMirror.Pos;
function fireMouseEvent (obj, evtName) {
diff --git a/lib/assets/test/spec/cartodb3/components/context-menu/context-menu-view.spec.js b/lib/assets/test/spec/builder/components/context-menu/context-menu-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/context-menu/context-menu-view.spec.js
rename to lib/assets/test/spec/builder/components/context-menu/context-menu-view.spec.js
index 3870bff310..629431a490 100644
--- a/lib/assets/test/spec/cartodb3/components/context-menu/context-menu-view.spec.js
+++ b/lib/assets/test/spec/builder/components/context-menu/context-menu-view.spec.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var _ = require('underscore');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var ContextMenuView = require('cartodb3/components/context-menu/context-menu-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var ContextMenuView = require('builder/components/context-menu/context-menu-view');
var ESCAPE_KEY_CODE = 27;
diff --git a/lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-collection.spec.js b/lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-collection.spec.js
similarity index 77%
rename from lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-collection.spec.js
rename to lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-collection.spec.js
index 25ce898f1b..7bf2db13cd 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-collection.spec.js
@@ -1,5 +1,5 @@
-var CustomCarouselItemModel = require('cartodb3/components/custom-carousel/custom-carousel-item-model');
-var CustomCarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var CustomCarouselItemModel = require('builder/components/custom-carousel/custom-carousel-item-model');
+var CustomCarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
describe('components/custom-carousel/custom-carousel-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-item-view.spec.js b/lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-item-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-item-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-item-view.spec.js
index a263836640..2cc7878085 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-item-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var CustomCarouselItemModel = require('cartodb3/components/custom-carousel/custom-carousel-item-model');
-var CustomCarouselItemView = require('cartodb3/components/custom-carousel/custom-carousel-item-view');
+var CustomCarouselItemModel = require('builder/components/custom-carousel/custom-carousel-item-model');
+var CustomCarouselItemView = require('builder/components/custom-carousel/custom-carousel-item-view');
describe('components/custom-carousel/custom-carousel-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-view.spec.js b/lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-view.spec.js
index d17ba2da0e..fd8bb6bf37 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-carousel/custom-carousel-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-carousel/custom-carousel-view.spec.js
@@ -1,4 +1,4 @@
-var CustomCarouselView = require('cartodb3/components/custom-carousel/custom-carousel-view');
+var CustomCarouselView = require('builder/components/custom-carousel/custom-carousel-view');
describe('components/custom-carousel/custom-carousel-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-collection.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-list-collection.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-list-collection.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-list-collection.spec.js
index cc9f060629..c87f92a749 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-list-collection.spec.js
@@ -1,5 +1,5 @@
-var CustomListItemModel = require('cartodb3/components/custom-list/custom-list-item-model');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListItemModel = require('builder/components/custom-list/custom-list-item-model');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
describe('components/custom-list/custom-list-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-item-view.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-list-item-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-list-item-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-list-item-view.spec.js
index 7d5b54a8a1..a57d38120c 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-list-item-view.spec.js
@@ -1,5 +1,5 @@
-var CustomListItemModel = require('cartodb3/components/custom-list/custom-list-item-model');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
+var CustomListItemModel = require('builder/components/custom-list/custom-list-item-model');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
describe('components/custom-list/custom-list-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-multi-collection.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-list-multi-collection.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-list-multi-collection.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-list-multi-collection.spec.js
index f80357124d..491bf4b518 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-multi-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-list-multi-collection.spec.js
@@ -1,5 +1,5 @@
-var CustomListItemModel = require('cartodb3/components/custom-list/custom-list-item-model');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-multi-collection');
+var CustomListItemModel = require('builder/components/custom-list/custom-list-item-model');
+var CustomListCollection = require('builder/components/custom-list/custom-list-multi-collection');
describe('components/custom-list/custom-list-multi-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-multi-item-view.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-list-multi-item-view.spec.js
similarity index 75%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-list-multi-item-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-list-multi-item-view.spec.js
index 21c0493af8..126dfc6527 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-multi-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-list-multi-item-view.spec.js
@@ -1,5 +1,5 @@
-var CustomListItemModel = require('cartodb3/components/custom-list/custom-list-item-model');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-multi-item-view');
+var CustomListItemModel = require('builder/components/custom-list/custom-list-item-model');
+var CustomListItemView = require('builder/components/custom-list/custom-list-multi-item-view');
describe('components/custom-list/custom-list-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-search-view.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-list-search-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-list-search-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-list-search-view.spec.js
index e69a1cd712..09b3633918 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-search-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-list-search-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var CustomListSearchView = require('cartodb3/components/custom-list/custom-list-search-view');
+var CustomListSearchView = require('builder/components/custom-list/custom-list-search-view');
describe('components/custom-list/custom-list-search-view', function () {
var createViewFn = function (options) {
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-view.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-list-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-list-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-list-view.spec.js
index 20d61048c8..432114ec68 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-list-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var CustomListView = require('cartodb3/components/custom-list/custom-list-view');
-var CustomCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var itemTemplate = require('cartodb3/components/custom-list/custom-list-item.tpl');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
+var CustomListView = require('builder/components/custom-list/custom-list-view');
+var CustomCollection = require('builder/components/custom-list/custom-list-collection');
+var itemTemplate = require('builder/components/custom-list/custom-list-item.tpl');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
describe('components/custom-list/custom-list-view', function () {
var mouseOverAction;
diff --git a/lib/assets/test/spec/cartodb3/components/custom-list/custom-view.spec.js b/lib/assets/test/spec/builder/components/custom-list/custom-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/custom-list/custom-view.spec.js
rename to lib/assets/test/spec/builder/components/custom-list/custom-view.spec.js
index a3f94c047e..b1b281e3f4 100644
--- a/lib/assets/test/spec/cartodb3/components/custom-list/custom-view.spec.js
+++ b/lib/assets/test/spec/builder/components/custom-list/custom-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var CustomView = require('cartodb3/components/custom-list/custom-view');
+var CustomView = require('builder/components/custom-list/custom-view');
describe('components/custom-list/custom-view', function () {
var mouseOverAction;
diff --git a/lib/assets/test/spec/cartodb3/components/dropdown-overlay/dropdown-overlay.spec.js b/lib/assets/test/spec/builder/components/dropdown-overlay/dropdown-overlay.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/dropdown-overlay/dropdown-overlay.spec.js
rename to lib/assets/test/spec/builder/components/dropdown-overlay/dropdown-overlay.spec.js
index 0d73c1e5bd..34e638ae04 100644
--- a/lib/assets/test/spec/cartodb3/components/dropdown-overlay/dropdown-overlay.spec.js
+++ b/lib/assets/test/spec/builder/components/dropdown-overlay/dropdown-overlay.spec.js
@@ -1,5 +1,5 @@
var $ = require('jquery');
-var DropdownOverlayView = require('cartodb3/components/dropdown-overlay/dropdown-overlay-view');
+var DropdownOverlayView = require('builder/components/dropdown-overlay/dropdown-overlay-view');
describe('components/dropdown-overlay/dropdown-overlay', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/error/error-view.spec.js b/lib/assets/test/spec/builder/components/error/error-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/error/error-view.spec.js
rename to lib/assets/test/spec/builder/components/error/error-view.spec.js
index 779190bcf8..c55db685cd 100644
--- a/lib/assets/test/spec/cartodb3/components/error/error-view.spec.js
+++ b/lib/assets/test/spec/builder/components/error/error-view.spec.js
@@ -1,4 +1,4 @@
-var ErrorView = require('cartodb3/components/error/error-view');
+var ErrorView = require('builder/components/error/error-view');
describe('components/error/error-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-form-model.spec.js b/lib/assets/test/spec/builder/components/export-image-pane/export-image-form-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-form-model.spec.js
rename to lib/assets/test/spec/builder/components/export-image-pane/export-image-form-model.spec.js
index 2924a1a5e9..582aa73773 100644
--- a/lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-form-model.spec.js
+++ b/lib/assets/test/spec/builder/components/export-image-pane/export-image-form-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
require('backbone-forms');
-var ExportImageFormModel = require('cartodb3/editor/export-image-pane/export-image-form-model');
+var ExportImageFormModel = require('builder/editor/export-image-pane/export-image-form-model');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-pane.spec.js b/lib/assets/test/spec/builder/components/export-image-pane/export-image-pane.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-pane.spec.js
rename to lib/assets/test/spec/builder/components/export-image-pane/export-image-pane.spec.js
index 7fcbcb06a8..950d6afa01 100644
--- a/lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-pane.spec.js
+++ b/lib/assets/test/spec/builder/components/export-image-pane/export-image-pane.spec.js
@@ -1,12 +1,12 @@
var $ = require('jquery');
var Backbone = require('backbone');
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var ExportImagePane = require('cartodb3/editor/export-image-pane/export-image-pane');
-var MapDefinitionModel = require('cartodb3/data/map-definition-model');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var EditorModel = require('cartodb3/data/editor-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var ExportImagePane = require('builder/editor/export-image-pane/export-image-pane');
+var MapDefinitionModel = require('builder/data/map-definition-model');
+var Notifier = require('builder/components/notifier/notifier');
+var EditorModel = require('builder/data/editor-model');
var GMAPS_DIMENSION_LIMIT = 640;
var GMAPS_DIMENSION_LIMIT_PREMIUM = 2048;
diff --git a/lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-widget.spec.js b/lib/assets/test/spec/builder/components/export-image-pane/export-image-widget.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-widget.spec.js
rename to lib/assets/test/spec/builder/components/export-image-pane/export-image-widget.spec.js
index 2d6bb4ec60..cf4b330c87 100644
--- a/lib/assets/test/spec/cartodb3/components/export-image-pane/export-image-widget.spec.js
+++ b/lib/assets/test/spec/builder/components/export-image-pane/export-image-widget.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var ExportImageWidget = require('cartodb3/editor/export-image-pane/export-image-widget');
-var ExportImageFormModel = require('cartodb3/editor/export-image-pane/export-image-form-model');
-var MapDefinitionModel = require('cartodb3/data/map-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var ExportImageWidget = require('builder/editor/export-image-pane/export-image-widget');
+var ExportImageFormModel = require('builder/editor/export-image-pane/export-image-form-model');
+var MapDefinitionModel = require('builder/data/map-definition-model');
var TRACK_CONTEXT_CLASS = 'track-ImageExport';
describe('editor/export-image-pane/export-image-widget', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/base.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/base.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/base.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/base.spec.js
index fe5afad6df..cc75ada626 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/base.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/base.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var FactoryModals = require('../../../factories/modals');
-var EditorHelpers = require('cartodb3/components/form-components/editors/editor-helpers-extend');
+var EditorHelpers = require('builder/components/form-components/editors/editor-helpers-extend');
function dispatchDocumentEvent (type, opts) {
var e = document.createEvent('HTMLEvents');
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.spec.js
index aa57333689..8e1a01a9d4 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var MeasurementModel = require('cartodb3/data/data-observatory/measurement-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var MeasurementModel = require('builder/data/data-observatory/measurement-model');
describe('components/form-components/editors/data-observatory-measurements/data-observatory-measurements-view', function () {
var createViewFn = function (options) {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-count-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-count-view.spec.js
index 18f72d8350..e7620aeb73 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-count-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-count-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var DataObservatoryCountView = require('cartodb3/components/form-components/editors/data-observatory-measurements//measurements-count-view');
+var DataObservatoryCountView = require('builder/components/form-components/editors/data-observatory-measurements//measurements-count-view');
describe('components/form-components/editors/data-observatory-measurements/measurements-count-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-list-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-list-view.spec.js
index 20d81e31b1..b4b497bc01 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-list-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var MeasurementsCollection = require('cartodb3/data/data-observatory/measurements-collection');
-var FiltersCollection = require('cartodb3/data/data-observatory/filters-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var DataObservatoryListView = require('cartodb3/components/form-components/editors/data-observatory-measurements/measurements-list-view');
-var MeasurementModel = require('cartodb3/data/data-observatory/measurement-model');
+var MeasurementsCollection = require('builder/data/data-observatory/measurements-collection');
+var FiltersCollection = require('builder/data/data-observatory/filters-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var DataObservatoryListView = require('builder/components/form-components/editors/data-observatory-measurements/measurements-list-view');
+var MeasurementModel = require('builder/data/data-observatory/measurement-model');
describe('components/form-components/editors/data-observatory-measurements/measurements-list-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-search-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-search-view.spec.js
index f9a4f5e4bc..df130ed187 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/data-observatory-measurements/measurements-search-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var DataObservatorySearchView = require('cartodb3/components/form-components/editors/data-observatory-measurements/measurements-search-view');
-var FiltersCollection = require('cartodb3/data/data-observatory/filters-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var DataObservatorySearchView = require('builder/components/form-components/editors/data-observatory-measurements/measurements-search-view');
+var FiltersCollection = require('builder/data/data-observatory/filters-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('components/form-components/editors/data-observatory-measurements/measurements-search-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/datetime.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/datetime.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/datetime.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/datetime.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/enabler-editor-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/enabler-editor-view.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/enabler-editor-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/enabler-editor-view.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/enabler-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/enabler-view.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/enabler-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/enabler-view.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/color-picker/color-picker.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/color-picker/color-picker.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/color-picker/color-picker.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/color-picker/color-picker.spec.js
index 765795b06d..c1a8209f63 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/color-picker/color-picker.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/color-picker/color-picker.spec.js
@@ -1,5 +1,5 @@
var $ = require('jquery');
-var ColorPicker = require('cartodb3/components/form-components/editors/fill/color-picker/color-picker');
+var ColorPicker = require('builder/components/form-components/editors/fill/color-picker/color-picker');
var ESCAPE_KEY_CODE = 27;
var simulateEscapeKeyPress = function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/fill-dialog.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/fill-dialog.spec.js
similarity index 79%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/fill-dialog.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/fill-dialog.spec.js
index 3d41835aee..675b88b6fc 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/fill-dialog.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/fill-dialog.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var FillDialogModel = require('cartodb3/components/form-components/editors/fill/fill-dialog-model');
-var FillDialogView = require('cartodb3/components/form-components/editors/fill/fill-dialog');
+var FillDialogModel = require('builder/components/form-components/editors/fill/fill-dialog-model');
+var FillDialogView = require('builder/components/form-components/editors/fill/fill-dialog');
describe('components/form-components/editors/fill/fill-dialog', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color.spec.js
index 176181c668..721ce79037 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var InputColor = require('cartodb3/components/form-components/editors/fill/input-color/input-color');
-var rampList = require('cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/ramps');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var InputColor = require('builder/components/form-components/editors/fill/input-color/input-color');
+var rampList = require('builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/ramps');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
var FactoryModals = require('../../../../factories/modals');
describe('components/form-components/editors/fill/input-color', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.spec.js
index 12504c5e29..cb8c74c605 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var AssetHeaderView = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view');
+var AssetHeaderView = require('builder/components/form-components/editors/fill/input-color/assets-picker/asset-header-view');
describe('components/form-components/editors/fill/input-color/assets-picker/asset-header-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.spec.js
index 8ad4d7bde5..2db4f19748 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var AssetsListView = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view');
+var AssetsListView = require('builder/components/form-components/editors/fill/input-color/assets-picker/assets-list-view');
describe('components/form-components/editors/fill/input-color/asset-picker/assets-list-view', function () {
function createViewFn (options) {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.spec.js
index 148ba510da..5fa588232c 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/assets-view.spec.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AssetsView = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AssetsView = require('builder/components/form-components/editors/fill/input-color/assets-picker/assets-view');
describe('components/form-components/editors/fill/input-color/assets-view', function () {
var createCalls = [];
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.spec.js
index 88051a0b49..5a7c387c41 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var InputAssetPickerHeader = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header');
+var InputAssetPickerHeader = require('builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header');
describe('components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-header', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.spec.js
index cbd8d41b81..cddf043f75 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view.spec.js
@@ -1,6 +1,6 @@
-var InputAssetPickerView = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view');
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var InputAssetPickerView = require('builder/components/form-components/editors/fill/input-color/assets-picker/input-asset-picker-view');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
var FactoryModals = require('../../../../../../factories/modals');
var Backbone = require('backbone');
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.spec.js
index 7b24ef0a1d..fe823f474b 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view.spec.js
@@ -1,10 +1,10 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AssetsCollection = require('cartodb3/data/assets-collection');
-var OrganizationAssetsCollection = require('cartodb3/data/organization-assets-collection');
-var OrganizationAssetsListView = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AssetsCollection = require('builder/data/assets-collection');
+var OrganizationAssetsCollection = require('builder/data/organization-assets-collection');
+var OrganizationAssetsListView = require('builder/components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view');
describe('components/form-components/editors/fill/input-color/assets-picker/organization-assets-list-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.spec.js
index 2c7b0db71f..a202fff85a 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var View = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view');
+var View = require('builder/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view');
describe('components/form-components/editors/fill/input-color/asset-picker/static-asset-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.spec.js
index e98d7509ef..d107ba2726 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var UploadAssetsTab = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var UploadAssetsTab = require('builder/components/form-components/editors/fill/input-color/assets-picker/upload-assets-tab');
describe('components/form-components/editors/fill/input-color/assets-picker/upoad-assets-tab', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.spec.js
index 5ad0c66049..b43d63b6b7 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view.spec.js
@@ -1,11 +1,11 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var UserAssetsListView = require('cartodb3/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view');
-var AssetsCollection = require('cartodb3/data/assets-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var OrganizationAssetsCollection = require('cartodb3/data/organization-assets-collection');
-var AssetModel = require('cartodb3/data/asset-model');
+var UserAssetsListView = require('builder/components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view');
+var AssetsCollection = require('builder/data/assets-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var OrganizationAssetsCollection = require('builder/data/organization-assets-collection');
+var AssetModel = require('builder/data/asset-model');
describe('components/form-components/editors/fill/input-color/assets-picker/user-assets-list-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-dialog-content.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-dialog-content.spec.js
index 1344575f2f..7b4c3c2241 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-dialog-content.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var InputColorDialogContent = require('cartodb3/components/form-components/editors/fill/input-color/input-color-dialog-content');
+var InputColorDialogContent = require('builder/components/form-components/editors/fill/input-color/input-color-dialog-content');
var FactoryModals = require('../../../../../factories/modals');
describe('components/form-components/editors/fill/input-color/input-color-dialog-content', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-file-view.spec.js
similarity index 79%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-file-view.spec.js
index b6b01603fa..4740cb3e8d 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-file-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-file-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var InputColorFileView = require('cartodb3/components/form-components/editors/fill/input-color/input-color-file-view');
-var utils = require('cartodb3/helpers/utils');
-var MakiIcons = require('cartodb3/components/form-components/editors/fill/input-color/assets/maki-icons');
+var ConfigModel = require('builder/data/config-model');
+var InputColorFileView = require('builder/components/form-components/editors/fill/input-color/input-color-file-view');
+var utils = require('builder/helpers/utils');
+var MakiIcons = require('builder/components/form-components/editors/fill/input-color/assets/maki-icons');
var FactoryModals = require('../../../../../factories/modals');
describe('components/form-components/editors/fill/input-color/input-color-file-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view.spec.js
index 6f74554221..42fbb488b7 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view.spec.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var InputColorFixedContentView = require('cartodb3/components/form-components/editors/fill/input-color/input-color-fixed-content-view');
+var ConfigModel = require('builder/data/config-model');
+var InputColorFixedContentView = require('builder/components/form-components/editors/fill/input-color/input-color-fixed-content-view');
var FactoryModals = require('../../../../../factories/modals');
describe('components/form-components/editors/fill/input-color/input-color-fixed-content-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-picker-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-picker-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-picker-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-picker-view.spec.js
index 8ece3f6f70..86201e0b56 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-picker-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-picker-view.spec.js
@@ -1,4 +1,4 @@
-var InputColorPickerView = require('cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view');
+var InputColorPickerView = require('builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view');
describe('components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.spec.js
index 8cf4d6023f..47bbf49ece 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var InputColorPickerHeader = require('cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header');
+var InputColorPickerHeader = require('builder/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header');
describe('components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.spec.js
index 5b04487185..8a1c3f20ac 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view.spec.js
@@ -1,6 +1,6 @@
-var CustomListItemModel = require('cartodb3/components/custom-list/custom-list-item-model');
-var CategoriesListItemView = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view');
-var inputColorCategoriesListItemTemplate = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item.tpl');
+var CustomListItemModel = require('builder/components/custom-list/custom-list-item-model');
+var CategoriesListItemView = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view');
+var inputColorCategoriesListItemTemplate = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item.tpl');
describe('components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-item-view/categories-list-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.spec.js
index 78d44efd0b..48c6416fd6 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var CategoriesListView = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view');
+var CategoriesListView = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view');
describe('components/form-components/editors/fill/input-color/input-qualitative-ramps/categories-list/list-view/input-categories-list-view', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-item-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-item-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-item-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-item-view.spec.js
index 6ef3e31eea..481d063ddb 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-item-view.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var InputCategoriesRampsListItemView = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view');
-var InputCategoriesRampsListItemTemplate = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item.tpl');
+var InputCategoriesRampsListItemView = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view');
+var InputCategoriesRampsListItemTemplate = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item.tpl');
describe('components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-item-view/color-ramps-list-item-view', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-view.spec.js
index 78fbac225c..ba27c6c876 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/color-ramps-list-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var InputCategoriesRampsListView = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view');
+var InputCategoriesRampsListView = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view');
describe('components/form-components/editors/fill/input-color/input-qualitative-ramps/color-ramps-list/list-view/color-ramps-list-view', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.spec.js
index bfb60d0a8d..0ad52cf35d 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var InputColorCategories = require('cartodb3/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var InputColorCategories = require('builder/components/form-components/editors/fill/input-color/input-qualitative-ramps/main-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
var FactoryModals = require('../../../../../../factories/modals');
var rampList = require('cartocolor');
var cdb = require('cartodb.js');
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-color-ramps.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-color-ramps.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-color-ramps.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-color-ramps.spec.js
index 3fedf10882..7ac9cd4023 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-color-ramps.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-color-ramps.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var InputColorRamps = require('cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view');
+var InputColorRamps = require('builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view');
describe('components/form-components/editors/fill/input-color/input-quantitative-ramps/main-view', function () {
describe('on model with a range', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.spec.js
index aca3bed3d9..7a37f7ef39 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var InputRampContentView = require('cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view');
+var InputRampContentView = require('builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view');
describe('components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-content-view', function () {
function createView (opacity) {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.spec.js
index ec1d56637d..ef32c6c9b5 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var InputRampListView = require('cartodb3/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view');
+var InputRampListView = require('builder/components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view');
var rampList = require('cartocolor');
describe('components/form-components/editors/fill/input-color/input-quantitative-ramps/input-ramp-list-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-number.spec.js
index 188fe8dfa6..ca6e6d4151 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var InputNumber = require('cartodb3/components/form-components/editors/fill/input-number/input-number');
+var InputNumber = require('builder/components/form-components/editors/fill/input-number/input-number');
describe('components/form-components/editors/fill/input-number', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-content-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-content-view.spec.js
index d502365800..9aa6d84cd5 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-content-view.spec.js
@@ -1,6 +1,6 @@
var cdb = require('cartodb.js');
var Backbone = require('backbone');
-var InputNumberContentView = require('cartodb3/components/form-components/editors/fill/input-number/input-number-content-view');
+var InputNumberContentView = require('builder/components/form-components/editors/fill/input-number/input-number-content-view');
describe('components/form-components/editors/fill/input-number/input-number-content-view', function () {
describe('on model with a range', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-dialog-content.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-dialog-content.spec.js
index f9238382ce..a0f4d8118b 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-dialog-content.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var InputNumberDialogContent = require('cartodb3/components/form-components/editors/fill/input-number/input-number-dialog-content');
+var InputNumberDialogContent = require('builder/components/form-components/editors/fill/input-number/input-number-dialog-content');
var COLUMNS = ['schmeckles', 'flurbos'];
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.spec.js
index 3352cb119b..c0d8b15e5c 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/fill/input-number/input-number-value-content-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var InputNumberValueContentView = require('cartodb3/components/form-components/editors/fill/input-number/input-number-value-content-view');
+var InputNumberValueContentView = require('builder/components/form-components/editors/fill/input-number/input-number-value-content-view');
describe('components/form-components/editors/fill/input-number/input-number-value-content-view', function () {
describe('on model with a range', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/lazy-select/lazy-search-collection.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/lazy-select/lazy-search-collection.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/lazy-select/lazy-search-collection.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/lazy-select/lazy-search-collection.spec.js
index d58cc219e0..bb6df9be0e 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/lazy-select/lazy-search-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/lazy-select/lazy-search-collection.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var LazySearchCollection = require('cartodb3/components/form-components/editors/lazy-select/lazy-search-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var LazySearchCollection = require('builder/components/form-components/editors/lazy-select/lazy-search-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('components/form-components/editors/lazy-select/lazy-search-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/lazy-select/lazy-select-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/lazy-select/lazy-select-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/lazy-select/lazy-select-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/lazy-select/lazy-select-view.spec.js
index 3bd6d59c11..50c8937bee 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/lazy-select/lazy-select-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/lazy-select/lazy-select-view.spec.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var Backbone = require('backbone');
var _ = require('underscore');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('components/form-components/editors/lazy-select', function () {
var dispatchDocumentEvent = function (type, opts) {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/list/list-item.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/list/list-item.spec.js
similarity index 99%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/list/list-item.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/list/list-item.spec.js
index 97a0f643dd..231a2f531e 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/list/list-item.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/list/list-item.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
// Required for affected specs, because we use backbone-forms through a global namespace
-require('cartodb3/components/form-components/editors/list/list-item');
+require('builder/components/form-components/editors/list/list-item');
describe('components/form-components/editors/list/list-item', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/list/list.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/list/list.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/list/list.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/list/list.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/number.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/number.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/number.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/number.spec.js
index 73443bd220..cddba62a01 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/number.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/number.spec.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
// Required for affected specs, because we use backbone-forms through a global namespace
-require('cartodb3/components/form-components/editors/number/number.js');
+require('builder/components/form-components/editors/number/number.js');
var ARROW_UP_KEY = 38;
var ARROW_DOWN_KEY = 40;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-list-model.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/operators/operators-list-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-list-model.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/operators/operators-list-model.spec.js
index 34bc87345f..ff133f3fc5 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-list-model.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/operators/operators-list-model.spec.js
@@ -1,4 +1,4 @@
-var OperatorsListModel = require('cartodb3/components/form-components/editors/operators/operators-list-model');
+var OperatorsListModel = require('builder/components/form-components/editors/operators/operators-list-model');
describe('components/form-components/operators/operators-list-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/operators/operators-list-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/operators/operators-list-view.spec.js
index 311172d8f8..351c0adb0e 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/operators/operators-list-view.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var $ = require('jquery');
-var OperatorsListView = require('cartodb3/components/form-components/editors/operators/operators-list-view');
-var CustomListCollection = require('cartodb3/components/form-components/editors/operators/operators-list-collection');
+var OperatorsListView = require('builder/components/form-components/editors/operators/operators-list-view');
+var CustomListCollection = require('builder/components/form-components/editors/operators/operators-list-collection');
describe('components/form-components/operators/operators-list-view', function () {
var view, collection;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/operators/operators-view.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/operators/operators-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/operators/operators-view.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/radio.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/radio.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/radio.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/radio.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/select-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/select-list-view.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/select-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/select-list-view.spec.js
index 25becf0307..b555d5b183 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/select-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/select-list-view.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var SelectListView = require('cartodb3/components/form-components/editors/select/select-list-view');
-var ItemTemplate = require('cartodb3/components/custom-list/custom-list-item.tpl');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var SelectListView = require('builder/components/form-components/editors/select/select-list-view');
+var ItemTemplate = require('builder/components/custom-list/custom-list-item.tpl');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
describe('components/form-components/editors/select-list-view', function () {
var mouseOverAction;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/multi-select-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/select/multi-select-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/select/multi-select-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/select/multi-select-view.spec.js
index e68d36ec83..0ea8bdeee2 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/multi-select-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/select/multi-select-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
// Required for affected specs, because we use backbone-forms through a global namespace
-require('cartodb3/components/form-components/editors/select/multi-select-view.js');
+require('builder/components/form-components/editors/select/multi-select-view.js');
function viewFactory (model) {
return new Backbone.Form.editors.MultiSelect({
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-list-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/select/select-list-view.spec.js
similarity index 78%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-list-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/select/select-list-view.spec.js
index 67eecaa7db..d98938eb0c 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-list-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/select/select-list-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var SelectListView = require('cartodb3/components/form-components/editors/select/select-list-view');
-var itemListTemplate = require('cartodb3/components/custom-list/custom-list-item.tpl');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
-var CustomListItemView = require('cartodb3/components/custom-list/custom-list-item-view');
+var SelectListView = require('builder/components/form-components/editors/select/select-list-view');
+var itemListTemplate = require('builder/components/custom-list/custom-list-item.tpl');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
+var CustomListItemView = require('builder/components/custom-list/custom-list-item-view');
describe('components/form-components/editors/select/select-list-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-placeholder.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/select/select-placeholder.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-placeholder.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/select/select-placeholder.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/select/select-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/select/select-view.spec.js
index 84815452f6..a13a7a347c 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/select/select-view.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/select/select-view.spec.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
var Backbone = require('backbone');
var _ = require('underscore');
-var CustomListCollection = require('cartodb3/components/custom-list/custom-list-collection');
+var CustomListCollection = require('builder/components/custom-list/custom-list-collection');
describe('components/form-components/editors/select', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/slider.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/slider.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/slider.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/slider.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/suggest-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/suggest-view.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/suggest-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/suggest-view.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/taglist-view.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/taglist-view.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/taglist-view.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/taglist-view.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/text.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/text.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/text.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/text.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/textarea.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/textarea.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/textarea.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/textarea.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/toggle.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/toggle.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/toggle.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/toggle.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/track-class.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/track-class.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/track-class.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/track-class.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/editors/validators/column-type.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/validators/column-type.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/form-components/editors/validators/column-type.spec.js
rename to lib/assets/test/spec/builder/components/form-components/editors/validators/column-type.spec.js
index 4bf37e4171..27dc270475 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/editors/validators/column-type.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/editors/validators/column-type.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var ValidatorClass = require('cartodb3/components/form-components/validators/column-type');
+var ValidatorClass = require('builder/components/form-components/validators/column-type');
var Validator = ValidatorClass({
type: 'columnType',
diff --git a/lib/assets/test/spec/cartodb3/components/form-components/field.spec.js b/lib/assets/test/spec/builder/components/form-components/field.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/form-components/field.spec.js
rename to lib/assets/test/spec/builder/components/form-components/field.spec.js
index bb203adb2a..200f17ad6c 100644
--- a/lib/assets/test/spec/cartodb3/components/form-components/field.spec.js
+++ b/lib/assets/test/spec/builder/components/form-components/field.spec.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
var Backbone = require('backbone');
require('backbone-forms');
Backbone.$ = $;
-require('cartodb3/components/form-components/field.js');
+require('builder/components/form-components/field.js');
describe('components/form-components/field', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/icon/icon-view.spec.js b/lib/assets/test/spec/builder/components/icon/icon-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/icon/icon-view.spec.js
rename to lib/assets/test/spec/builder/components/icon/icon-view.spec.js
index 568ee48de1..a5a297fbfd 100644
--- a/lib/assets/test/spec/cartodb3/components/icon/icon-view.spec.js
+++ b/lib/assets/test/spec/builder/components/icon/icon-view.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
-var IconView = require('cartodb3/components/icon/icon-view');
-var warningIconTemplate = require('cartodb3/components/icon/templates/warning.tpl');
+var IconView = require('builder/components/icon/icon-view');
+var warningIconTemplate = require('builder/components/icon/templates/warning.tpl');
describe('components/icon', function () {
var createViewFn = function (options) {
diff --git a/lib/assets/test/spec/cartodb3/components/img-loader-view.spec.js b/lib/assets/test/spec/builder/components/img-loader-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/img-loader-view.spec.js
rename to lib/assets/test/spec/builder/components/img-loader-view.spec.js
index 4696fcd602..ee9cd7b35e 100644
--- a/lib/assets/test/spec/cartodb3/components/img-loader-view.spec.js
+++ b/lib/assets/test/spec/builder/components/img-loader-view.spec.js
@@ -1,4 +1,4 @@
-var ImgLoaderView = require('cartodb3/components/img-loader-view');
+var ImgLoaderView = require('builder/components/img-loader-view');
describe('components/img-loader-view', function () {
var svgResponse = {
diff --git a/lib/assets/test/spec/cartodb3/components/infobox/infobox-collection.spec.js b/lib/assets/test/spec/builder/components/infobox/infobox-collection.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/infobox/infobox-collection.spec.js
rename to lib/assets/test/spec/builder/components/infobox/infobox-collection.spec.js
index 5f4fc3462c..e9825f4952 100644
--- a/lib/assets/test/spec/cartodb3/components/infobox/infobox-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/infobox/infobox-collection.spec.js
@@ -1,4 +1,4 @@
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
describe('components/infobox/infobox-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/infobox/infobox-factory.spec.js b/lib/assets/test/spec/builder/components/infobox/infobox-factory.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/infobox/infobox-factory.spec.js
rename to lib/assets/test/spec/builder/components/infobox/infobox-factory.spec.js
index c39038c114..ddbfc0a180 100644
--- a/lib/assets/test/spec/cartodb3/components/infobox/infobox-factory.spec.js
+++ b/lib/assets/test/spec/builder/components/infobox/infobox-factory.spec.js
@@ -1,4 +1,4 @@
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
+var Infobox = require('builder/components/infobox/infobox-factory');
describe('components/infobox/infobox-factory', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/infobox/infobox-item-view.spec.js b/lib/assets/test/spec/builder/components/infobox/infobox-item-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/infobox/infobox-item-view.spec.js
rename to lib/assets/test/spec/builder/components/infobox/infobox-item-view.spec.js
index 0414e6c4e6..eb5970f210 100644
--- a/lib/assets/test/spec/cartodb3/components/infobox/infobox-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/infobox/infobox-item-view.spec.js
@@ -1,4 +1,4 @@
-var InfoboxView = require('cartodb3/components/infobox/infobox-item-view');
+var InfoboxView = require('builder/components/infobox/infobox-item-view');
describe('components/infobox/infobox-item-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/infobox/infobox-view.spec.js b/lib/assets/test/spec/builder/components/infobox/infobox-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/infobox/infobox-view.spec.js
rename to lib/assets/test/spec/builder/components/infobox/infobox-view.spec.js
index 0d86e7defc..642bb70351 100644
--- a/lib/assets/test/spec/cartodb3/components/infobox/infobox-view.spec.js
+++ b/lib/assets/test/spec/builder/components/infobox/infobox-view.spec.js
@@ -1,7 +1,7 @@
-var Infobox = require('cartodb3/components/infobox/infobox-factory');
-var InfoboxView = require('cartodb3/components/infobox/infobox-view');
-var InfoboxModel = require('cartodb3/components/infobox/infobox-model');
-var InfoboxCollection = require('cartodb3/components/infobox/infobox-collection');
+var Infobox = require('builder/components/infobox/infobox-factory');
+var InfoboxView = require('builder/components/infobox/infobox-view');
+var InfoboxModel = require('builder/components/infobox/infobox-model');
+var InfoboxCollection = require('builder/components/infobox/infobox-collection');
describe('components/infobox/infobox-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/inline-editor/inline-editor-view.spec.js b/lib/assets/test/spec/builder/components/inline-editor/inline-editor-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/inline-editor/inline-editor-view.spec.js
rename to lib/assets/test/spec/builder/components/inline-editor/inline-editor-view.spec.js
index dbb4d94922..c652c572e2 100644
--- a/lib/assets/test/spec/cartodb3/components/inline-editor/inline-editor-view.spec.js
+++ b/lib/assets/test/spec/builder/components/inline-editor/inline-editor-view.spec.js
@@ -1,5 +1,5 @@
-var InlineEditorView = require('cartodb3/components/inline-editor/inline-editor-view');
-var template = require('cartodb3/editor/inline-editor.tpl');
+var InlineEditorView = require('builder/components/inline-editor/inline-editor-view');
+var template = require('builder/editor/inline-editor.tpl');
describe('components/inline-editor/inline-editor-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/likes/likes-model.spec.js b/lib/assets/test/spec/builder/components/likes/likes-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/likes/likes-model.spec.js
rename to lib/assets/test/spec/builder/components/likes/likes-model.spec.js
index bc50c07114..b37fdfa032 100644
--- a/lib/assets/test/spec/cartodb3/components/likes/likes-model.spec.js
+++ b/lib/assets/test/spec/builder/components/likes/likes-model.spec.js
@@ -1,4 +1,4 @@
-var LikesModel = require('cartodb3/components/likes/likes-model');
+var LikesModel = require('builder/components/likes/likes-model');
describe('components/likes/likes-model', function () {
describe('by default', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/likes/likes-view.spec.js b/lib/assets/test/spec/builder/components/likes/likes-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/likes/likes-view.spec.js
rename to lib/assets/test/spec/builder/components/likes/likes-view.spec.js
index 87a6919f44..819481a7e8 100644
--- a/lib/assets/test/spec/cartodb3/components/likes/likes-view.spec.js
+++ b/lib/assets/test/spec/builder/components/likes/likes-view.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
-var LikesView = require('cartodb3/components/likes/likes-view');
-var LikesModel = require('cartodb3/components/likes/likes-model');
+var LikesView = require('builder/components/likes/likes-view');
+var LikesModel = require('builder/components/likes/likes-model');
describe('components/likes/likes-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/local-storage.spec.js b/lib/assets/test/spec/builder/components/local-storage.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/local-storage.spec.js
rename to lib/assets/test/spec/builder/components/local-storage.spec.js
index bcc744f069..1850289094 100644
--- a/lib/assets/test/spec/cartodb3/components/local-storage.spec.js
+++ b/lib/assets/test/spec/builder/components/local-storage.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var LocalStorage = require('cartodb3/components/local-storage/local-storage');
+var LocalStorage = require('builder/components/local-storage/local-storage');
describe('components/local-storage', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/metrics/metrics-model.spec.js b/lib/assets/test/spec/builder/components/metrics/metrics-model.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/metrics/metrics-model.spec.js
rename to lib/assets/test/spec/builder/components/metrics/metrics-model.spec.js
index 80ff2590fd..44601e9e54 100644
--- a/lib/assets/test/spec/cartodb3/components/metrics/metrics-model.spec.js
+++ b/lib/assets/test/spec/builder/components/metrics/metrics-model.spec.js
@@ -1,5 +1,5 @@
-var MetricsModel = require('cartodb3/components/metrics/metrics-model.js');
-var ConfigModel = require('cartodb3/data/config-model');
+var MetricsModel = require('builder/components/metrics/metrics-model.js');
+var ConfigModel = require('builder/data/config-model');
describe('components/metrics/metrics-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/metrics/metrics-tracker.spec.js b/lib/assets/test/spec/builder/components/metrics/metrics-tracker.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/metrics/metrics-tracker.spec.js
rename to lib/assets/test/spec/builder/components/metrics/metrics-tracker.spec.js
index 6e71abe618..a7232a94b6 100644
--- a/lib/assets/test/spec/cartodb3/components/metrics/metrics-tracker.spec.js
+++ b/lib/assets/test/spec/builder/components/metrics/metrics-tracker.spec.js
@@ -1,5 +1,5 @@
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker.js');
-var MetricsModel = require('cartodb3/components/metrics/metrics-model.js');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker.js');
+var MetricsModel = require('builder/components/metrics/metrics-model.js');
var Backbone = require('backbone');
describe('components/metrics/metrics-tracker', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/add-analysis-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/add-analysis-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/add-analysis-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/add-analysis-view.spec.js
index e8ad96acbd..cc888fb3e4 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/add-analysis-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/add-analysis-view.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodessCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AddAnalysisView = require('cartodb3/components/modals/add-analysis/add-analysis-view');
-var UserModel = require('cartodb3/data/user-model');
-var DataServicesApiCheck = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
-var Router = require('cartodb3/routes/router');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodessCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AddAnalysisView = require('builder/components/modals/add-analysis/add-analysis-view');
+var UserModel = require('builder/data/user-model');
+var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var Router = require('builder/routes/router');
describe('components/modals/add-analysis/add-analysis-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/analysis-option-model.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/analysis-option-model.spec.js
index ba89681c32..2674a10d92 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/analysis-option-model.spec.js
@@ -1,8 +1,8 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var CamshaftReference = require('cartodb3/data/camshaft-reference');
-var AnalysisOptionModel = require('cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var CamshaftReference = require('builder/data/camshaft-reference');
+var AnalysisOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/analysis-option-model');
-describe('cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model', function () {
+describe('builder/components/modals/add-analysis/analysis-option-models/analysis-option-model', function () {
beforeEach(function () {
this.model = new AnalysisOptionModel({
title: 'a Buffer',
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.spec.js
similarity index 81%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.spec.js
index 289a84a19c..8f3a333848 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model.spec.js
@@ -1,7 +1,7 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var GeneratedAnalysisOptionModel = require('cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var GeneratedAnalysisOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model');
-describe('cartodb3/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model', function () {
+describe('builder/components/modals/add-analysis/analysis-option-models/generated-analysis-option-model', function () {
beforeEach(function () {
this.layerA = new LayerDefinitionModel({
id: 'layerA',
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.spec.js
similarity index 68%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.spec.js
index 91c941c588..ef980fee3a 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model.spec.js
@@ -1,7 +1,7 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var MergeAnalysisOptionModel = require('cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var MergeAnalysisOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model');
-describe('cartodb3/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model', function () {
+describe('builder/components/modals/add-analysis/analysis-option-models/merge-analysis-option-model', function () {
beforeEach(function () {
this.layerA = new LayerDefinitionModel({
id: 'layerA',
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-view.spec.js
index d46b8160e1..403dc381cb 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-option-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-option-view.spec.js
@@ -1,5 +1,5 @@
-var AnalysisOptionModel = require('cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model');
-var AnalysisOptionView = require('cartodb3/components/modals/add-analysis/analysis-option-view');
+var AnalysisOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/analysis-option-model');
+var AnalysisOptionView = require('builder/components/modals/add-analysis/analysis-option-view');
describe('components/modals/add-analysis/analysis-option-view', function () {
beforeEach(function () {
this.model = new AnalysisOptionModel({
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options-collection.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options-collection.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options-collection.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options-collection.spec.js
index d997b44b9f..72752eb0b1 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options-collection.spec.js
@@ -1,4 +1,4 @@
-var AnalysisOptionsCollection = require('cartodb3/components/modals/add-analysis/analysis-options-collection');
+var AnalysisOptionsCollection = require('builder/components/modals/add-analysis/analysis-options-collection');
describe('components/modals/add-analysis/analysis-options-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options.spec.js
index 9fb32f1313..3c930ca4b9 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
var _ = require('underscore');
var camshaftReferenceAnalyses = require('camshaft-reference').getVersion('latest').analyses;
-var analysisOptions = require('cartodb3/components/modals/add-analysis/analysis-options');
-var Analyses = require('cartodb3/data/analyses');
-var DataServicesApiCheck = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var analysisOptions = require('builder/components/modals/add-analysis/analysis-options');
+var Analyses = require('builder/data/analyses');
+var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
-describe('cartodb3/components/modals/add-analysis/analysis-options', function () {
+describe('builder/components/modals/add-analysis/analysis-options', function () {
var configModel = new Backbone.Model({
user_name: 'foo',
sql_api_template: 'foo',
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-view-pane.spec.js b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-view-pane.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-view-pane.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-analysis/analysis-view-pane.spec.js
index 4584157710..5372c5f816 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-view-pane.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-analysis/analysis-view-pane.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var AnalysisViewPane = require('cartodb3/components/modals/add-analysis/analysis-view-pane');
-var AnalysisOptionModel = require('cartodb3/components/modals/add-analysis/analysis-option-models/analysis-option-model');
-var Router = require('cartodb3/routes/router');
+var AnalysisViewPane = require('builder/components/modals/add-analysis/analysis-view-pane');
+var AnalysisOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/analysis-option-model');
+var Router = require('builder/routes/router');
describe('components/modals/add-analysis/analysis-view-pane', function () {
var view, analysisOptionsCollection;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/add-basemap-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/add-basemap-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/add-basemap-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/add-basemap-model.spec.js
index c7286758ee..d1448dd643 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/add-basemap-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/add-basemap-model.spec.js
@@ -1,11 +1,11 @@
-var AddBasemapModel = require('cartodb3/components/modals/add-basemap/add-basemap-model');
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var AddBasemapModel = require('builder/components/modals/add-basemap/add-basemap-model');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('components/modals/add-basemap/add-basemap-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/add-basemap-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/add-basemap-view.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/add-basemap-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/add-basemap-view.spec.js
index 18b549858b..8bb668ca8c 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/add-basemap-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/add-basemap-view.spec.js
@@ -1,12 +1,12 @@
-var AddBasemapView = require('cartodb3/components/modals/add-basemap/add-basemap-view');
-var AddBasemapModel = require('cartodb3/components/modals/add-basemap/add-basemap-model');
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ModalViewModel = require('cartodb3/components/modals/modal-view-model');
+var AddBasemapView = require('builder/components/modals/add-basemap/add-basemap-view');
+var AddBasemapModel = require('builder/components/modals/add-basemap/add-basemap-model');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ModalViewModel = require('builder/components/modals/modal-view-model');
describe('components/modals/add-basemap/add-basemap-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-model.spec.js
similarity index 77%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-model.spec.js
index 002f0222bd..f4f6439f19 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-model.spec.js
@@ -1,7 +1,7 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var MapboxModel = require('cartodb3/components/modals/add-basemap/mapbox/mapbox-model.js');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var ConfigModel = require('builder/data/config-model');
+var MapboxModel = require('builder/components/modals/add-basemap/mapbox/mapbox-model.js');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('editor/components/modals/add-basemap/mapbox/mapbox-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.spec.js
index b5f013861c..08b76a6ba2 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory.spec.js
@@ -1,5 +1,5 @@
var $ = require('jquery');
-var MapboxToTileLayerFactory = require('cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory');
+var MapboxToTileLayerFactory = require('builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory');
describe('editor/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-view.spec.js
index 1392fb6a97..834405c92a 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/mapbox/mapbox-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/mapbox/mapbox-view.spec.js
@@ -1,7 +1,7 @@
var $ = require('jquery');
-var MapboxView = require('cartodb3/components/modals/add-basemap/mapbox/mapbox-view');
-var MapboxModel = require('cartodb3/components/modals/add-basemap/mapbox/mapbox-model');
-var MapboxToTileLayerFactory = require('cartodb3/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory');
+var MapboxView = require('builder/components/modals/add-basemap/mapbox/mapbox-view');
+var MapboxModel = require('builder/components/modals/add-basemap/mapbox/mapbox-model');
+var MapboxToTileLayerFactory = require('builder/components/modals/add-basemap/mapbox/mapbox-to-tile-layer-factory');
describe('editor/components/modals/add-basemap/mapbox/mapbox-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/nasa/nasa-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/nasa/nasa-model.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/nasa/nasa-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/nasa/nasa-model.spec.js
index 05d14c1e27..c673c70cb4 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/nasa/nasa-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/nasa/nasa-model.spec.js
@@ -1,7 +1,7 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var NASAModel = require('cartodb3/components/modals/add-basemap/nasa/nasa-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var ConfigModel = require('builder/data/config-model');
+var NASAModel = require('builder/components/modals/add-basemap/nasa/nasa-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('components/modals/add-basemap/nasa/nasa-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/nasa/nasa-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/nasa/nasa-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/nasa/nasa-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/nasa/nasa-view.spec.js
index ccd120dec9..c4706ff7be 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/nasa/nasa-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/nasa/nasa-view.spec.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
-var NASAView = require('cartodb3/components/modals/add-basemap/nasa/nasa-view');
-var NASAModel = require('cartodb3/components/modals/add-basemap/nasa/nasa-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var ConfigModel = require('cartodb3/data/config-model');
+var NASAView = require('builder/components/modals/add-basemap/nasa/nasa-view');
+var NASAModel = require('builder/components/modals/add-basemap/nasa/nasa-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var ConfigModel = require('builder/data/config-model');
describe('components/modals/add-basemap/nasa/nasa-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tabs-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/tabs-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/tabs-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/tabs-view.spec.js
index 25777b9fe9..f69507fad0 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tabs-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/tabs-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var TabsView = require('cartodb3/components/modals/add-basemap/tabs-view');
+var TabsView = require('builder/components/modals/add-basemap/tabs-view');
describe('basemap-tabs-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-layer-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-layer-model.spec.js
index 586e647ae4..4543a9030c 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-layer-model.spec.js
@@ -1,5 +1,5 @@
-var TileJSONLayerModel = require('cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var TileJSONLayerModel = require('builder/components/modals/add-basemap/tilejson/tilejson-layer-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('components/modals/add-basemap/tilejson/tilejson-layer-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-model.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-model.spec.js
index c196eb68c7..d21566a238 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-model.spec.js
@@ -1,7 +1,7 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var TileJSONModel = require('cartodb3/components/modals/add-basemap/tilejson/tilejson-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var ConfigModel = require('builder/data/config-model');
+var TileJSONModel = require('builder/components/modals/add-basemap/tilejson/tilejson-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('components/modals/add-basemap/tilejson/tilejson-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-view.spec.js
index d099a7e051..4649fa4271 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/tilejson/tilejson-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/tilejson/tilejson-view.spec.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var $ = require('jquery');
-var ConfigModel = require('cartodb3/data/config-model');
-var TileJSONModel = require('cartodb3/components/modals/add-basemap/tilejson/tilejson-model');
-var TileJSONView = require('cartodb3/components/modals/add-basemap/tilejson/tilejson-view');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
-var TileJSONLayerModel = require('cartodb3/components/modals/add-basemap/tilejson/tilejson-layer-model');
+var ConfigModel = require('builder/data/config-model');
+var TileJSONModel = require('builder/components/modals/add-basemap/tilejson/tilejson-model');
+var TileJSONView = require('builder/components/modals/add-basemap/tilejson/tilejson-view');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
+var TileJSONLayerModel = require('builder/components/modals/add-basemap/tilejson/tilejson-layer-model');
describe('components/modals/add-basemap/tilejson/tilejson-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/select-layer-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/select-layer-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/select-layer-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/wms/select-layer-view.spec.js
index b2f872da09..de1f1e78b2 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/select-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/select-layer-view.spec.js
@@ -1,8 +1,8 @@
-var WMSModel = require('cartodb3/components/modals/add-basemap/wms/wms-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
-var SelectLayerView = require('cartodb3/components/modals/add-basemap/wms/select-layer-view');
+var WMSModel = require('builder/components/modals/add-basemap/wms/wms-model');
+var ConfigModel = require('builder/data/config-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
+var SelectLayerView = require('builder/components/modals/add-basemap/wms/select-layer-view');
describe('editor/components/modals/add-basemap/wms/select-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layer-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layer-model.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layer-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layer-model.spec.js
index 78d5bbc6bb..46b843f982 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layer-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layer-model.spec.js
@@ -1,6 +1,6 @@
-var LayersCollection = require('cartodb3/components/modals/add-basemap/wms/wms-layers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
-var WMSService = require('cartodb3/data/wms-service');
+var LayersCollection = require('builder/components/modals/add-basemap/wms/wms-layers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
+var WMSService = require('builder/data/wms-service');
describe('editor/components/modals/add-basemap/wms/wms-layer-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layer-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layer-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layer-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layer-view.spec.js
index 5a88d50723..ff4ff1af04 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layer-view.spec.js
@@ -1,9 +1,9 @@
-var LayerView = require('cartodb3/components/modals/add-basemap/wms/wms-layer-view');
-var LayerModel = require('cartodb3/components/modals/add-basemap/wms/wms-layer-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
-var WMSService = require('cartodb3/data/wms-service');
+var LayerView = require('builder/components/modals/add-basemap/wms/wms-layer-view');
+var LayerModel = require('builder/components/modals/add-basemap/wms/wms-layer-model');
+var ConfigModel = require('builder/data/config-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
+var WMSService = require('builder/data/wms-service');
describe('editor/components/modals/add-basemap/wms/wms-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layers-collection.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layers-collection.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layers-collection.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layers-collection.spec.js
index c67d324f22..e3a74122d5 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-layers-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-layers-collection.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
-var LayersCollection = require('cartodb3/components/modals/add-basemap/wms/wms-layers-collection');
-var WMSService = require('cartodb3/data/wms-service');
+var LayersCollection = require('builder/components/modals/add-basemap/wms/wms-layers-collection');
+var WMSService = require('builder/data/wms-service');
describe('editor/components/modals/add-basemap/wms/wms-layers-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-model.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-model.spec.js
index 0fd7bed21b..46c1265026 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-model.spec.js
@@ -1,6 +1,6 @@
-var WMSModel = require('cartodb3/components/modals/add-basemap/wms/wms-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
+var WMSModel = require('builder/components/modals/add-basemap/wms/wms-model');
+var ConfigModel = require('builder/data/config-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
describe('editor/components/modals/add-basemap/wms/wms-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-view.spec.js
index 971057d6f3..b8c61a4df7 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/wms/wms-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/wms/wms-view.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var $ = require('jquery');
-var WMSView = require('cartodb3/components/modals/add-basemap/wms/wms-view');
-var WMSModel = require('cartodb3/components/modals/add-basemap/wms/wms-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
+var WMSView = require('builder/components/modals/add-basemap/wms/wms-view');
+var WMSModel = require('builder/components/modals/add-basemap/wms/wms-model');
+var ConfigModel = require('builder/data/config-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
describe('editor/components/modals/add-basemap/wms/wms-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/xyz/xyz-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/xyz/xyz-model.spec.js
similarity index 82%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/xyz/xyz-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/xyz/xyz-model.spec.js
index 7049ebc4d6..5230782d8b 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/xyz/xyz-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/xyz/xyz-model.spec.js
@@ -1,7 +1,7 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var XYZModel = require('cartodb3/components/modals/add-basemap/xyz/xyz-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var ConfigModel = require('builder/data/config-model');
+var XYZModel = require('builder/components/modals/add-basemap/xyz/xyz-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('components/modals/add-basemap/xyz/xyz-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/xyz/xyz-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-basemap/xyz/xyz-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/modals/add-basemap/xyz/xyz-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-basemap/xyz/xyz-view.spec.js
index 01c426eccc..abb9895e24 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-basemap/xyz/xyz-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-basemap/xyz/xyz-view.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var $ = require('jquery');
-var XYZView = require('cartodb3/components/modals/add-basemap/xyz/xyz-view');
-var XYZModel = require('cartodb3/components/modals/add-basemap/xyz/xyz-model');
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var XYZView = require('builder/components/modals/add-basemap/xyz/xyz-view');
+var XYZModel = require('builder/components/modals/add-basemap/xyz/xyz-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('components/modals/add-basemap/xyz/xyz-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/add-layer-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/add-layer-model.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/add-layer-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/add-layer-model.spec.js
index b667a580ad..dc6861fd80 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-layer/add-layer-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-layer/add-layer-model.spec.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
-var AddLayerModel = require('cartodb3/components/modals/add-layer/add-layer-model');
-var TableModel = require('cartodb3/data/table-model');
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var AddLayerModel = require('builder/components/modals/add-layer/add-layer-model');
+var TableModel = require('builder/data/table-model');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
var sharedForCreateListingViewModel = require('./shared-for-create-listing-view-model.spec.js');
var sharedForCreateListingImportViewModel = require('./shared-for-import-view-model.spec.js');
-var UserActions = require('cartodb3/data/user-actions');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var UserActions = require('builder/data/user-actions');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
describe('components/modals/add-layer/add-layer-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/guessing-toggler-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/guessing-toggler-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/guessing-toggler-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/guessing-toggler-view.spec.js
index 20dd8472f0..e30ba1f311 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-layer/guessing-toggler-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-layer/guessing-toggler-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var GuessingTogglerView = require('cartodb3/components/modals/add-layer/footer/guessing-toggler-view');
-var CreateModel = require('cartodb3/components/modals/add-layer/add-layer-model');
-var UserModel = require('cartodb3/data/user-model');
+var GuessingTogglerView = require('builder/components/modals/add-layer/footer/guessing-toggler-view');
+var CreateModel = require('builder/components/modals/add-layer/add-layer-model');
+var UserModel = require('builder/data/user-model');
describe('components/modals/add-layer/footer/guessing-toggler-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/listing-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/listing-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/listing-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/listing-view.spec.js
index d29a8a491b..89c4561008 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-layer/listing-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-layer/listing-view.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ListingView = require('cartodb3/components/modals/add-layer/content/listing-view');
-var CreateModel = require('cartodb3/components/modals/add-layer/add-layer-model');
-var UserModel = require('cartodb3/data/user-model');
+var ListingView = require('builder/components/modals/add-layer/content/listing-view');
+var CreateModel = require('builder/components/modals/add-layer/add-layer-model');
+var UserModel = require('builder/data/user-model');
describe('components/modals/add-layer/listing-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/navigation-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/navigation-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/navigation-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/navigation-view.spec.js
index 0c93da2bea..4135629f2e 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-layer/navigation-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-layer/navigation-view.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var CreateModel = require('cartodb3/components/modals/add-layer/add-layer-model');
-var VisualizationsFetchModel = require('cartodb3/data/visualizations-fetch-model');
-var TablesCollection = require('cartodb3/data/tables-collection');
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var NavigationView = require('cartodb3/components/modals/add-layer/content/navigation-view');
+var CreateModel = require('builder/components/modals/add-layer/add-layer-model');
+var VisualizationsFetchModel = require('builder/data/visualizations-fetch-model');
+var TablesCollection = require('builder/data/tables-collection');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var NavigationView = require('builder/components/modals/add-layer/content/navigation-view');
var _ = require('underscore');
describe('components/modals/add-layer/navigation-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/privacy-toggler-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/privacy-toggler-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/privacy-toggler-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/privacy-toggler-view.spec.js
index c0940e9dbe..37a419fe4a 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-layer/privacy-toggler-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-layer/privacy-toggler-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var PrivacyTogglerView = require('cartodb3/components/modals/add-layer/footer/privacy-toggler-view');
-var CreateModel = require('cartodb3/components/modals/add-layer/add-layer-model');
-var UserModel = require('cartodb3/data/user-model');
+var PrivacyTogglerView = require('builder/components/modals/add-layer/footer/privacy-toggler-view');
+var CreateModel = require('builder/components/modals/add-layer/add-layer-model');
+var UserModel = require('builder/data/user-model');
describe('components/modals/add-layer/footer/privacy-toggler-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/shared-for-create-listing-view-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/shared-for-create-listing-view-model.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/shared-for-create-listing-view-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/shared-for-create-listing-view-model.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-layer/shared-for-import-view-model.spec.js b/lib/assets/test/spec/builder/components/modals/add-layer/shared-for-import-view-model.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/modals/add-layer/shared-for-import-view-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-layer/shared-for-import-view-model.spec.js
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/add-widgets-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-widgets/add-widgets-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/modals/add-widgets/add-widgets-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-widgets/add-widgets-view.spec.js
index 9c965c8a65..296ff5da21 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/add-widgets-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-widgets/add-widgets-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AddWidgetsView = require('cartodb3/components/modals/add-widgets/add-widgets-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AddWidgetsView = require('builder/components/modals/add-widgets/add-widgets-view');
describe('components/modals/add-widgets/add-widgets-view', function () {
var LOADING_TITLE = 'loading-';
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/body-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-widgets/body-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/components/modals/add-widgets/body-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-widgets/body-view.spec.js
index 4de2073813..7ebc7ee1ba 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/body-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-widgets/body-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var BodyView = require('cartodb3/components/modals/add-widgets/body-view');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
-var widgetsTypes = require('cartodb3/components/modals/add-widgets/widgets-types');
+var BodyView = require('builder/components/modals/add-widgets/body-view');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
+var widgetsTypes = require('builder/components/modals/add-widgets/widgets-types');
describe('components/modals/add-widgets/body-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/create-tuples-items.spec.js b/lib/assets/test/spec/builder/components/modals/add-widgets/create-tuples-items.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/add-widgets/create-tuples-items.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-widgets/create-tuples-items.spec.js
index 18ed051f7f..096118778e 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/create-tuples-items.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-widgets/create-tuples-items.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var createTuplesItems = require('cartodb3/components/modals/add-widgets/create-tuples-items');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var createTuplesItems = require('builder/components/modals/add-widgets/create-tuples-items');
describe('components/modals/add-widgets/create-tuples-items', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/layer-selector-view.spec.js b/lib/assets/test/spec/builder/components/modals/add-widgets/layer-selector-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/modals/add-widgets/layer-selector-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-widgets/layer-selector-view.spec.js
index 7064994c62..eac8dee9de 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/layer-selector-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-widgets/layer-selector-view.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var LayerSelectorView = require('cartodb3/components/modals/add-widgets/layer-selector-view');
+var LayerSelectorView = require('builder/components/modals/add-widgets/layer-selector-view');
describe('components/modals/add-widgets/layer-selector-view', function () {
var $el;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/widgets-types.spec.js b/lib/assets/test/spec/builder/components/modals/add-widgets/widgets-types.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/modals/add-widgets/widgets-types.spec.js
rename to lib/assets/test/spec/builder/components/modals/add-widgets/widgets-types.spec.js
index 1bbad8ec95..4627d2a70d 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/add-widgets/widgets-types.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/add-widgets/widgets-types.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var widgetsTypes = require('cartodb3/components/modals/add-widgets/widgets-types');
-var TimeSeriesNoneOptionModel = require('cartodb3/components/modals/add-widgets/time-series/time-series-none-option-model');
+var widgetsTypes = require('builder/components/modals/add-widgets/widgets-types');
+var TimeSeriesNoneOptionModel = require('builder/components/modals/add-widgets/time-series/time-series-none-option-model');
describe('components/modals/add-widgets/widgets-types', function () {
describe('all items', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/dataset-metadata/dataset-metadata-view.spec.js b/lib/assets/test/spec/builder/components/modals/dataset-metadata/dataset-metadata-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/modals/dataset-metadata/dataset-metadata-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/dataset-metadata/dataset-metadata-view.spec.js
index 81ac774037..ccede16e54 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/dataset-metadata/dataset-metadata-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/dataset-metadata/dataset-metadata-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var DatasetMetadataView = require('cartodb3/components/modals/dataset-metadata/dataset-metadata-view');
+var DatasetMetadataView = require('builder/components/modals/dataset-metadata/dataset-metadata-view');
describe('components/modals/dataset-metadata/dataset-metadata-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/dataset-metadata/form-view.spec.js b/lib/assets/test/spec/builder/components/modals/dataset-metadata/form-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/dataset-metadata/form-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/dataset-metadata/form-view.spec.js
index df43b93d05..89e42cc890 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/dataset-metadata/form-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/dataset-metadata/form-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var FormView = require('cartodb3/components/modals/dataset-metadata/form/form-view');
+var FormView = require('builder/components/modals/dataset-metadata/form/form-view');
describe('components/modals/dataset-metadata/form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view.spec.js b/lib/assets/test/spec/builder/components/modals/editor-visualization-warning/editor-visualization-warning-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/editor-visualization-warning/editor-visualization-warning-view.spec.js
index b0f47fca3f..351beb3235 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/editor-visualization-warning/editor-visualization-warning-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var EditorVisualizationWarningView = require('cartodb3/components/modals/editor-visualization-warning/editor-visualization-warning-view');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var EditorVisualizationWarningView = require('builder/components/modals/editor-visualization-warning/editor-visualization-warning-view');
-describe('cartodb3/components/modals/editor-visualization-warning', function () {
+describe('builder/components/modals/editor-visualization-warning', function () {
beforeEach(function () {
jasmine.Ajax.install();
jasmine.Ajax.stubRequest(new RegExp('^http(s)?.*/viz\?.*'))
diff --git a/lib/assets/test/spec/cartodb3/components/modals/export-data/modal-export-data-view.spec.js b/lib/assets/test/spec/builder/components/modals/export-data/modal-export-data-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/modals/export-data/modal-export-data-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/export-data/modal-export-data-view.spec.js
index 01d7eec143..9ae6662ab2 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/export-data/modal-export-data-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/export-data/modal-export-data-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var ExportView = require('cartodb3/components/modals/export-data/modal-export-data-view');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var ConfigModel = require('builder/data/config-model');
+var ExportView = require('builder/components/modals/export-data/modal-export-data-view');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
describe('components/modals/export-data/modal-export-data-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/map-metadata/form-view.spec.js b/lib/assets/test/spec/builder/components/modals/map-metadata/form-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/map-metadata/form-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/map-metadata/form-view.spec.js
index 7f425297fb..8d0845c955 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/map-metadata/form-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/map-metadata/form-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var FormView = require('cartodb3/components/modals/map-metadata/form/form-view');
+var FormView = require('builder/components/modals/map-metadata/form/form-view');
describe('components/modals/map-metadata/form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/map-metadata/map-metadata-view.spec.js b/lib/assets/test/spec/builder/components/modals/map-metadata/map-metadata-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/modals/map-metadata/map-metadata-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/map-metadata/map-metadata-view.spec.js
index fdc1c5f483..7d6cd9b444 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/map-metadata/map-metadata-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/map-metadata/map-metadata-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var MetadataView = require('cartodb3/components/modals/map-metadata/map-metadata-view');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var MetadataView = require('builder/components/modals/map-metadata/map-metadata-view');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
describe('components/modals/map-metadata/map-metadata-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/map-metadata/save-metadata-map.spec.js b/lib/assets/test/spec/builder/components/modals/map-metadata/save-metadata-map.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/modals/map-metadata/save-metadata-map.spec.js
rename to lib/assets/test/spec/builder/components/modals/map-metadata/save-metadata-map.spec.js
index 89a388f447..32409ea2cb 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/map-metadata/save-metadata-map.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/map-metadata/save-metadata-map.spec.js
@@ -1,6 +1,6 @@
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var saveMetadataMap = require('cartodb3/components/modals/map-metadata/save-metadata-map');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var saveMetadataMap = require('builder/components/modals/map-metadata/save-metadata-map');
describe('components/modals/map-metadata/save-metadata-map', function () {
var visDefinitionModel;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/modal-confirmation-view.spec.js b/lib/assets/test/spec/builder/components/modals/modal-confirmation-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/components/modals/modal-confirmation-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/modal-confirmation-view.spec.js
index 6d11fa4195..f46b4305e3 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/modal-confirmation-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/modal-confirmation-view.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
-var ModalConfirmationView = require('cartodb3/components/modals/confirmation/modal-confirmation-view');
-var templateExample = require('cartodb3/components/table/head/modals-templates/rename-table-column.tpl');
+var ModalConfirmationView = require('builder/components/modals/confirmation/modal-confirmation-view');
+var templateExample = require('builder/components/table/head/modals-templates/rename-table-column.tpl');
var simulateENTERKeyPress = function () {
var e = $.Event('keydown');
diff --git a/lib/assets/test/spec/cartodb3/components/modals/modal-view-model.spec.js b/lib/assets/test/spec/builder/components/modals/modal-view-model.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/modals/modal-view-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/modal-view-model.spec.js
index 33617bfcdd..f1a00287f2 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/modal-view-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/modal-view-model.spec.js
@@ -1,4 +1,4 @@
-var ModalViewModel = require('cartodb3/components/modals/modal-view-model');
+var ModalViewModel = require('builder/components/modals/modal-view-model');
describe('components/modals/modal-view-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/modal-view.spec.js b/lib/assets/test/spec/builder/components/modals/modal-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/modals/modal-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/modal-view.spec.js
index 586f583502..7c0f60dacb 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/modal-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/modal-view.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var ModalViewModel = require('cartodb3/components/modals/modal-view-model');
-var ModalView = require('cartodb3/components/modals/modal-view');
+var ModalViewModel = require('builder/components/modals/modal-view-model');
+var ModalView = require('builder/components/modals/modal-view');
describe('components/modals/modal-view', function () {
var view, model, contentView, contentViewModel, contentViewEventSpy;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/modals-service-model.spec.js b/lib/assets/test/spec/builder/components/modals/modals-service-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/modals/modals-service-model.spec.js
rename to lib/assets/test/spec/builder/components/modals/modals-service-model.spec.js
index afaa506f20..8d57a521cb 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/modals-service-model.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/modals-service-model.spec.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var ModalsServiceModel = require('cartodb3/components/modals/modals-service-model');
-var Router = require('cartodb3/routes/router');
+var ModalsServiceModel = require('builder/components/modals/modals-service-model');
+var Router = require('builder/routes/router');
describe('components/modals/modals-service-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/modals/publish/privacy-collection.spec.js b/lib/assets/test/spec/builder/components/modals/publish/privacy-collection.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/modals/publish/privacy-collection.spec.js
rename to lib/assets/test/spec/builder/components/modals/publish/privacy-collection.spec.js
index 919a6b8a8a..4cd09f9ffd 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/publish/privacy-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/publish/privacy-collection.spec.js
@@ -1,4 +1,4 @@
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
describe('components/modals/publish/privacy-collection', function () {
var collection;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/publish/publish-view.spec.js b/lib/assets/test/spec/builder/components/modals/publish/publish-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/modals/publish/publish-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/publish/publish-view.spec.js
index 5fa1896560..1a8846d321 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/publish/publish-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/publish/publish-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var PublishView = require('cartodb3/components/modals/publish/publish-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
+var PublishView = require('builder/components/modals/publish/publish-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
describe('components/modals/publish/publish-view', function () {
var userModel;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/publish/publish/publish-view.spec.js b/lib/assets/test/spec/builder/components/modals/publish/publish/publish-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/modals/publish/publish/publish-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/publish/publish/publish-view.spec.js
index b70ff0e932..f374e1903d 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/publish/publish/publish-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/publish/publish/publish-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var PrivacyView = require('cartodb3/components/modals/publish/publish/publish-view');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var UserModel = require('cartodb3/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var PrivacyView = require('builder/components/modals/publish/publish/publish-view');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var UserModel = require('builder/data/user-model');
describe('components/modals/publish/publish/publish-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/publish/share-with-view.spec.js b/lib/assets/test/spec/builder/components/modals/publish/share-with-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/modals/publish/share-with-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/publish/share-with-view.spec.js
index 0ee879b2e8..88ea70dbbe 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/publish/share-with-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/publish/share-with-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ShareWithView = require('cartodb3/components/modals/publish/share-with-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ShareWithView = require('builder/components/modals/publish/share-with-view');
describe('components/modals/publish/share-with-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/publish/share/share-view.spec.js b/lib/assets/test/spec/builder/components/modals/publish/share/share-view.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/modals/publish/share/share-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/publish/share/share-view.spec.js
index 713501a625..85a571efd0 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/publish/share/share-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/publish/share/share-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ShareView = require('cartodb3/components/modals/publish/share/share-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var OrganizationModel = require('cartodb3/data/organization-model');
+var ShareView = require('builder/components/modals/publish/share/share-view');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var OrganizationModel = require('builder/data/organization-model');
describe('components/modals/publish/share/share-view', function () {
var onBack;
diff --git a/lib/assets/test/spec/cartodb3/components/modals/remove-dataset/remove-dataset-view.spec.js b/lib/assets/test/spec/builder/components/modals/remove-dataset/remove-dataset-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/modals/remove-dataset/remove-dataset-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/remove-dataset/remove-dataset-view.spec.js
index 102744855e..2cf98a30e0 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/remove-dataset/remove-dataset-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/remove-dataset/remove-dataset-view.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var RemoveDatasetView = require('cartodb3/components/modals/remove-dataset/remove-dataset-view');
-var UserModel = require('cartodb3/data/user-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var TableModel = require('cartodb3/data/table-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var RemoveDatasetView = require('builder/components/modals/remove-dataset/remove-dataset-view');
+var UserModel = require('builder/data/user-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var TableModel = require('builder/data/table-model');
+var ConfigModel = require('builder/data/config-model');
describe('modals/remove-dataset-view', function () {
var modalModel = new Backbone.Model();
diff --git a/lib/assets/test/spec/cartodb3/components/modals/remove-layer/delete-layer-confirmation-view.spec.js b/lib/assets/test/spec/builder/components/modals/remove-layer/delete-layer-confirmation-view.spec.js
similarity index 82%
rename from lib/assets/test/spec/cartodb3/components/modals/remove-layer/delete-layer-confirmation-view.spec.js
rename to lib/assets/test/spec/builder/components/modals/remove-layer/delete-layer-confirmation-view.spec.js
index 796fa00685..21bd5fa00f 100644
--- a/lib/assets/test/spec/cartodb3/components/modals/remove-layer/delete-layer-confirmation-view.spec.js
+++ b/lib/assets/test/spec/builder/components/modals/remove-layer/delete-layer-confirmation-view.spec.js
@@ -1,16 +1,16 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionsCollection = require('cartodb3/data/analysis-definitions-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var DeleteLayerConfirmationView = require('cartodb3/components/modals/remove-layer/delete-layer-confirmation-view');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var ModalsServiceModel = require('cartodb3/components/modals/modals-service-model');
-var UserActions = require('cartodb3/data/user-actions');
-var UserModel = require('cartodb3/data/user-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var WidgetDefinitionsCollection = require('cartodb3/data/widget-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionsCollection = require('builder/data/analysis-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var DeleteLayerConfirmationView = require('builder/components/modals/remove-layer/delete-layer-confirmation-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var ModalsServiceModel = require('builder/components/modals/modals-service-model');
+var UserActions = require('builder/data/user-actions');
+var UserModel = require('builder/data/user-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var WidgetDefinitionsCollection = require('builder/data/widget-definitions-collection');
describe('modals/delete-layer-confirmation-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/mosaic-form-view.spec.js b/lib/assets/test/spec/builder/components/mosaic-form-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/mosaic-form-view.spec.js
rename to lib/assets/test/spec/builder/components/mosaic-form-view.spec.js
index 17aaa3ce56..892ab10dd9 100644
--- a/lib/assets/test/spec/cartodb3/components/mosaic-form-view.spec.js
+++ b/lib/assets/test/spec/builder/components/mosaic-form-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var MosaicFormView = require('cartodb3/components/mosaic-form-view');
-var MosaicCollection = require('cartodb3/components/mosaic/mosaic-collection');
+var MosaicFormView = require('builder/components/mosaic-form-view');
+var MosaicCollection = require('builder/components/mosaic/mosaic-collection');
describe('components/mosaic-form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/mosaic/mosaic-collection.spec.js b/lib/assets/test/spec/builder/components/mosaic/mosaic-collection.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/components/mosaic/mosaic-collection.spec.js
rename to lib/assets/test/spec/builder/components/mosaic/mosaic-collection.spec.js
index 3c73b2b772..2484ddb26a 100644
--- a/lib/assets/test/spec/cartodb3/components/mosaic/mosaic-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/mosaic/mosaic-collection.spec.js
@@ -1,5 +1,5 @@
-var MosaicItemModel = require('cartodb3/components/mosaic/mosaic-item-model');
-var MosaicCollection = require('cartodb3/components/mosaic/mosaic-collection');
+var MosaicItemModel = require('builder/components/mosaic/mosaic-item-model');
+var MosaicCollection = require('builder/components/mosaic/mosaic-collection');
describe('components/mosaic/mosaic-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/mosaic/mosaic-item-view.spec.js b/lib/assets/test/spec/builder/components/mosaic/mosaic-item-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/mosaic/mosaic-item-view.spec.js
rename to lib/assets/test/spec/builder/components/mosaic/mosaic-item-view.spec.js
index 6c08cb0ffa..3035ff250c 100644
--- a/lib/assets/test/spec/cartodb3/components/mosaic/mosaic-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/mosaic/mosaic-item-view.spec.js
@@ -1,5 +1,5 @@
-var MosaicItemModel = require('cartodb3/components/mosaic/mosaic-item-model');
-var MosaicItemView = require('cartodb3/components/mosaic/mosaic-item-view');
+var MosaicItemModel = require('builder/components/mosaic/mosaic-item-model');
+var MosaicItemView = require('builder/components/mosaic/mosaic-item-view');
describe('components/mosaic/mosaic-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/mosaic/mosaic-view.spec.js b/lib/assets/test/spec/builder/components/mosaic/mosaic-view.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/mosaic/mosaic-view.spec.js
rename to lib/assets/test/spec/builder/components/mosaic/mosaic-view.spec.js
index def19d5a77..b4e054fe0f 100644
--- a/lib/assets/test/spec/cartodb3/components/mosaic/mosaic-view.spec.js
+++ b/lib/assets/test/spec/builder/components/mosaic/mosaic-view.spec.js
@@ -1,4 +1,4 @@
-var MosaicView = require('cartodb3/components/mosaic/mosaic-view');
+var MosaicView = require('builder/components/mosaic/mosaic-view');
describe('components/mosaic/mosaic-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/notifier/notifier-collection.spec.js b/lib/assets/test/spec/builder/components/notifier/notifier-collection.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/notifier/notifier-collection.spec.js
rename to lib/assets/test/spec/builder/components/notifier/notifier-collection.spec.js
index ae6c2da536..9442b405ca 100644
--- a/lib/assets/test/spec/cartodb3/components/notifier/notifier-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/notifier/notifier-collection.spec.js
@@ -1,4 +1,4 @@
-var NotifierCollection = require('cartodb3/components/notifier/notifier-collection.js');
+var NotifierCollection = require('builder/components/notifier/notifier-collection.js');
describe('components/notifier/notifier-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/notifier/notifier-model.spec.js b/lib/assets/test/spec/builder/components/notifier/notifier-model.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/components/notifier/notifier-model.spec.js
rename to lib/assets/test/spec/builder/components/notifier/notifier-model.spec.js
index 1a135e793a..dde4062607 100644
--- a/lib/assets/test/spec/cartodb3/components/notifier/notifier-model.spec.js
+++ b/lib/assets/test/spec/builder/components/notifier/notifier-model.spec.js
@@ -1,4 +1,4 @@
-var NotifierModel = require('cartodb3/components/notifier/notifier-model.js');
+var NotifierModel = require('builder/components/notifier/notifier-model.js');
describe('components/notifier/notifier-model', function () {
var model = new NotifierModel({}, {});
diff --git a/lib/assets/test/spec/cartodb3/components/notifier/notifier-view.spec.js b/lib/assets/test/spec/builder/components/notifier/notifier-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/notifier/notifier-view.spec.js
rename to lib/assets/test/spec/builder/components/notifier/notifier-view.spec.js
index f93e8d5a26..8009ab35ae 100644
--- a/lib/assets/test/spec/cartodb3/components/notifier/notifier-view.spec.js
+++ b/lib/assets/test/spec/builder/components/notifier/notifier-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var Notifier = require('cartodb3/components/notifier/notifier.js');
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
+var Notifier = require('builder/components/notifier/notifier.js');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
var CoreView = require('backbone/core-view');
describe('components/notifier/notifier-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/notifier/notifier.spec.js b/lib/assets/test/spec/builder/components/notifier/notifier.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/notifier/notifier.spec.js
rename to lib/assets/test/spec/builder/components/notifier/notifier.spec.js
index 04e35d9111..e172b46b43 100644
--- a/lib/assets/test/spec/cartodb3/components/notifier/notifier.spec.js
+++ b/lib/assets/test/spec/builder/components/notifier/notifier.spec.js
@@ -1,6 +1,6 @@
-var Notifier = require('cartodb3/components/notifier/notifier.js');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var Notifier = require('builder/components/notifier/notifier.js');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
var Backbone = require('backbone');
describe('components/notifier/notifier', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/builder-activated/builder-activated-view.spec.js b/lib/assets/test/spec/builder/components/onboardings/builder-activated/builder-activated-view.spec.js
similarity index 81%
rename from lib/assets/test/spec/cartodb3/components/onboardings/builder-activated/builder-activated-view.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/builder-activated/builder-activated-view.spec.js
index 3cfd8f2571..bed70a953c 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/builder-activated/builder-activated-view.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/builder-activated/builder-activated-view.spec.js
@@ -1,6 +1,6 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var BuilderActivatedNotificationView = require('cartodb3/components/onboardings/builder-activated/builder-activated-notification-view');
-var UserNotifications = require('cartodb3/data/user-notifications');
+var ConfigModel = require('builder/data/config-model');
+var BuilderActivatedNotificationView = require('builder/components/onboardings/builder-activated/builder-activated-notification-view');
+var UserNotifications = require('builder/data/user-notifications');
describe('components/onboardings/builder-activated/builder-activated-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/builder/builder-launcher.spec.js b/lib/assets/test/spec/builder/components/onboardings/builder/builder-launcher.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/components/onboardings/builder/builder-launcher.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/builder/builder-launcher.spec.js
index d4200319fb..f2e57bc2c9 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/builder/builder-launcher.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/builder/builder-launcher.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var BuilderOnboardingLauncher = require('cartodb3/components/onboardings/builder/launcher');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
+var BuilderOnboardingLauncher = require('builder/components/onboardings/builder/launcher');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
describe('components/onboardings/builder/builder-launcher', function () {
describe('.launch', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/builder/builder-view.spec.js b/lib/assets/test/spec/builder/components/onboardings/builder/builder-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/onboardings/builder/builder-view.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/builder/builder-view.spec.js
index ffdc817835..f4110d66cb 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/builder/builder-view.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/builder/builder-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var BuilderView = require('cartodb3/components/onboardings/builder/builder-view');
-var UserNotifications = require('cartodb3/data/user-notifications');
+var ConfigModel = require('builder/data/config-model');
+var BuilderView = require('builder/components/onboardings/builder/builder-view');
+var UserNotifications = require('builder/data/user-notifications');
describe('components/onboardings/builder/builder-view', function () {
var configModel = new ConfigModel({
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/generic/generic-onboarding-launcher.spec.js b/lib/assets/test/spec/builder/components/onboardings/generic/generic-onboarding-launcher.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/onboardings/generic/generic-onboarding-launcher.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/generic/generic-onboarding-launcher.spec.js
index 2cea1b87c3..6a4df8c06b 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/generic/generic-onboarding-launcher.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/generic/generic-onboarding-launcher.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var OnboardingLauncher = require('cartodb3/components/onboardings/generic/generic-onboarding-launcher');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
+var OnboardingLauncher = require('builder/components/onboardings/generic/generic-onboarding-launcher');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
describe('components/onboardings/generic/generic-onboarding-launcher', function () {
describe('constructor', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/generic/generic-onboarding-view.spec.js b/lib/assets/test/spec/builder/components/onboardings/generic/generic-onboarding-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/onboardings/generic/generic-onboarding-view.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/generic/generic-onboarding-view.spec.js
index b6fd8467c9..cd5b2483f1 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/generic/generic-onboarding-view.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/generic/generic-onboarding-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var LayerOnboardingView = require('cartodb3/components/onboardings/generic/generic-onboarding-view');
+var LayerOnboardingView = require('builder/components/onboardings/generic/generic-onboarding-view');
var helper = require('../onboarding-tests-helper');
describe('components/onboardings/generic/generic-onboarding-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.spec.js b/lib/assets/test/spec/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.spec.js
index c1f7d7100e..df63cfaf97 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var View = require('cartodb3/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
+var View = require('builder/components/onboardings/layers/analysis-onboarding/analysis-onboarding-view');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var UserNotifications = require('builder/data/user-notifications');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
var helper = require('../../onboarding-tests-helper');
describe('components/onboardings/layers/analysis-onboarding/analysis-onboarding-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.spec.js b/lib/assets/test/spec/builder/components/onboardings/layers/data-onboarding/data-onboarding-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/layers/data-onboarding/data-onboarding-view.spec.js
index e822f8925b..5a42c33d70 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/layers/data-onboarding/data-onboarding-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var View = require('cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view');
+var View = require('builder/components/onboardings/layers/data-onboarding/data-onboarding-view');
var helper = require('../../onboarding-tests-helper');
describe('components/onboardings/layers/data-onboarding/data-onboarding-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/layers/onboarding-launcher.spec.js b/lib/assets/test/spec/builder/components/onboardings/layers/onboarding-launcher.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/components/onboardings/layers/onboarding-launcher.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/layers/onboarding-launcher.spec.js
index 12d30bc014..18d8f5b17a 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/layers/onboarding-launcher.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/layers/onboarding-launcher.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var OnboardingLauncher = require('cartodb3/components/onboardings/generic/generic-onboarding-launcher');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
+var OnboardingLauncher = require('builder/components/onboardings/generic/generic-onboarding-launcher');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
describe('components/onboardings/layers/onboarding-launcher', function () {
describe('launch', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view.spec.js b/lib/assets/test/spec/builder/components/onboardings/layers/style-onboarding/style-onboarding-view.spec.js
similarity index 99%
rename from lib/assets/test/spec/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/layers/style-onboarding/style-onboarding-view.spec.js
index f7dd04a75c..365c151bf5 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/layers/style-onboarding/style-onboarding-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var View = require('cartodb3/components/onboardings/layers/style-onboarding/style-onboarding-view');
+var View = require('builder/components/onboardings/layers/style-onboarding/style-onboarding-view');
var helper = require('../../onboarding-tests-helper');
describe('components/onboardings/layers/style-onboarding/style-onboarding-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/onboarding-tests-helper.js b/lib/assets/test/spec/builder/components/onboardings/onboarding-tests-helper.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/components/onboardings/onboarding-tests-helper.js
rename to lib/assets/test/spec/builder/components/onboardings/onboarding-tests-helper.js
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/onboarding-view-model.spec.js b/lib/assets/test/spec/builder/components/onboardings/onboarding-view-model.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/onboardings/onboarding-view-model.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/onboarding-view-model.spec.js
index 388c05ccd5..8bf38ba9c6 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/onboarding-view-model.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/onboarding-view-model.spec.js
@@ -1,4 +1,4 @@
-var OnboardingViewModel = require('cartodb3/components/onboardings/onboarding-view-model');
+var OnboardingViewModel = require('builder/components/onboardings/onboarding-view-model');
describe('components/onboardings/onboarding-view-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/onboardings/onboardings-service-model.spec.js b/lib/assets/test/spec/builder/components/onboardings/onboardings-service-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/components/onboardings/onboardings-service-model.spec.js
rename to lib/assets/test/spec/builder/components/onboardings/onboardings-service-model.spec.js
index 4212843cbb..908cea4be1 100644
--- a/lib/assets/test/spec/cartodb3/components/onboardings/onboardings-service-model.spec.js
+++ b/lib/assets/test/spec/builder/components/onboardings/onboardings-service-model.spec.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
describe('components/onboardings/onboardings-service-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/pagination-search-view/pagination-search-model.spec.js b/lib/assets/test/spec/builder/components/pagination-search-view/pagination-search-model.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/pagination-search-view/pagination-search-model.spec.js
rename to lib/assets/test/spec/builder/components/pagination-search-view/pagination-search-model.spec.js
index cf55d6d1ec..2e6b36b1a4 100644
--- a/lib/assets/test/spec/cartodb3/components/pagination-search-view/pagination-search-model.spec.js
+++ b/lib/assets/test/spec/builder/components/pagination-search-view/pagination-search-model.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var PaginationSearchModel = require('cartodb3/components/pagination-search/pagination-search-model');
+var PaginationSearchModel = require('builder/components/pagination-search/pagination-search-model');
describe('components/pagination-search/pagination-search-model', function () {
var onFetching = jasmine.createSpy('onFetching');
diff --git a/lib/assets/test/spec/cartodb3/components/pagination-search-view/pagination-search-view.spec.js b/lib/assets/test/spec/builder/components/pagination-search-view/pagination-search-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/pagination-search-view/pagination-search-view.spec.js
rename to lib/assets/test/spec/builder/components/pagination-search-view/pagination-search-view.spec.js
index 9f1ed3d895..e563469fcc 100644
--- a/lib/assets/test/spec/cartodb3/components/pagination-search-view/pagination-search-view.spec.js
+++ b/lib/assets/test/spec/builder/components/pagination-search-view/pagination-search-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var PaginationSearchView = require('cartodb3/components/pagination-search/pagination-search-view');
+var PaginationSearchView = require('builder/components/pagination-search/pagination-search-view');
describe('components/pagination-search/pagination-search-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/pagination/pagination-model.spec.js b/lib/assets/test/spec/builder/components/pagination/pagination-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/pagination/pagination-model.spec.js
rename to lib/assets/test/spec/builder/components/pagination/pagination-model.spec.js
index 88896ddfdb..a6bbcef2f8 100644
--- a/lib/assets/test/spec/cartodb3/components/pagination/pagination-model.spec.js
+++ b/lib/assets/test/spec/builder/components/pagination/pagination-model.spec.js
@@ -1,4 +1,4 @@
-var PaginationModel = require('cartodb3/components/pagination/pagination-model');
+var PaginationModel = require('builder/components/pagination/pagination-model');
describe('components/pagination/pagination-model', function () {
describe('.pagesCount', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/pagination/pagination-view.spec.js b/lib/assets/test/spec/builder/components/pagination/pagination-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/pagination/pagination-view.spec.js
rename to lib/assets/test/spec/builder/components/pagination/pagination-view.spec.js
index 61f29213a3..f2e6213fac 100644
--- a/lib/assets/test/spec/cartodb3/components/pagination/pagination-view.spec.js
+++ b/lib/assets/test/spec/builder/components/pagination/pagination-view.spec.js
@@ -1,5 +1,5 @@
-var PaginationModel = require('cartodb3/components/pagination/pagination-model');
-var PaginationView = require('cartodb3/components/pagination/pagination-view');
+var PaginationModel = require('builder/components/pagination/pagination-model');
+var PaginationView = require('builder/components/pagination/pagination-view');
describe('components/pagination/pagination-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/popup-manager.spec.js b/lib/assets/test/spec/builder/components/popup-manager.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/popup-manager.spec.js
rename to lib/assets/test/spec/builder/components/popup-manager.spec.js
index c1def9cd1f..f52059ea03 100644
--- a/lib/assets/test/spec/cartodb3/components/popup-manager.spec.js
+++ b/lib/assets/test/spec/builder/components/popup-manager.spec.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var PopupManager = require('cartodb3/components/popup-manager');
+var PopupManager = require('builder/components/popup-manager');
describe('components/popup-manager', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/privacy-dropdown/privacy-dropdown-view.spec.js b/lib/assets/test/spec/builder/components/privacy-dropdown/privacy-dropdown-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/privacy-dropdown/privacy-dropdown-view.spec.js
rename to lib/assets/test/spec/builder/components/privacy-dropdown/privacy-dropdown-view.spec.js
index f0756cbbe4..63c2715d8a 100644
--- a/lib/assets/test/spec/cartodb3/components/privacy-dropdown/privacy-dropdown-view.spec.js
+++ b/lib/assets/test/spec/builder/components/privacy-dropdown/privacy-dropdown-view.spec.js
@@ -1,9 +1,9 @@
-var PrivacyDropdown = require('cartodb3/components/privacy-dropdown/privacy-dropdown-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var PrivacyDropdown = require('builder/components/privacy-dropdown/privacy-dropdown-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
describe('components/privacy-dropdown/privacy-dropdown-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/stack-layout/stack-layout-model.spec.js b/lib/assets/test/spec/builder/components/stack-layout/stack-layout-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/stack-layout/stack-layout-model.spec.js
rename to lib/assets/test/spec/builder/components/stack-layout/stack-layout-model.spec.js
index 560619c15b..ff6c49dcfa 100644
--- a/lib/assets/test/spec/cartodb3/components/stack-layout/stack-layout-model.spec.js
+++ b/lib/assets/test/spec/builder/components/stack-layout/stack-layout-model.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var StackLayoutModel = require('cartodb3/components/stack-layout/stack-layout-model');
+var StackLayoutModel = require('builder/components/stack-layout/stack-layout-model');
describe('stack-layout/model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/stack-layout/stack-layout-view.spec.js b/lib/assets/test/spec/builder/components/stack-layout/stack-layout-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/stack-layout/stack-layout-view.spec.js
rename to lib/assets/test/spec/builder/components/stack-layout/stack-layout-view.spec.js
index e3d3f2ff86..4cf05dc341 100644
--- a/lib/assets/test/spec/cartodb3/components/stack-layout/stack-layout-view.spec.js
+++ b/lib/assets/test/spec/builder/components/stack-layout/stack-layout-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
-var StackLayoutModel = require('cartodb3/components/stack-layout/stack-layout-model');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
+var StackLayoutModel = require('builder/components/stack-layout/stack-layout-model');
describe('stack-layout/view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/create-editor-menu-tab-pane.spec.js b/lib/assets/test/spec/builder/components/tab-pane/create-editor-menu-tab-pane.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/create-editor-menu-tab-pane.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/create-editor-menu-tab-pane.spec.js
index 6d42b3c5cb..9070691955 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/create-editor-menu-tab-pane.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/create-editor-menu-tab-pane.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var createEditorMenuTabPane = require('cartodb3/components/tab-pane/create-editor-menu-tab-pane');
+var createEditorMenuTabPane = require('builder/components/tab-pane/create-editor-menu-tab-pane');
describe('components/tab-pane/create-editor-menu-tab-pane', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/create-mixed-labels-tab-pane.spec.js b/lib/assets/test/spec/builder/components/tab-pane/create-mixed-labels-tab-pane.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/create-mixed-labels-tab-pane.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/create-mixed-labels-tab-pane.spec.js
index a1fd845b4b..009a1c417a 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/create-mixed-labels-tab-pane.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/create-mixed-labels-tab-pane.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var createMixedLabelsTabPane = require('cartodb3/components/tab-pane/create-mixed-labels-tab-pane');
+var createMixedLabelsTabPane = require('builder/components/tab-pane/create-mixed-labels-tab-pane');
describe('components/tab-pane/create-mixed-labels-tab-pane', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/create-template-tab-pane.spec.js b/lib/assets/test/spec/builder/components/tab-pane/create-template-tab-pane.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/create-template-tab-pane.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/create-template-tab-pane.spec.js
index ac812f6f3b..47cdec728f 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/create-template-tab-pane.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/create-template-tab-pane.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var cdb = require('cartodb.js');
-var createTemplateTabPane = require('cartodb3/components/tab-pane/create-template-tab-pane');
-var templateButton = require('cartodb3/components/tab-pane/tab-pane-template.tpl');
+var createTemplateTabPane = require('builder/components/tab-pane/create-template-tab-pane');
+var templateButton = require('builder/components/tab-pane/tab-pane-template.tpl');
describe('components/tab-pane/create-template-tab-pane', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/create-text-labels-tab-pane.spec.js b/lib/assets/test/spec/builder/components/tab-pane/create-text-labels-tab-pane.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/create-text-labels-tab-pane.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/create-text-labels-tab-pane.spec.js
index 204699cc9c..c1b0a182c9 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/create-text-labels-tab-pane.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/create-text-labels-tab-pane.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var CoreView = require('backbone/core-view');
-var createTextLabelsTabPane = require('cartodb3/components/tab-pane/create-text-labels-tab-pane');
+var createTextLabelsTabPane = require('builder/components/tab-pane/create-text-labels-tab-pane');
describe('components/tab-pane/create-text-labels-tab-pane', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-collection.spec.js b/lib/assets/test/spec/builder/components/tab-pane/tab-pane-collection.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-collection.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/tab-pane-collection.spec.js
index 159c3b1d47..ae64706819 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-collection.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/tab-pane-collection.spec.js
@@ -1,4 +1,4 @@
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
var Backbone = require('backbone');
var _ = require('underscore');
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-item-view.spec.js b/lib/assets/test/spec/builder/components/tab-pane/tab-pane-item-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-item-view.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/tab-pane-item-view.spec.js
index 45dcffe5e4..7894578b67 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/tab-pane-item-view.spec.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var TabPaneItemView = require('cartodb3/components/tab-pane/tab-pane-item-view');
+var TabPaneItemView = require('builder/components/tab-pane/tab-pane-item-view');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
diff --git a/lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-view.spec.js b/lib/assets/test/spec/builder/components/tab-pane/tab-pane-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-view.spec.js
rename to lib/assets/test/spec/builder/components/tab-pane/tab-pane-view.spec.js
index 4b11e5e307..acf5943c0f 100644
--- a/lib/assets/test/spec/cartodb3/components/tab-pane/tab-pane-view.spec.js
+++ b/lib/assets/test/spec/builder/components/tab-pane/tab-pane-view.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var TabPaneView = require('cartodb3/components/tab-pane/tab-pane-view');
-var TabPaneCollection = require('cartodb3/components/tab-pane/tab-pane-collection');
+var TabPaneView = require('builder/components/tab-pane/tab-pane-view');
+var TabPaneCollection = require('builder/components/tab-pane/tab-pane-collection');
describe('components/tab-pane-view', function () {
var mouseOverAction;
diff --git a/lib/assets/test/spec/cartodb3/components/table/editors/types/editor-date-view.spec.js b/lib/assets/test/spec/builder/components/table/editors/types/editor-date-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/components/table/editors/types/editor-date-view.spec.js
rename to lib/assets/test/spec/builder/components/table/editors/types/editor-date-view.spec.js
index b3fb30157b..f74f8c08a4 100644
--- a/lib/assets/test/spec/cartodb3/components/table/editors/types/editor-date-view.spec.js
+++ b/lib/assets/test/spec/builder/components/table/editors/types/editor-date-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var EditorDateView = require('cartodb3/components/table/editors/types/editor-date-view');
+var EditorDateView = require('builder/components/table/editors/types/editor-date-view');
describe('components/table/editors/types/editor-date-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/head/table-head-item-view.spec.js b/lib/assets/test/spec/builder/components/table/head/table-head-item-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/components/table/head/table-head-item-view.spec.js
rename to lib/assets/test/spec/builder/components/table/head/table-head-item-view.spec.js
index fd004cc314..05cf22b0b3 100644
--- a/lib/assets/test/spec/cartodb3/components/table/head/table-head-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/table/head/table-head-item-view.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
var $ = require('jquery');
-var TableHeadItemView = require('cartodb3/components/table/head/table-head-item-view');
-var TableViewModel = require('cartodb3/components/table/table-view-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
+var TableHeadItemView = require('builder/components/table/head/table-head-item-view');
+var TableViewModel = require('builder/components/table/table-view-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
var FactoryModals = require('../../../factories/modals');
var simulateESCKeyPress = function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/head/table-head-options-item-view.spec.js b/lib/assets/test/spec/builder/components/table/head/table-head-options-item-view.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/table/head/table-head-options-item-view.spec.js
rename to lib/assets/test/spec/builder/components/table/head/table-head-options-item-view.spec.js
index 8f47505b12..04f7c0d3eb 100644
--- a/lib/assets/test/spec/cartodb3/components/table/head/table-head-options-item-view.spec.js
+++ b/lib/assets/test/spec/builder/components/table/head/table-head-options-item-view.spec.js
@@ -1,6 +1,6 @@
-var TableHeadOptionsItemView = require('cartodb3/components/table/head/table-head-options-item-view');
-var tableHeadOptionsItemTemplate = require('cartodb3/components/table/head/table-head-options-item.tpl');
-var CustomListItemModel = require('cartodb3/components/custom-list/custom-list-item-model');
+var TableHeadOptionsItemView = require('builder/components/table/head/table-head-options-item-view');
+var tableHeadOptionsItemTemplate = require('builder/components/table/head/table-head-options-item.tpl');
+var CustomListItemModel = require('builder/components/custom-list/custom-list-item-model');
describe('components/table/head/table-head-options-item-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/head/table-head-view.spec.js b/lib/assets/test/spec/builder/components/table/head/table-head-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/components/table/head/table-head-view.spec.js
rename to lib/assets/test/spec/builder/components/table/head/table-head-view.spec.js
index 101428e404..94ae0ed717 100644
--- a/lib/assets/test/spec/cartodb3/components/table/head/table-head-view.spec.js
+++ b/lib/assets/test/spec/builder/components/table/head/table-head-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var TableHeadView = require('cartodb3/components/table/head/table-head-view');
-var TableViewModel = require('cartodb3/components/table/table-view-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
+var TableHeadView = require('builder/components/table/head/table-head-view');
+var TableViewModel = require('builder/components/table/table-view-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
var FactoryModals = require('../../../factories/modals');
describe('components/table/head/table-head-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/paginator/table-paginator-view.spec.js b/lib/assets/test/spec/builder/components/table/paginator/table-paginator-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/components/table/paginator/table-paginator-view.spec.js
rename to lib/assets/test/spec/builder/components/table/paginator/table-paginator-view.spec.js
index e6b4cc3eab..550d5590a9 100644
--- a/lib/assets/test/spec/cartodb3/components/table/paginator/table-paginator-view.spec.js
+++ b/lib/assets/test/spec/builder/components/table/paginator/table-paginator-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var TablePaginatorView = require('cartodb3/components/table/paginator/table-paginator-view');
-var TableViewModel = require('cartodb3/components/table/table-view-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
+var TablePaginatorView = require('builder/components/table/paginator/table-paginator-view');
+var TableViewModel = require('builder/components/table/table-view-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
describe('components/table/paginator/table-paginator-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/table-manager.spec.js b/lib/assets/test/spec/builder/components/table/table-manager.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/components/table/table-manager.spec.js
rename to lib/assets/test/spec/builder/components/table/table-manager.spec.js
index 9efab4969a..f4d6f07a11 100644
--- a/lib/assets/test/spec/cartodb3/components/table/table-manager.spec.js
+++ b/lib/assets/test/spec/builder/components/table/table-manager.spec.js
@@ -1,8 +1,8 @@
-var ConfigModel = require('cartodb3/data/config-model');
+var ConfigModel = require('builder/data/config-model');
var CoreView = require('backbone/core-view');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var TableManager = require('cartodb3/components/table/table-manager');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var TableManager = require('builder/components/table/table-manager');
var FactoryModals = require('../../factories/modals');
describe('components/table/table-manager', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/table-view-model.spec.js b/lib/assets/test/spec/builder/components/table/table-view-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/components/table/table-view-model.spec.js
rename to lib/assets/test/spec/builder/components/table/table-view-model.spec.js
index 2a127a4997..1247933398 100644
--- a/lib/assets/test/spec/cartodb3/components/table/table-view-model.spec.js
+++ b/lib/assets/test/spec/builder/components/table/table-view-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var TableViewModel = require('cartodb3/components/table/table-view-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var TableViewModel = require('builder/components/table/table-view-model');
describe('components/table/table-view-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/components/table/table-view.spec.js b/lib/assets/test/spec/builder/components/table/table-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/components/table/table-view.spec.js
rename to lib/assets/test/spec/builder/components/table/table-view.spec.js
index 6300461edd..84b99daae9 100644
--- a/lib/assets/test/spec/cartodb3/components/table/table-view.spec.js
+++ b/lib/assets/test/spec/builder/components/table/table-view.spec.js
@@ -1,13 +1,13 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var TableView = require('cartodb3/components/table/table-view');
-var ConfigModel = require('cartodb3/data/config-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var TableView = require('builder/components/table/table-view');
+var ConfigModel = require('builder/data/config-model');
var FactoryModals = require('../../factories/modals');
describe('components/table/table-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/components/tipsy-tooltip-view.spec.js b/lib/assets/test/spec/builder/components/tipsy-tooltip-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/tipsy-tooltip-view.spec.js
rename to lib/assets/test/spec/builder/components/tipsy-tooltip-view.spec.js
index b0f3e255f9..82303b2354 100644
--- a/lib/assets/test/spec/cartodb3/components/tipsy-tooltip-view.spec.js
+++ b/lib/assets/test/spec/builder/components/tipsy-tooltip-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var $ = require('jquery');
-var TipsyTooltipView = require('cartodb3/components/tipsy-tooltip-view');
+var TipsyTooltipView = require('builder/components/tipsy-tooltip-view');
describe('components/tipsy-tooltip-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/components/view-factory.spec.js b/lib/assets/test/spec/builder/components/view-factory.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/components/view-factory.spec.js
rename to lib/assets/test/spec/builder/components/view-factory.spec.js
index 6bda68f164..f177114acc 100644
--- a/lib/assets/test/spec/cartodb3/components/view-factory.spec.js
+++ b/lib/assets/test/spec/builder/components/view-factory.spec.js
@@ -1,5 +1,5 @@
var CoreView = require('backbone/core-view');
-var ViewFactory = require('cartodb3/components/view-factory');
+var ViewFactory = require('builder/components/view-factory');
describe('components/view-factory', function () {
describe('.createByHTML', function () {
diff --git a/lib/assets/test/spec/cartodb3/create-default-vis.js b/lib/assets/test/spec/builder/create-default-vis.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/create-default-vis.js
rename to lib/assets/test/spec/builder/create-default-vis.js
diff --git a/lib/assets/test/spec/cartodb3/data/analyses.spec.js b/lib/assets/test/spec/builder/data/analyses.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/data/analyses.spec.js
rename to lib/assets/test/spec/builder/data/analyses.spec.js
index 41caf68f81..14161d1d3a 100644
--- a/lib/assets/test/spec/cartodb3/data/analyses.spec.js
+++ b/lib/assets/test/spec/builder/data/analyses.spec.js
@@ -1,13 +1,13 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var analyses = require('cartodb3/data/analyses');
-var ConfigModel = require('cartodb3/data/config-model');
-var DataServicesApiCheck = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var analyses = require('builder/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
var camshaftReference = require('camshaft-reference').getVersion('latest');
-var UnknownTypeFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model');
-var FallbackFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model');
+var UnknownTypeFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/unknown-type-form-model');
+var FallbackFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model');
-describe('cartodb3/data/analyses', function () {
+describe('builder/data/analyses', function () {
Object.keys(analyses.MAP).forEach(function (key) {
var def = analyses.MAP[key];
diff --git a/lib/assets/test/spec/cartodb3/data/analysis-definition-model.spec.js b/lib/assets/test/spec/builder/data/analysis-definition-model.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/data/analysis-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/analysis-definition-model.spec.js
index edbea96573..cbd4694b04 100644
--- a/lib/assets/test/spec/cartodb3/data/analysis-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/analysis-definition-model.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionsCollection = require('cartodb3/data/analysis-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionsCollection = require('builder/data/analysis-definitions-collection');
describe('data/analysis-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/analysis-definition-node-model.spec.js b/lib/assets/test/spec/builder/data/analysis-definition-node-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/analysis-definition-node-model.spec.js
rename to lib/assets/test/spec/builder/data/analysis-definition-node-model.spec.js
index 3c05d56b96..15e42c832e 100644
--- a/lib/assets/test/spec/cartodb3/data/analysis-definition-node-model.spec.js
+++ b/lib/assets/test/spec/builder/data/analysis-definition-node-model.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
-describe('cartodb3/data/analysis-definition-node-model', function () {
+describe('builder/data/analysis-definition-node-model', function () {
beforeEach(function () {
var configModel = new ConfigModel({
base_url: '/u/pepe'
diff --git a/lib/assets/test/spec/cartodb3/data/analysis-definition-node-source-model.spec.js b/lib/assets/test/spec/builder/data/analysis-definition-node-source-model.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/data/analysis-definition-node-source-model.spec.js
rename to lib/assets/test/spec/builder/data/analysis-definition-node-source-model.spec.js
index 5006dc1d3c..dfed784242 100644
--- a/lib/assets/test/spec/cartodb3/data/analysis-definition-node-source-model.spec.js
+++ b/lib/assets/test/spec/builder/data/analysis-definition-node-source-model.spec.js
@@ -1,8 +1,8 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var UserModel = require('cartodb3/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var UserModel = require('builder/data/user-model');
-describe('cartodb3/data/analysis-definition-node-source-model', function () {
+describe('builder/data/analysis-definition-node-source-model', function () {
beforeEach(function () {
var configModel = new ConfigModel({
base_url: '/u/pepe'
diff --git a/lib/assets/test/spec/cartodb3/data/analysis-definition-nodes-collection.spec.js b/lib/assets/test/spec/builder/data/analysis-definition-nodes-collection.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/data/analysis-definition-nodes-collection.spec.js
rename to lib/assets/test/spec/builder/data/analysis-definition-nodes-collection.spec.js
index 9add008397..65062a05e7 100644
--- a/lib/assets/test/spec/cartodb3/data/analysis-definition-nodes-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/analysis-definition-nodes-collection.spec.js
@@ -1,6 +1,6 @@
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var ConfigModel = require('builder/data/config-model');
describe('data/analysis-definition-nodes-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/analysis-definitions-collection.spec.js b/lib/assets/test/spec/builder/data/analysis-definitions-collection.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/analysis-definitions-collection.spec.js
rename to lib/assets/test/spec/builder/data/analysis-definitions-collection.spec.js
index 7be1a11c77..4cf5ce37c2 100644
--- a/lib/assets/test/spec/cartodb3/data/analysis-definitions-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/analysis-definitions-collection.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionsCollection = require('cartodb3/data/analysis-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionsCollection = require('builder/data/analysis-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
-describe('cartodb3/data/analysis-definitions-collection', function () {
+describe('builder/data/analysis-definitions-collection', function () {
beforeEach(function () {
this.configModel = new ConfigModel({
base_url: '/u/pepe'
diff --git a/lib/assets/test/spec/cartodb3/data/asset-model.spec.js b/lib/assets/test/spec/builder/data/asset-model.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/asset-model.spec.js
rename to lib/assets/test/spec/builder/data/asset-model.spec.js
index bcdd9d6ab9..aec1c6f069 100644
--- a/lib/assets/test/spec/cartodb3/data/asset-model.spec.js
+++ b/lib/assets/test/spec/builder/data/asset-model.spec.js
@@ -1,6 +1,6 @@
-var AssetModel = require('cartodb3/data/asset-model');
+var AssetModel = require('builder/data/asset-model');
-xdescribe('cartodb3/data/asset-model', function () {
+xdescribe('builder/data/asset-model', function () {
beforeEach(function () {
this.model = new AssetModel();
});
diff --git a/lib/assets/test/spec/cartodb3/data/assets-collection.spec.js b/lib/assets/test/spec/builder/data/assets-collection.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/data/assets-collection.spec.js
rename to lib/assets/test/spec/builder/data/assets-collection.spec.js
index 087418d3eb..dfafac895d 100644
--- a/lib/assets/test/spec/cartodb3/data/assets-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/assets-collection.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var AssetsCollection = require('cartodb3/data/assets-collection');
+var AssetsCollection = require('builder/data/assets-collection');
describe('data/assets-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/background-importer/import-model-poller.spec.js b/lib/assets/test/spec/builder/data/background-importer/import-model-poller.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/background-importer/import-model-poller.spec.js
rename to lib/assets/test/spec/builder/data/background-importer/import-model-poller.spec.js
index 0deacc1085..8a3624adc7 100644
--- a/lib/assets/test/spec/cartodb3/data/background-importer/import-model-poller.spec.js
+++ b/lib/assets/test/spec/builder/data/background-importer/import-model-poller.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var ImportModelPoller = require('cartodb3/data/background-importer/import-model-poller.js');
+var ImportModelPoller = require('builder/data/background-importer/import-model-poller.js');
describe('ImportModelPoller', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/background-importer/import-model.spec.js b/lib/assets/test/spec/builder/data/background-importer/import-model.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/background-importer/import-model.spec.js
rename to lib/assets/test/spec/builder/data/background-importer/import-model.spec.js
index 208b48478b..4a6b464c26 100644
--- a/lib/assets/test/spec/cartodb3/data/background-importer/import-model.spec.js
+++ b/lib/assets/test/spec/builder/data/background-importer/import-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var ImportModel = require('cartodb3/data/background-importer/import-model.js');
+var ConfigModel = require('builder/data/config-model');
+var ImportModel = require('builder/data/background-importer/import-model.js');
describe('common/background-polling/import-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/background-importer/imports-collection.spec.js b/lib/assets/test/spec/builder/data/background-importer/imports-collection.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/data/background-importer/imports-collection.spec.js
rename to lib/assets/test/spec/builder/data/background-importer/imports-collection.spec.js
index 1bcbed38c9..7337ecc55a 100644
--- a/lib/assets/test/spec/cartodb3/data/background-importer/imports-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/background-importer/imports-collection.spec.js
@@ -1,7 +1,7 @@
-var ImportsCollection = require('cartodb3/data/background-importer/background-importer-imports-collection.js');
-var ImportsModel = require('cartodb3/data/background-importer/imports-model.js');
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var ImportsCollection = require('builder/data/background-importer/background-importer-imports-collection.js');
+var ImportsModel = require('builder/data/background-importer/imports-model.js');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
describe('common/background-polling/imports-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/background-importer/imports-model.spec.js b/lib/assets/test/spec/builder/data/background-importer/imports-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/background-importer/imports-model.spec.js
rename to lib/assets/test/spec/builder/data/background-importer/imports-model.spec.js
index 64fbbb42c5..e3137ca524 100644
--- a/lib/assets/test/spec/cartodb3/data/background-importer/imports-model.spec.js
+++ b/lib/assets/test/spec/builder/data/background-importer/imports-model.spec.js
@@ -1,7 +1,7 @@
-var ImportsModel = require('cartodb3/data/background-importer/imports-model.js');
-var UploadModel = require('cartodb3/data/upload-model.js');
-var UserModel = require('cartodb3/data/user-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var ImportsModel = require('builder/data/background-importer/imports-model.js');
+var UploadModel = require('builder/data/upload-model.js');
+var UserModel = require('builder/data/user-model');
+var ConfigModel = require('builder/data/config-model');
describe('common/background-polling/imports-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/camshaft-reference.spec.js b/lib/assets/test/spec/builder/data/camshaft-reference.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/camshaft-reference.spec.js
rename to lib/assets/test/spec/builder/data/camshaft-reference.spec.js
index 43ae6cd05d..4cba9adbab 100644
--- a/lib/assets/test/spec/cartodb3/data/camshaft-reference.spec.js
+++ b/lib/assets/test/spec/builder/data/camshaft-reference.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
+var camshaftReference = require('builder/data/camshaft-reference');
-describe('cartodb3/data/camshaft-reference', function () {
+describe('builder/data/camshaft-reference', function () {
describe('.getSourceNamesForAnalysisType', function () {
it('should return the source names for a given analyses type', function () {
expect(camshaftReference.getSourceNamesForAnalysisType('source')).toEqual([]);
diff --git a/lib/assets/test/spec/cartodb3/data/config-model.spec.js b/lib/assets/test/spec/builder/data/config-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/data/config-model.spec.js
rename to lib/assets/test/spec/builder/data/config-model.spec.js
index 571d29ec42..8879463624 100644
--- a/lib/assets/test/spec/cartodb3/data/config-model.spec.js
+++ b/lib/assets/test/spec/builder/data/config-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
+var ConfigModel = require('builder/data/config-model');
describe('data/config-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/custom-baselayer-model.spec.js b/lib/assets/test/spec/builder/data/custom-baselayer-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/custom-baselayer-model.spec.js
rename to lib/assets/test/spec/builder/data/custom-baselayer-model.spec.js
index 4726dfabd2..2a12c357d9 100644
--- a/lib/assets/test/spec/cartodb3/data/custom-baselayer-model.spec.js
+++ b/lib/assets/test/spec/builder/data/custom-baselayer-model.spec.js
@@ -1,4 +1,4 @@
-var CustomBaselayerModel = require('cartodb3/data/custom-baselayer-model');
+var CustomBaselayerModel = require('builder/data/custom-baselayer-model');
describe('data/custom-baselayer-model', function () {
describe('.validateTemplateURL', function () {
diff --git a/lib/assets/test/spec/cartodb3/data/custom-baselayers-collection.spec.js b/lib/assets/test/spec/builder/data/custom-baselayers-collection.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/data/custom-baselayers-collection.spec.js
rename to lib/assets/test/spec/builder/data/custom-baselayers-collection.spec.js
index d24e2137ee..0c0cddfb7a 100644
--- a/lib/assets/test/spec/cartodb3/data/custom-baselayers-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/custom-baselayers-collection.spec.js
@@ -1,5 +1,5 @@
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
-var ConfigModel = require('cartodb3/data/config-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
+var ConfigModel = require('builder/data/config-model');
describe('data/custom-baselayers-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/data-observatory/column-name.spec.js b/lib/assets/test/spec/builder/data/data-observatory/column-name.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/data/data-observatory/column-name.spec.js
rename to lib/assets/test/spec/builder/data/data-observatory/column-name.spec.js
index 7c3d62b2a2..27bf4c5a3b 100644
--- a/lib/assets/test/spec/cartodb3/data/data-observatory/column-name.spec.js
+++ b/lib/assets/test/spec/builder/data/data-observatory/column-name.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var DataObservatoryColumnName = require('cartodb3/data/data-observatory/column-name');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var DataObservatoryColumnName = require('builder/data/data-observatory/column-name');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('data/data-observatory/column-name', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/data-observatory/filter-collection.spec.js b/lib/assets/test/spec/builder/data/data-observatory/filter-collection.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/data/data-observatory/filter-collection.spec.js
rename to lib/assets/test/spec/builder/data/data-observatory/filter-collection.spec.js
index c0f9108aa4..e0ebd604d6 100644
--- a/lib/assets/test/spec/cartodb3/data/data-observatory/filter-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/data-observatory/filter-collection.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var FilterListView = require('cartodb3/components/form-components/editors/data-observatory-measurements/filters-list-view');
-var FiltersCollection = require('cartodb3/data/data-observatory/filters-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var FilterListView = require('builder/components/form-components/editors/data-observatory-measurements/filters-list-view');
+var FiltersCollection = require('builder/data/data-observatory/filters-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('data/data-observatory/filter-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/data-observatory/measurements-collection.spec.js b/lib/assets/test/spec/builder/data/data-observatory/measurements-collection.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/data-observatory/measurements-collection.spec.js
rename to lib/assets/test/spec/builder/data/data-observatory/measurements-collection.spec.js
index 8b12386617..f22171bd9f 100644
--- a/lib/assets/test/spec/cartodb3/data/data-observatory/measurements-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/data-observatory/measurements-collection.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var MeasurementsCollection = require('cartodb3/data/data-observatory/measurements-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var MeasurementsCollection = require('builder/data/data-observatory/measurements-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('data/data-observatory/measurements-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/data-observatory/regions-collection.spec.js b/lib/assets/test/spec/builder/data/data-observatory/regions-collection.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/data-observatory/regions-collection.spec.js
rename to lib/assets/test/spec/builder/data/data-observatory/regions-collection.spec.js
index 5c3a77f1a4..c87746ffb3 100644
--- a/lib/assets/test/spec/cartodb3/data/data-observatory/regions-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/data-observatory/regions-collection.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var RegionsCollection = require('cartodb3/data/data-observatory/regions-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var RegionsCollection = require('builder/data/data-observatory/regions-collection');
describe('data/data-observatory/regions-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/data-observatory/timespan-collection.spec.js b/lib/assets/test/spec/builder/data/data-observatory/timespan-collection.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/data/data-observatory/timespan-collection.spec.js
rename to lib/assets/test/spec/builder/data/data-observatory/timespan-collection.spec.js
index 044b37117a..cbab72cfd3 100644
--- a/lib/assets/test/spec/cartodb3/data/data-observatory/timespan-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/data-observatory/timespan-collection.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var TimeSpanCollection = require('cartodb3/data/data-observatory/timespan-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var TimeSpanCollection = require('builder/data/data-observatory/timespan-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('data/data-observatory/timespan-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/editor-background-polling-model.spec.js b/lib/assets/test/spec/builder/data/editor-background-polling-model.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/data/editor-background-polling-model.spec.js
rename to lib/assets/test/spec/builder/data/editor-background-polling-model.spec.js
index b60e8d99ec..954bb9351c 100644
--- a/lib/assets/test/spec/cartodb3/data/editor-background-polling-model.spec.js
+++ b/lib/assets/test/spec/builder/data/editor-background-polling-model.spec.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
var $ = require('jquery');
-var UserModel = require('cartodb3/data/user-model');
-var TableModel = require('cartodb3/data/table-model');
-var BackgroundPollingModel = require('cartodb3/data/editor-background-polling-model');
-var ImportsCollection = require('cartodb3/data/background-importer/background-importer-imports-collection');
-var UserActions = require('cartodb3/data/user-actions');
+var UserModel = require('builder/data/user-model');
+var TableModel = require('builder/data/table-model');
+var BackgroundPollingModel = require('builder/data/editor-background-polling-model');
+var ImportsCollection = require('builder/data/background-importer/background-importer-imports-collection');
+var UserActions = require('builder/data/user-actions');
-describe('cartodb3/data/editor-background-polling-model', function () {
+describe('builder/data/editor-background-polling-model', function () {
beforeEach(function () {
var configModel = new Backbone.Model();
configModel.urlVersion = function () {};
diff --git a/lib/assets/test/spec/cartodb3/data/export-map-definition-model.spec.js b/lib/assets/test/spec/builder/data/export-map-definition-model.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/data/export-map-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/export-map-definition-model.spec.js
index 8c7175b9da..9cd974c017 100644
--- a/lib/assets/test/spec/cartodb3/data/export-map-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/export-map-definition-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var ExportMapDefinitionModel = require('cartodb3/data/export-map-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var ExportMapDefinitionModel = require('builder/data/export-map-definition-model');
describe('data/export-map-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/feature-definition-model.spec.js b/lib/assets/test/spec/builder/data/feature-definition-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/data/feature-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/feature-definition-model.spec.js
index fff8e79893..c07e4926db 100644
--- a/lib/assets/test/spec/cartodb3/data/feature-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/feature-definition-model.spec.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var FeatureDefinitionModel = require('cartodb3/data/feature-definition-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var FeatureDefinitionModel = require('builder/data/feature-definition-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
describe('data/feature-definition-model', function () {
var userModel;
diff --git a/lib/assets/test/spec/cartodb3/data/grantables-collection.spec.js b/lib/assets/test/spec/builder/data/grantables-collection.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/data/grantables-collection.spec.js
rename to lib/assets/test/spec/builder/data/grantables-collection.spec.js
index b33930c3db..11abe5ebcc 100644
--- a/lib/assets/test/spec/cartodb3/data/grantables-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/grantables-collection.spec.js
@@ -1,6 +1,6 @@
-var GrantablesCollection = require('cartodb3/data/grantables-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var OrganizationModel = require('cartodb3/data/organization-model');
+var GrantablesCollection = require('builder/data/grantables-collection');
+var ConfigModel = require('builder/data/config-model');
+var OrganizationModel = require('builder/data/organization-model');
describe('data/grantables-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/infowindow-definition-model.spec.js b/lib/assets/test/spec/builder/data/infowindow-definition-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/data/infowindow-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/infowindow-definition-model.spec.js
index dc9ce84167..45ea408df5 100644
--- a/lib/assets/test/spec/cartodb3/data/infowindow-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/infowindow-definition-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
describe('data/infowindow-definition-model', function () {
describe('model', function () {
diff --git a/lib/assets/test/spec/cartodb3/data/infowindow-hover-model.spec.js b/lib/assets/test/spec/builder/data/infowindow-hover-model.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/data/infowindow-hover-model.spec.js
rename to lib/assets/test/spec/builder/data/infowindow-hover-model.spec.js
index e9eedf8e87..27bd2d6b97 100644
--- a/lib/assets/test/spec/cartodb3/data/infowindow-hover-model.spec.js
+++ b/lib/assets/test/spec/builder/data/infowindow-hover-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var InfowindowHoverModel = require('cartodb3/data/infowindow-hover-model');
+var ConfigModel = require('builder/data/config-model');
+var InfowindowHoverModel = require('builder/data/infowindow-hover-model');
describe('data/infowindow-hover-model', function () {
describe('model', function () {
diff --git a/lib/assets/test/spec/cartodb3/data/layer-colors.spec.js b/lib/assets/test/spec/builder/data/layer-colors.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/layer-colors.spec.js
rename to lib/assets/test/spec/builder/data/layer-colors.spec.js
index 678fca3c20..12333cbb65 100644
--- a/lib/assets/test/spec/cartodb3/data/layer-colors.spec.js
+++ b/lib/assets/test/spec/builder/data/layer-colors.spec.js
@@ -1,4 +1,4 @@
-var layerColors = require('cartodb3/data/layer-colors');
+var layerColors = require('builder/data/layer-colors');
describe('data/layer-colors', function () {
describe('.getColorForLetter', function () {
diff --git a/lib/assets/test/spec/cartodb3/data/layer-definition-model.spec.js b/lib/assets/test/spec/builder/data/layer-definition-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/layer-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/layer-definition-model.spec.js
index e416b79e7a..a62594645d 100644
--- a/lib/assets/test/spec/cartodb3/data/layer-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/layer-definition-model.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
describe('data/layer-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/layer-definitions-collection.spec.js b/lib/assets/test/spec/builder/data/layer-definitions-collection.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/layer-definitions-collection.spec.js
rename to lib/assets/test/spec/builder/data/layer-definitions-collection.spec.js
index f12027b17b..36f7252667 100644
--- a/lib/assets/test/spec/cartodb3/data/layer-definitions-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/layer-definitions-collection.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var layerColors = require('cartodb3/data/layer-colors');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var layerColors = require('builder/data/layer-colors');
describe('data/layer-definitions-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/layer-types-and-kinds.spec.js b/lib/assets/test/spec/builder/data/layer-types-and-kinds.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/layer-types-and-kinds.spec.js
rename to lib/assets/test/spec/builder/data/layer-types-and-kinds.spec.js
index adb20c7b7a..85d1107a20 100644
--- a/lib/assets/test/spec/cartodb3/data/layer-types-and-kinds.spec.js
+++ b/lib/assets/test/spec/builder/data/layer-types-and-kinds.spec.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var layerTypesAndKinds = require('cartodb3/data/layer-types-and-kinds');
+var layerTypesAndKinds = require('builder/data/layer-types-and-kinds');
describe('data/layer-types-and-kinds', function () {
describe('.getKind', function () {
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legend-bubble-definition-model.spec.js b/lib/assets/test/spec/builder/data/legends/legend-bubble-definition-model.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/data/legends/legend-bubble-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/legends/legend-bubble-definition-model.spec.js
index 444cc484ad..1940d318ad 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legend-bubble-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legend-bubble-definition-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LegendDefinitionModel = require('cartodb3/data/legends/legend-bubble-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var LegendDefinitionModel = require('builder/data/legends/legend-bubble-definition-model');
describe('data/legends/legend-bubble-defintion-model', function () {
var style;
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legend-choropleth-definition-model.spec.js b/lib/assets/test/spec/builder/data/legends/legend-choropleth-definition-model.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/data/legends/legend-choropleth-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/legends/legend-choropleth-definition-model.spec.js
index e46b84df85..d413978eef 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legend-choropleth-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legend-choropleth-definition-model.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LegendDefinitionModel = require('cartodb3/data/legends/legend-choropleth-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var LegendDefinitionModel = require('builder/data/legends/legend-choropleth-definition-model');
describe('data/legends/legend-choropleth-defintion-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legend-custom-choropleth-definition-model.spec.js b/lib/assets/test/spec/builder/data/legends/legend-custom-choropleth-definition-model.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/data/legends/legend-custom-choropleth-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/legends/legend-custom-choropleth-definition-model.spec.js
index f466ece770..46f0c36a8c 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legend-custom-choropleth-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legend-custom-choropleth-definition-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LegendCustomChoroplethDefinitionModel = require('cartodb3/data/legends/legend-custom-choropleth-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var LegendCustomChoroplethDefinitionModel = require('builder/data/legends/legend-custom-choropleth-definition-model');
describe('data/legends/legend-choropleth-defintion-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legend-custom-definition-model.spec.js b/lib/assets/test/spec/builder/data/legends/legend-custom-definition-model.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/data/legends/legend-custom-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/legends/legend-custom-definition-model.spec.js
index 52b3a3a6a4..39c9e704a3 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legend-custom-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legend-custom-definition-model.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LegendDefinitionModel = require('cartodb3/data/legends/legend-custom-definition-model');
-var StyleHelper = require('cartodb3/helpers/style');
+var ConfigModel = require('builder/data/config-model');
+var LegendDefinitionModel = require('builder/data/legends/legend-custom-definition-model');
+var StyleHelper = require('builder/helpers/style');
describe('data/legends/legend-custom-defintion-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legend-definitions-collection.spec.js b/lib/assets/test/spec/builder/data/legends/legend-definitions-collection.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/data/legends/legend-definitions-collection.spec.js
rename to lib/assets/test/spec/builder/data/legends/legend-definitions-collection.spec.js
index 01e96320f4..636bbce0ec 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legend-definitions-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legend-definitions-collection.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var LegendDefinitionCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var ConfigModel = require('cartodb3/data/config-model');
+var LegendDefinitionCollection = require('builder/data/legends/legend-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
describe('data/legends/legend-definitions-collection', function () {
var legendDefCollection;
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legend-torque-definition-model.spec.js b/lib/assets/test/spec/builder/data/legends/legend-torque-definition-model.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/data/legends/legend-torque-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/legends/legend-torque-definition-model.spec.js
index e25e58606d..89fe61ab15 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legend-torque-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legend-torque-definition-model.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LegendDefinitionModel = require('cartodb3/data/legends/legend-torque-definition-model');
-var StyleHelper = require('cartodb3/helpers/style');
+var ConfigModel = require('builder/data/config-model');
+var LegendDefinitionModel = require('builder/data/legends/legend-torque-definition-model');
+var StyleHelper = require('builder/helpers/style');
describe('data/legends/legend-torque-defintion-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/legends/legends-state.spec.js b/lib/assets/test/spec/builder/data/legends/legends-state.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/legends/legends-state.spec.js
rename to lib/assets/test/spec/builder/data/legends/legends-state.spec.js
index 40d9901048..abe0f00b50 100644
--- a/lib/assets/test/spec/cartodb3/data/legends/legends-state.spec.js
+++ b/lib/assets/test/spec/builder/data/legends/legends-state.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var LegendsState = require('cartodb3/data/legends/legends-state');
+var LegendsState = require('builder/data/legends/legends-state');
describe('data/legends/legends-state', function () {
beforeAll(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/map-definition-model.spec.js b/lib/assets/test/spec/builder/data/map-definition-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/data/map-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/map-definition-model.spec.js
index 7241a973e1..4e5c82d22c 100644
--- a/lib/assets/test/spec/cartodb3/data/map-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/map-definition-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var MapDefinitionModel = require('cartodb3/data/map-definition-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var MapDefinitionModel = require('builder/data/map-definition-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
describe('data/map-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/organization-assets-collection.spec.js b/lib/assets/test/spec/builder/data/organization-assets-collection.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/data/organization-assets-collection.spec.js
rename to lib/assets/test/spec/builder/data/organization-assets-collection.spec.js
index af3f6d927c..30cd02d1cc 100644
--- a/lib/assets/test/spec/cartodb3/data/organization-assets-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/organization-assets-collection.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var OrganizationAssetsCollection = require('cartodb3/data/organization-assets-collection');
+var OrganizationAssetsCollection = require('builder/data/organization-assets-collection');
describe('data/organization-assets-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/organization-model.spec.js b/lib/assets/test/spec/builder/data/organization-model.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/data/organization-model.spec.js
rename to lib/assets/test/spec/builder/data/organization-model.spec.js
index 7fcd119d1f..cc844454be 100644
--- a/lib/assets/test/spec/cartodb3/data/organization-model.spec.js
+++ b/lib/assets/test/spec/builder/data/organization-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var OrganizationModel = require('cartodb3/data/organization-model');
+var ConfigModel = require('builder/data/config-model');
+var OrganizationModel = require('builder/data/organization-model');
describe('data/organization-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/permission-model.spec.js b/lib/assets/test/spec/builder/data/permission-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/permission-model.spec.js
rename to lib/assets/test/spec/builder/data/permission-model.spec.js
index 73276e7f7d..dad3b1a21c 100644
--- a/lib/assets/test/spec/cartodb3/data/permission-model.spec.js
+++ b/lib/assets/test/spec/builder/data/permission-model.spec.js
@@ -1,7 +1,7 @@
-var PermissionModel = require('cartodb3/data/permission-model');
-var UserModel = require('cartodb3/data/user-model');
-var GroupModel = require('cartodb3/data/group-model');
-var OrganizationModel = require('cartodb3/data/organization-model');
+var PermissionModel = require('builder/data/permission-model');
+var UserModel = require('builder/data/user-model');
+var GroupModel = require('builder/data/group-model');
+var OrganizationModel = require('builder/data/organization-model');
// PermissionModel exports won't play nicely
var READ_ONLY = 'r';
diff --git a/lib/assets/test/spec/cartodb3/data/query-column-model.spec.js b/lib/assets/test/spec/builder/data/query-column-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/query-column-model.spec.js
rename to lib/assets/test/spec/builder/data/query-column-model.spec.js
index 16fff570ec..75eb66c737 100644
--- a/lib/assets/test/spec/cartodb3/data/query-column-model.spec.js
+++ b/lib/assets/test/spec/builder/data/query-column-model.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var QueryColumnModel = require('cartodb3/data/query-column-model');
+var QueryColumnModel = require('builder/data/query-column-model');
describe('data/query-columns-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/query-columns-collection.spec.js b/lib/assets/test/spec/builder/data/query-columns-collection.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/data/query-columns-collection.spec.js
rename to lib/assets/test/spec/builder/data/query-columns-collection.spec.js
index 07a85477d6..8f5142ea69 100644
--- a/lib/assets/test/spec/cartodb3/data/query-columns-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/query-columns-collection.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryColumnModel = require('cartodb3/data/query-column-model');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryColumnModel = require('builder/data/query-column-model');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
describe('data/query-columns-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/query-geometry-model.spec.js b/lib/assets/test/spec/builder/data/query-geometry-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/query-geometry-model.spec.js
rename to lib/assets/test/spec/builder/data/query-geometry-model.spec.js
index 0a17944481..09c3e2670e 100644
--- a/lib/assets/test/spec/cartodb3/data/query-geometry-model.spec.js
+++ b/lib/assets/test/spec/builder/data/query-geometry-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
+var ConfigModel = require('builder/data/config-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
describe('data/query-geometry-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/query-row-model.spec.js b/lib/assets/test/spec/builder/data/query-row-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/data/query-row-model.spec.js
rename to lib/assets/test/spec/builder/data/query-row-model.spec.js
index 56389a704b..bb6612bf86 100644
--- a/lib/assets/test/spec/cartodb3/data/query-row-model.spec.js
+++ b/lib/assets/test/spec/builder/data/query-row-model.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var QueryRowModel = require('cartodb3/data/query-row-model');
+var QueryRowModel = require('builder/data/query-row-model');
describe('data/query-row-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/query-rows-collection.spec.js b/lib/assets/test/spec/builder/data/query-rows-collection.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/query-rows-collection.spec.js
rename to lib/assets/test/spec/builder/data/query-rows-collection.spec.js
index 3ca7c1bc06..1661100563 100644
--- a/lib/assets/test/spec/cartodb3/data/query-rows-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/query-rows-collection.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
describe('data/query-rows-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/query-schema-model.spec.js b/lib/assets/test/spec/builder/data/query-schema-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/query-schema-model.spec.js
rename to lib/assets/test/spec/builder/data/query-schema-model.spec.js
index 2ecbac63bd..91be4c8027 100644
--- a/lib/assets/test/spec/cartodb3/data/query-schema-model.spec.js
+++ b/lib/assets/test/spec/builder/data/query-schema-model.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
describe('data/query-schema-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/state-definition-model.spec.js b/lib/assets/test/spec/builder/data/state-definition-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/data/state-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/state-definition-model.spec.js
index b70c29bcb5..3e2fe22e5f 100644
--- a/lib/assets/test/spec/cartodb3/data/state-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/state-definition-model.spec.js
@@ -1,4 +1,4 @@
-var StateDefinitionModel = require('cartodb3/data/state-definition-model');
+var StateDefinitionModel = require('builder/data/state-definition-model');
describe('data/state-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/static-asset-model.spec.js b/lib/assets/test/spec/builder/data/static-asset-model.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/data/static-asset-model.spec.js
rename to lib/assets/test/spec/builder/data/static-asset-model.spec.js
index 0acc6be1ba..159e8e3748 100644
--- a/lib/assets/test/spec/cartodb3/data/static-asset-model.spec.js
+++ b/lib/assets/test/spec/builder/data/static-asset-model.spec.js
@@ -1,4 +1,4 @@
-var StaticAssetModel = require('cartodb3/data/static-asset-model');
+var StaticAssetModel = require('builder/data/static-asset-model');
describe('data/static-asset-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/synchronization-model.spec.js b/lib/assets/test/spec/builder/data/synchronization-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/data/synchronization-model.spec.js
rename to lib/assets/test/spec/builder/data/synchronization-model.spec.js
index b6bd520b42..0441b12354 100644
--- a/lib/assets/test/spec/cartodb3/data/synchronization-model.spec.js
+++ b/lib/assets/test/spec/builder/data/synchronization-model.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
-var TableModel = require('cartodb3/data/table-model');
-var SynchronizationModel = require('cartodb3/data/synchronization-model');
+var TableModel = require('builder/data/table-model');
+var SynchronizationModel = require('builder/data/synchronization-model');
describe('data/synchronization', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/table-model.spec.js b/lib/assets/test/spec/builder/data/table-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/table-model.spec.js
rename to lib/assets/test/spec/builder/data/table-model.spec.js
index 1eb4ef7b2f..4e6b77c8b0 100644
--- a/lib/assets/test/spec/cartodb3/data/table-model.spec.js
+++ b/lib/assets/test/spec/builder/data/table-model.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var TableModel = require('cartodb3/data/table-model');
-var PermissionModel = require('cartodb3/data/permission-model');
-var UserModel = require('cartodb3/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var TableModel = require('builder/data/table-model');
+var PermissionModel = require('builder/data/permission-model');
+var UserModel = require('builder/data/user-model');
describe('data/table-model', function () {
var configModel;
diff --git a/lib/assets/test/spec/cartodb3/data/tables-collection.spec.js b/lib/assets/test/spec/builder/data/tables-collection.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/data/tables-collection.spec.js
rename to lib/assets/test/spec/builder/data/tables-collection.spec.js
index a6b1e0ec8b..640be5aa3f 100644
--- a/lib/assets/test/spec/cartodb3/data/tables-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/tables-collection.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var TablesCollection = require('cartodb3/data/tables-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var TablesCollection = require('builder/data/tables-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
describe('data/tables-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/undo-manager.spec.js b/lib/assets/test/spec/builder/data/undo-manager.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/undo-manager.spec.js
rename to lib/assets/test/spec/builder/data/undo-manager.spec.js
index 248a4c56bc..522051f5f7 100644
--- a/lib/assets/test/spec/cartodb3/data/undo-manager.spec.js
+++ b/lib/assets/test/spec/builder/data/undo-manager.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var UndoManager = require('cartodb3/data/undo-manager');
+var UndoManager = require('builder/data/undo-manager');
describe('data/undo-manager', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/upload-model.spec.js b/lib/assets/test/spec/builder/data/upload-model.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/data/upload-model.spec.js
rename to lib/assets/test/spec/builder/data/upload-model.spec.js
index ab1c6977a9..56e4ba64e6 100644
--- a/lib/assets/test/spec/cartodb3/data/upload-model.spec.js
+++ b/lib/assets/test/spec/builder/data/upload-model.spec.js
@@ -1,6 +1,6 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var UploadModel = require('cartodb3/data/upload-model');
-var UserModel = require('cartodb3/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var UploadModel = require('builder/data/upload-model');
+var UserModel = require('builder/data/user-model');
describe('data/upload-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/user-actions.spec.js b/lib/assets/test/spec/builder/data/user-actions.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/user-actions.spec.js
rename to lib/assets/test/spec/builder/data/user-actions.spec.js
index 94771f3ccf..455627159a 100644
--- a/lib/assets/test/spec/cartodb3/data/user-actions.spec.js
+++ b/lib/assets/test/spec/builder/data/user-actions.spec.js
@@ -2,25 +2,25 @@ var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
var CDB = require('cartodb.js');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionsCollection = require('cartodb3/data/analysis-definitions-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var WidgetDefinitionsCollection = require('cartodb3/data/widget-definitions-collection');
-var AnalysisFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
-var UserActions = require('cartodb3/data/user-actions');
-var AreaOfInfluenceFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model');
-var CategoryWidgetOptionModel = require('cartodb3/components/modals/add-widgets/category/category-option-model');
-var FilterByNodeColumnFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column');
-var TableModel = require('cartodb3/data/table-model');
-var AnalysisSourceOptionsModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model');
-var analyses = require('cartodb3/data/analyses');
-
-describe('cartodb3/data/user-actions', function () {
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionsCollection = require('builder/data/analysis-definitions-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var WidgetDefinitionsCollection = require('builder/data/widget-definitions-collection');
+var AnalysisFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
+var UserActions = require('builder/data/user-actions');
+var AreaOfInfluenceFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model');
+var CategoryWidgetOptionModel = require('builder/components/modals/add-widgets/category/category-option-model');
+var FilterByNodeColumnFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column');
+var TableModel = require('builder/data/table-model');
+var AnalysisSourceOptionsModel = require('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model');
+var analyses = require('builder/data/analyses');
+
+describe('builder/data/user-actions', function () {
var interceptAjaxCall;
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/user-model.spec.js b/lib/assets/test/spec/builder/data/user-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/data/user-model.spec.js
rename to lib/assets/test/spec/builder/data/user-model.spec.js
index e4ad2f6f82..8551abe586 100644
--- a/lib/assets/test/spec/cartodb3/data/user-model.spec.js
+++ b/lib/assets/test/spec/builder/data/user-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
describe('data/user-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/user-notifications.spec.js b/lib/assets/test/spec/builder/data/user-notifications.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/data/user-notifications.spec.js
rename to lib/assets/test/spec/builder/data/user-notifications.spec.js
index d6cb7cf99a..b7d63a1a14 100644
--- a/lib/assets/test/spec/cartodb3/data/user-notifications.spec.js
+++ b/lib/assets/test/spec/builder/data/user-notifications.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var UserNotifications = require('cartodb3/data/user-notifications');
+var ConfigModel = require('builder/data/config-model');
+var UserNotifications = require('builder/data/user-notifications');
describe('data/user-notifications', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/vis-definition-model.spec.js b/lib/assets/test/spec/builder/data/vis-definition-model.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/data/vis-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/vis-definition-model.spec.js
index 174fe251e5..bde6f41bc8 100644
--- a/lib/assets/test/spec/cartodb3/data/vis-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/vis-definition-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
describe('data/vis-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/visualizations-fetch-model.spec.js b/lib/assets/test/spec/builder/data/visualizations-fetch-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/data/visualizations-fetch-model.spec.js
rename to lib/assets/test/spec/builder/data/visualizations-fetch-model.spec.js
index 061649ba2b..b4b71c6431 100644
--- a/lib/assets/test/spec/cartodb3/data/visualizations-fetch-model.spec.js
+++ b/lib/assets/test/spec/builder/data/visualizations-fetch-model.spec.js
@@ -1,4 +1,4 @@
-var VisualizationsFetchModel = require('cartodb3/data/visualizations-fetch-model');
+var VisualizationsFetchModel = require('builder/data/visualizations-fetch-model');
describe('data/visualizations-fetch-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/widget-definition-model.spec.js b/lib/assets/test/spec/builder/data/widget-definition-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/data/widget-definition-model.spec.js
rename to lib/assets/test/spec/builder/data/widget-definition-model.spec.js
index 9faaa10f19..eda84353aa 100644
--- a/lib/assets/test/spec/cartodb3/data/widget-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/data/widget-definition-model.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
-var WidgetDefinitionsCollection = require('cartodb3/data/widget-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
+var WidgetDefinitionsCollection = require('builder/data/widget-definitions-collection');
var configModel;
-describe('cartodb3/data/widget-definition-model', function () {
+describe('builder/data/widget-definition-model', function () {
beforeEach(function () {
configModel = new ConfigModel({
base_url: '/u/pepe'
diff --git a/lib/assets/test/spec/cartodb3/data/widget-definitions-collection.spec.js b/lib/assets/test/spec/builder/data/widget-definitions-collection.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/data/widget-definitions-collection.spec.js
rename to lib/assets/test/spec/builder/data/widget-definitions-collection.spec.js
index fe51a8a3cf..0105959e47 100644
--- a/lib/assets/test/spec/cartodb3/data/widget-definitions-collection.spec.js
+++ b/lib/assets/test/spec/builder/data/widget-definitions-collection.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var WidgetDefinitionsCollection = require('cartodb3/data/widget-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var WidgetDefinitionsCollection = require('builder/data/widget-definitions-collection');
describe('data/widget-definitions-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/data/wms-service.spec.js b/lib/assets/test/spec/builder/data/wms-service.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/data/wms-service.spec.js
rename to lib/assets/test/spec/builder/data/wms-service.spec.js
index ae1ef025b2..0f74428fd7 100644
--- a/lib/assets/test/spec/cartodb3/data/wms-service.spec.js
+++ b/lib/assets/test/spec/builder/data/wms-service.spec.js
@@ -1,4 +1,4 @@
-var WMSService = require('cartodb3/data/wms-service');
+var WMSService = require('builder/data/wms-service');
describe('data/wms-service', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/dataset/create-context-menu.spec.js b/lib/assets/test/spec/builder/dataset/create-context-menu.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/dataset/create-context-menu.spec.js
rename to lib/assets/test/spec/builder/dataset/create-context-menu.spec.js
index 18c6d7213e..203688e5b0 100644
--- a/lib/assets/test/spec/cartodb3/dataset/create-context-menu.spec.js
+++ b/lib/assets/test/spec/builder/dataset/create-context-menu.spec.js
@@ -1,4 +1,4 @@
-var createContextMenu = require('cartodb3/dataset/dataset-header/create-context-menu');
+var createContextMenu = require('builder/dataset/dataset-header/create-context-menu');
describe('dataset/create-context-menu', function () {
it('should provide all options when user is owner', function () {
diff --git a/lib/assets/test/spec/cartodb3/dataset/dataset-content-view.spec.js b/lib/assets/test/spec/builder/dataset/dataset-content-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/dataset/dataset-content-view.spec.js
rename to lib/assets/test/spec/builder/dataset/dataset-content-view.spec.js
index 26954d8eff..3d27b783b3 100644
--- a/lib/assets/test/spec/cartodb3/dataset/dataset-content-view.spec.js
+++ b/lib/assets/test/spec/builder/dataset/dataset-content-view.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var DatasetContentView = require('cartodb3/dataset/dataset-content/dataset-content-view');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
+var ConfigModel = require('builder/data/config-model');
+var DatasetContentView = require('builder/dataset/dataset-content/dataset-content-view');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
var FactoryModals = require('../factories/modals');
describe('dataset/dataset-content-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/dataset/dataset-header-view.spec.js b/lib/assets/test/spec/builder/dataset/dataset-header-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/dataset/dataset-header-view.spec.js
rename to lib/assets/test/spec/builder/dataset/dataset-header-view.spec.js
index d3167c1302..bb4d01f6d4 100644
--- a/lib/assets/test/spec/cartodb3/dataset/dataset-header-view.spec.js
+++ b/lib/assets/test/spec/builder/dataset/dataset-header-view.spec.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var HeaderView = require('cartodb3/dataset/dataset-header/dataset-header-view');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var VisModel = require('cartodb3/data/vis-definition-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var HeaderView = require('builder/dataset/dataset-header/dataset-header-view');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var VisModel = require('builder/data/vis-definition-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
describe('dataset/dataset-header-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/dataset/dataset-options-view.spec.js b/lib/assets/test/spec/builder/dataset/dataset-options-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/dataset/dataset-options-view.spec.js
rename to lib/assets/test/spec/builder/dataset/dataset-options-view.spec.js
index d825ca1442..8db4cf050c 100644
--- a/lib/assets/test/spec/cartodb3/dataset/dataset-options-view.spec.js
+++ b/lib/assets/test/spec/builder/dataset/dataset-options-view.spec.js
@@ -1,10 +1,10 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var DatasetOptionsView = require('cartodb3/dataset/dataset-options/dataset-options-view');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var VisModel = require('cartodb3/data/vis-definition-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var EditorModel = require('cartodb3/data/editor-model');
+var ConfigModel = require('builder/data/config-model');
+var DatasetOptionsView = require('builder/dataset/dataset-options/dataset-options-view');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var VisModel = require('builder/data/vis-definition-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var EditorModel = require('builder/data/editor-model');
describe('dataset/dataset-options-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/dataset/dataset-view.spec.js b/lib/assets/test/spec/builder/dataset/dataset-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/dataset/dataset-view.spec.js
rename to lib/assets/test/spec/builder/dataset/dataset-view.spec.js
index edd42e69ab..48c4e27307 100644
--- a/lib/assets/test/spec/cartodb3/dataset/dataset-view.spec.js
+++ b/lib/assets/test/spec/builder/dataset/dataset-view.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var DatasetView = require('cartodb3/dataset/dataset-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
+var DatasetView = require('builder/dataset/dataset-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
describe('dataset/dataset-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/analyses-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/analyses-integration.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/analyses-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/analyses-integration.spec.js
index 2b5b54d729..9908b27fc7 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/analyses-integration.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/analyses-integration.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
var Backbone = require('backbone');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var AnalysesIntegration = require('cartodb3/deep-insights-integration/analyses-integration');
-var AnalysisOnboardingLauncher = require('cartodb3/components/onboardings/analysis/analysis-launcher');
+var AnalysesIntegration = require('builder/deep-insights-integration/analyses-integration');
+var AnalysisOnboardingLauncher = require('builder/components/onboardings/analysis/analysis-launcher');
var Onboardings = {
create: function () {}
};
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/deep-insights-helpers.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/deep-insights-helpers.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/deep-insights-helpers.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/deep-insights-helpers.spec.js
index b65eb03073..c0125955c2 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/deep-insights-helpers.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/deep-insights-helpers.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var DIDashboardHelpers = require('cartodb3/deep-insights-integration/deep-insights-helpers');
+var DIDashboardHelpers = require('builder/deep-insights-integration/deep-insights-helpers');
/**
* Tests to check if CARTO.js and Deep-insights.js helpers/API keep working as expected
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/deep-insights-integration-spec-helpers.js b/lib/assets/test/spec/builder/deep-insights-integration/deep-insights-integration-spec-helpers.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/deep-insights-integration-spec-helpers.js
rename to lib/assets/test/spec/builder/deep-insights-integration/deep-insights-integration-spec-helpers.js
index 2a37fbff85..8250649246 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/deep-insights-integration-spec-helpers.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/deep-insights-integration-spec-helpers.js
@@ -2,18 +2,18 @@ var Backbone = require('backbone');
var $ = require('jquery');
var deepInsights = require('../../../../javascripts/deep-insights/index');
-var ConfigModel = require('../../../../javascripts/cartodb3/data/config-model');
-var UserModel = require('../../../../javascripts/cartodb3/data/user-model');
-var AnalysisDefinitionNodesCollection = require('../../../../javascripts/cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionsCollection = require('../../../../javascripts/cartodb3/data/analysis-definitions-collection');
-var DeepInsightsHelpers = require('../../../../javascripts/cartodb3/deep-insights-integration/deep-insights-helpers');
-var LayerDefinitionsCollection = require('../../../../javascripts/cartodb3/data/layer-definitions-collection');
-var VisDefinitionModel = require('../../../../javascripts/cartodb3/data/vis-definition-model');
-var MapDefinitionModel = require('../../../../javascripts/cartodb3/data/map-definition-model');
-var LegendDefinitionsCollection = require('../../../../javascripts/cartodb3/data/legends/legend-definitions-collection');
-var MapModeModel = require('../../../../javascripts/cartodb3/map-mode-model');
-var StateDefinitionModel = require('../../../../javascripts/cartodb3/data/state-definition-model');
-var WidgetDefinitionsCollection = require('../../../../javascripts/cartodb3/data/widget-definitions-collection');
+var ConfigModel = require('../../../../javascripts/builder/data/config-model');
+var UserModel = require('../../../../javascripts/builder/data/user-model');
+var AnalysisDefinitionNodesCollection = require('../../../../javascripts/builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionsCollection = require('../../../../javascripts/builder/data/analysis-definitions-collection');
+var DeepInsightsHelpers = require('../../../../javascripts/builder/deep-insights-integration/deep-insights-helpers');
+var LayerDefinitionsCollection = require('../../../../javascripts/builder/data/layer-definitions-collection');
+var VisDefinitionModel = require('../../../../javascripts/builder/data/vis-definition-model');
+var MapDefinitionModel = require('../../../../javascripts/builder/data/map-definition-model');
+var LegendDefinitionsCollection = require('../../../../javascripts/builder/data/legends/legend-definitions-collection');
+var MapModeModel = require('../../../../javascripts/builder/map-mode-model');
+var StateDefinitionModel = require('../../../../javascripts/builder/data/state-definition-model');
+var WidgetDefinitionsCollection = require('../../../../javascripts/builder/data/widget-definitions-collection');
module.exports = {
createOnboardings: function () {
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/edit-feature-overlay.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/edit-feature-overlay.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/edit-feature-overlay.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/edit-feature-overlay.spec.js
index d6cb354b5b..d9fe3d0e6c 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/edit-feature-overlay.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/edit-feature-overlay.spec.js
@@ -1,14 +1,14 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var EditFeatureOverlay = require('cartodb3/deep-insights-integration/edit-feature-overlay');
-var MapModeModel = require('cartodb3/map-mode-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var FeatureDefinitionModel = require('cartodb3/data/feature-definition-model');
+var EditFeatureOverlay = require('builder/deep-insights-integration/edit-feature-overlay');
+var MapModeModel = require('builder/map-mode-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var FeatureDefinitionModel = require('builder/data/feature-definition-model');
var FactoryModals = require('../factories/modals');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
describe('deep-insights-integrations/edit-feature-overlay', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/features-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/features-integration.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/features-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/features-integration.spec.js
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/layers-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/layers-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js
index 9bf13ee6ac..083e44bebf 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/layers-integration.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js
@@ -1,10 +1,10 @@
var _ = require('underscore');
var Backbone = require('backbone');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var LayersIntegration = require('cartodb3/deep-insights-integration/layers-integration');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
+var Notifier = require('builder/components/notifier/notifier');
+var LayersIntegration = require('builder/deep-insights-integration/layers-integration');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
function flattenObject (object) { // To avoid infinite loop in Jasmine while checking an object with source AnalysisModel against jasmine.objectContaining
return JSON.parse(JSON.stringify(object));
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/legend-manager.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/legend-manager.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/legend-manager.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/legend-manager.spec.js
index a08e0b9baa..b65a955f2e 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/legend-manager.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/legend-manager.spec.js
@@ -1,13 +1,13 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LegendManager = require('cartodb3/deep-insights-integration/legend-manager');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
-var LegendDefinitionsCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var StyleHelper = require('cartodb3/helpers/style');
-var Validations = require('cartodb3/editor/layers/layer-content-views/legend/legend-validations');
+var ConfigModel = require('builder/data/config-model');
+var LegendManager = require('builder/deep-insights-integration/legend-manager');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
+var LegendDefinitionsCollection = require('builder/data/legends/legend-definitions-collection');
+var StyleHelper = require('builder/helpers/style');
+var Validations = require('builder/editor/layers/layer-content-views/legend/legend-validations');
function getSuccessResponse (response, id, type, title) {
var success = _.clone(TestResponses[response].success);
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/legends-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/legends-integration.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/legends-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/legends-integration.spec.js
index 3381ca6042..376903047b 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/legends-integration.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/legends-integration.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var LegendsIntegration = require('cartodb3/deep-insights-integration/legends-integration');
-var LegendDefinitionModel = require('cartodb3/data/legends/legend-base-definition-model');
+var LegendsIntegration = require('builder/deep-insights-integration/legends-integration');
+var LegendDefinitionModel = require('builder/data/legends/legend-base-definition-model');
describe('deep-insights-integrations/legends-integration', function () {
var mapElement;
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/map-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/map-integration.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/map-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/map-integration.spec.js
index 1f051ccf88..f296fa989c 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/map-integration.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/map-integration.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var MapIntegration = require('cartodb3/deep-insights-integration/map-integration');
-var AppNotifications = require('cartodb3/app-notifications');
+var MapIntegration = require('builder/deep-insights-integration/map-integration');
+var AppNotifications = require('builder/app-notifications');
describe('deep-insights-integrations/map-integration', function () {
var mapElement;
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/overlays-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/overlays-integration.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/overlays-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/overlays-integration.spec.js
index 6867e91681..5a66d4f545 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/overlays-integration.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/overlays-integration.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var OverlaysIntegration = require('cartodb3/deep-insights-integration/overlays-integration');
+var OverlaysIntegration = require('builder/deep-insights-integration/overlays-integration');
describe('deep-insights-integrations/overlays-integration', function () {
var mapElement;
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integration/widgets-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/widgets-integration.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/deep-insights-integration/widgets-integration.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integration/widgets-integration.spec.js
index cc71729606..724c8f1550 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integration/widgets-integration.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integration/widgets-integration.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration-spec-helpers');
-var WidgetsIntegration = require('cartodb3/deep-insights-integration/widgets-integration');
-var WidgetsService = require('cartodb3/editor/widgets/widgets-service');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
+var WidgetsIntegration = require('builder/deep-insights-integration/widgets-integration');
+var WidgetsService = require('builder/editor/widgets/widgets-service');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
function flattenObject (object) { // To avoid infinite loop in Jasmine while checking an object with source AnalysisModel against jasmine.objectContaining
return JSON.parse(JSON.stringify(object));
diff --git a/lib/assets/test/spec/cartodb3/deep-insights-integrations.spec.js b/lib/assets/test/spec/builder/deep-insights-integrations.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/deep-insights-integrations.spec.js
rename to lib/assets/test/spec/builder/deep-insights-integrations.spec.js
index 17a37dd081..174d7f4793 100644
--- a/lib/assets/test/spec/cartodb3/deep-insights-integrations.spec.js
+++ b/lib/assets/test/spec/builder/deep-insights-integrations.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var WidgetsIntegration = require('cartodb3/deep-insights-integration/widgets-integration');
-var AnalysesIntegration = require('cartodb3/deep-insights-integration/analyses-integration');
-var DeepInsightsIntegrations = require('cartodb3/deep-insights-integrations');
+var WidgetsIntegration = require('builder/deep-insights-integration/widgets-integration');
+var AnalysesIntegration = require('builder/deep-insights-integration/analyses-integration');
+var DeepInsightsIntegrations = require('builder/deep-insights-integrations');
var deepInsightsIntegrationSpecHelpers = require('./deep-insights-integration/deep-insights-integration-spec-helpers');
describe('deep-insights-integrations/dii', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/analyses/analysis-notifications.spec.js b/lib/assets/test/spec/builder/editor/analyses/analysis-notifications.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/analyses/analysis-notifications.spec.js
rename to lib/assets/test/spec/builder/editor/analyses/analysis-notifications.spec.js
index 5e5b206c65..38d8bbae57 100644
--- a/lib/assets/test/spec/cartodb3/editor/analyses/analysis-notifications.spec.js
+++ b/lib/assets/test/spec/builder/editor/analyses/analysis-notifications.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var AnalysisNotifications = require('cartodb3/editor/layers/analysis-views/analysis-notifications');
+var Notifier = require('builder/components/notifier/notifier');
+var AnalysisNotifications = require('builder/editor/layers/analysis-views/analysis-notifications');
describe('AnalysisNotifications.track', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/components/modals/export-map/modal-export-map-view.spec.js b/lib/assets/test/spec/builder/editor/components/modals/export-map/modal-export-map-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/components/modals/export-map/modal-export-map-view.spec.js
rename to lib/assets/test/spec/builder/editor/components/modals/export-map/modal-export-map-view.spec.js
index 6a8ca2c177..5c621547fc 100644
--- a/lib/assets/test/spec/cartodb3/editor/components/modals/export-map/modal-export-map-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/components/modals/export-map/modal-export-map-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ExportMapModel = require('cartodb3/data/export-map-definition-model');
-var ExportView = require('cartodb3/editor/components/modals/export-map/modal-export-map-view');
-var templateExportMapDownload = require('cartodb3/editor/components/modals/export-map/export-map-download.tpl');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ExportMapModel = require('builder/data/export-map-definition-model');
+var ExportView = require('builder/editor/components/modals/export-map/modal-export-map-view');
+var templateExportMapDownload = require('builder/editor/components/modals/export-map/export-map-download.tpl');
describe('editor/components/modals/export-map/modal-export-map-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/components/toggler/toggler-view.spec.js b/lib/assets/test/spec/builder/editor/components/toggler/toggler-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/components/toggler/toggler-view.spec.js
rename to lib/assets/test/spec/builder/editor/components/toggler/toggler-view.spec.js
index 36a9fdf37b..a19e3e8500 100644
--- a/lib/assets/test/spec/cartodb3/editor/components/toggler/toggler-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/components/toggler/toggler-view.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var Toggler = require('cartodb3/components/toggler/toggler-view.js');
+var Toggler = require('builder/components/toggler/toggler-view.js');
describe('components/toggler/toggler', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/components/undo-redo/undo-redo-view.spec.js b/lib/assets/test/spec/builder/editor/components/undo-redo/undo-redo-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/components/undo-redo/undo-redo-view.spec.js
rename to lib/assets/test/spec/builder/editor/components/undo-redo/undo-redo-view.spec.js
index 29999d846e..d0c9cd2f95 100644
--- a/lib/assets/test/spec/cartodb3/editor/components/undo-redo/undo-redo-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/components/undo-redo/undo-redo-view.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var UndoRedo = require('cartodb3/components/undo-redo/undo-redo-view');
-var EditorModel = require('cartodb3/data/editor-model');
-var StyleModel = require('cartodb3/editor/style/style-definition-model');
+var UndoRedo = require('builder/components/undo-redo/undo-redo-view');
+var EditorModel = require('builder/data/editor-model');
+var StyleModel = require('builder/editor/style/style-definition-model');
describe('components/undo-redo/undo-redo-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/components/view-options/panel-with-options-view.spec.js b/lib/assets/test/spec/builder/editor/components/view-options/panel-with-options-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/components/view-options/panel-with-options-view.spec.js
rename to lib/assets/test/spec/builder/editor/components/view-options/panel-with-options-view.spec.js
index 16bb71cc55..8a1ec5746f 100644
--- a/lib/assets/test/spec/cartodb3/editor/components/view-options/panel-with-options-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/components/view-options/panel-with-options-view.spec.js
@@ -1,6 +1,6 @@
var CoreView = require('backbone/core-view');
-var PanelWithOptions = require('cartodb3/components/view-options/panel-with-options-view.js');
-var EditorModel = require('cartodb3/data/editor-model');
+var PanelWithOptions = require('builder/components/view-options/panel-with-options-view.js');
+var EditorModel = require('builder/data/editor-model');
describe('components/view-options/panel-with-options-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/editor-header.spec.js b/lib/assets/test/spec/builder/editor/editor-header.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/editor-header.spec.js
rename to lib/assets/test/spec/builder/editor/editor-header.spec.js
index 23580d680c..3845159682 100644
--- a/lib/assets/test/spec/cartodb3/editor/editor-header.spec.js
+++ b/lib/assets/test/spec/builder/editor/editor-header.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var Header = require('cartodb3/editor/editor-header.js');
-var EditorModel = require('cartodb3/data/editor-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var UserModel = require('cartodb3/data/user-model');
+var Header = require('builder/editor/editor-header.js');
+var EditorModel = require('builder/data/editor-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var UserModel = require('builder/data/user-model');
describe('editor/editor-header', function () {
var clickPrivacyAction;
diff --git a/lib/assets/test/spec/cartodb3/editor/editor-map-view.spec.js b/lib/assets/test/spec/builder/editor/editor-map-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/editor-map-view.spec.js
rename to lib/assets/test/spec/builder/editor/editor-map-view.spec.js
index 25a39e7a27..e5bef65b4e 100644
--- a/lib/assets/test/spec/cartodb3/editor/editor-map-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/editor-map-view.spec.js
@@ -1,22 +1,22 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
-var EditorMapView = require('cartodb3/editor/editor-map-view');
-var EditorModel = require('cartodb3/data/editor-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var Notifier = require('cartodb3/components/notifier/notifier');
-var AppNotifications = require('cartodb3/app-notifications');
-var ConfigModel = require('cartodb3/data/config-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var MapModeModel = require('cartodb3/map-mode-model');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var Router = require('cartodb3/routes/router');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
+var EditorMapView = require('builder/editor/editor-map-view');
+var EditorModel = require('builder/data/editor-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var Notifier = require('builder/components/notifier/notifier');
+var AppNotifications = require('builder/app-notifications');
+var ConfigModel = require('builder/data/config-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var MapModeModel = require('builder/map-mode-model');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var Router = require('builder/routes/router');
describe('editor/editor-map-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/editor-pane.spec.js b/lib/assets/test/spec/builder/editor/editor-pane.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/editor-pane.spec.js
rename to lib/assets/test/spec/builder/editor/editor-pane.spec.js
index 73d21585a2..19abbddd0f 100644
--- a/lib/assets/test/spec/cartodb3/editor/editor-pane.spec.js
+++ b/lib/assets/test/spec/builder/editor/editor-pane.spec.js
@@ -1,19 +1,19 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var EditorPane = require('cartodb3/editor/editor-pane');
-var EditorModel = require('cartodb3/data/editor-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
-var AppNotifications = require('cartodb3/app-notifications');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var EditorPane = require('builder/editor/editor-pane');
+var EditorModel = require('builder/data/editor-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
+var AppNotifications = require('builder/app-notifications');
describe('editor/editor-pane', function () {
var analysisDefinitionNodeModel;
diff --git a/lib/assets/test/spec/cartodb3/editor/editor-settings-pane.spec.js b/lib/assets/test/spec/builder/editor/editor-settings-pane.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/editor-settings-pane.spec.js
rename to lib/assets/test/spec/builder/editor/editor-settings-pane.spec.js
index 2b9ab40731..ecbd2c22d4 100644
--- a/lib/assets/test/spec/cartodb3/editor/editor-settings-pane.spec.js
+++ b/lib/assets/test/spec/builder/editor/editor-settings-pane.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var EditorSettingsPane = require('cartodb3/editor/editor-settings-pane');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var UserModel = require('cartodb3/data/user-model');
+var EditorSettingsPane = require('builder/editor/editor-settings-pane');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var UserModel = require('builder/data/user-model');
describe('editor/editor-settings-pane', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/editor/editor-settings-view.spec.js b/lib/assets/test/spec/builder/editor/editor-settings-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/editor/editor-settings-view.spec.js
rename to lib/assets/test/spec/builder/editor/editor-settings-view.spec.js
index e90a1ab72b..2f851c48d6 100644
--- a/lib/assets/test/spec/cartodb3/editor/editor-settings-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/editor-settings-view.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var EditorSettingsView = require('cartodb3/editor/editor-settings-view');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var PrivacyCollection = require('cartodb3/components/modals/publish/privacy-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var UserModel = require('cartodb3/data/user-model');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var EditorSettingsView = require('builder/editor/editor-settings-view');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var PrivacyCollection = require('builder/components/modals/publish/privacy-collection');
+var ConfigModel = require('builder/data/config-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var UserModel = require('builder/data/user-model');
+var Notifier = require('builder/components/notifier/notifier');
describe('editor/editor-settings-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/analysis-tooltip-error.spec.js b/lib/assets/test/spec/builder/editor/layers/analysis-view/analysis-tooltip-error.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/layers/analysis-view/analysis-tooltip-error.spec.js
rename to lib/assets/test/spec/builder/editor/layers/analysis-view/analysis-tooltip-error.spec.js
index 850a5c4b71..97a85f3a70 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/analysis-tooltip-error.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/analysis-view/analysis-tooltip-error.spec.js
@@ -1,5 +1,5 @@
var $ = require('jquery');
-var AnalysisTooltip = require('cartodb3/editor/layers/analysis-views/analyses-tooltip-error');
+var AnalysisTooltip = require('builder/editor/layers/analysis-views/analyses-tooltip-error');
describe('editor/layers/analysis-views/analysis-tooltip-error', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/composite-layers-analysis-view.spec.js b/lib/assets/test/spec/builder/editor/layers/analysis-view/composite-layers-analysis-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/analysis-view/composite-layers-analysis-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/analysis-view/composite-layers-analysis-view.spec.js
index c92c3637b2..f9cd97513d 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/composite-layers-analysis-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/analysis-view/composite-layers-analysis-view.spec.js
@@ -1,8 +1,8 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var CompositeLayerAnalysisView = require('cartodb3/editor/layers/analysis-views/composite-layer-analysis-view');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var CompositeLayerAnalysisView = require('builder/editor/layers/analysis-views/composite-layer-analysis-view');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
describe('editor/layers/analysis-views/composite-layer-analysis-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/default-layers-analysis-view.spec.js b/lib/assets/test/spec/builder/editor/layers/analysis-view/default-layers-analysis-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/layers/analysis-view/default-layers-analysis-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/analysis-view/default-layers-analysis-view.spec.js
index 60b8884a52..c39503b47e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/default-layers-analysis-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/analysis-view/default-layers-analysis-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var DefaultLayerAnalysisView = require('cartodb3/editor/layers/analysis-views/default-layer-analysis-view');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var DefaultLayerAnalysisView = require('builder/editor/layers/analysis-views/default-layer-analysis-view');
var $ = require('jquery');
describe('editor/layers/analysis-views/default-layers-analysis-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/ref-layers-analysis-view.spec.js b/lib/assets/test/spec/builder/editor/layers/analysis-view/ref-layers-analysis-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/editor/layers/analysis-view/ref-layers-analysis-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/analysis-view/ref-layers-analysis-view.spec.js
index 674fff2ff4..8fdf4e04d9 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/ref-layers-analysis-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/analysis-view/ref-layers-analysis-view.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var RefLayerAnalysisView = require('cartodb3/editor/layers/analysis-views/ref-layer-analysis-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var RefLayerAnalysisView = require('builder/editor/layers/analysis-views/ref-layer-analysis-view');
describe('editor/layers/analysis-views/ref-layer-analysis-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/source-layers-analysis-view.spec.js b/lib/assets/test/spec/builder/editor/layers/analysis-view/source-layers-analysis-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/layers/analysis-view/source-layers-analysis-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/analysis-view/source-layers-analysis-view.spec.js
index 66a91054da..bcffa21c31 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/analysis-view/source-layers-analysis-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/analysis-view/source-layers-analysis-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var UserModel = require('cartodb3/data/user-model');
-var SourceLayerAnalysisView = require('cartodb3/editor/layers/analysis-views/source-layer-analysis-view');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var TableModel = require('cartodb3/data/table-model');
+var UserModel = require('builder/data/user-model');
+var SourceLayerAnalysisView = require('builder/editor/layers/analysis-views/source-layer-analysis-view');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var TableModel = require('builder/data/table-model');
var _ = require('underscore');
var $ = require('jquery');
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-view.spec.js
index 1507f4c197..4e4de66b2e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-view.spec.js
@@ -1,9 +1,9 @@
-var BasemapContentView = require('cartodb3/editor/layers/basemap-content-view');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
+var BasemapContentView = require('builder/editor/layers/basemap-content-view');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
var FactoryModals = require('../../factories/modals');
describe('editor/layers/basemap-content-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-categories-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-categories-view.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-categories-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-categories-view.spec.js
index a53f0b2266..cbd91c3315 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-categories-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-categories-view.spec.js
@@ -1,5 +1,5 @@
-var BasemapCategoriesView = require('cartodb3/editor/layers/basemap-content-views/basemap-categories-view');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var BasemapCategoriesView = require('builder/editor/layers/basemap-content-views/basemap-categories-view');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
describe('editor/layers/basemap-content-views/basemap-categories-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-form-model.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-form-model.spec.js
index 2866b37119..e5b87f2ecb 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-form-model.spec.js
@@ -1,9 +1,9 @@
-var BasemapFormModel = require('cartodb3/editor/layers/basemap-content-views/basemap-form-model');
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var BasemapFormModel = require('builder/editor/layers/basemap-content-views/basemap-form-model');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
var _ = require('underscore');
describe('editor/layers/basemap-content-views/basemap-form-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-form-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-form-view.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-form-view.spec.js
index f5383b5a26..16e7005f86 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-form-view.spec.js
@@ -1,5 +1,5 @@
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
-var BasemapFormView = require('cartodb3/editor/layers/basemap-content-views/basemap-form-view');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
+var BasemapFormView = require('builder/editor/layers/basemap-content-views/basemap-form-view');
var Backbone = require('backbone');
describe('editor/layers/basemap-content-views/basemap-form-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-header-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-header-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-header-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-header-view.spec.js
index be2a1836cc..42c2d0e004 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-header-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-header-view.spec.js
@@ -1,5 +1,5 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var BasemapHeaderView = require('cartodb3/editor/layers/basemap-content-views/basemap-header-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var BasemapHeaderView = require('builder/editor/layers/basemap-content-views/basemap-header-view');
describe('editor/layers/basemap-content-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-inner-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-inner-view.spec.js
similarity index 77%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-inner-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-inner-view.spec.js
index 5912a1851a..f87815c89a 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-inner-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-inner-view.spec.js
@@ -1,12 +1,12 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var BasemapInnerView = require('cartodb3/editor/layers/basemap-content-views/basemap-inner-view');
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var BasemapInnerView = require('builder/editor/layers/basemap-content-views/basemap-inner-view');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
var FactoryModals = require('../../../factories/modals');
describe('editor/layers/basemap-content-views/basemap-inner-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-model-factory.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-model-factory.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-model-factory.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-model-factory.spec.js
index eed4e82414..63ea72dcb2 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-model-factory.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-model-factory.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var BasemapModelFactory = require('cartodb3/editor/layers/basemap-content-views/basemap-model-factory');
+var BasemapModelFactory = require('builder/editor/layers/basemap-content-views/basemap-model-factory');
var customBaseLayerAttrs = {
'id': '27d7e5bf-7a64-41b1-a6e0-378d842745a0',
@@ -211,7 +211,7 @@ var testCases = [
}
];
-describe('cartodb3/editor/layers/basemap-content-views/basemap-model-factory.js', function () {
+describe('builder/editor/layers/basemap-content-views/basemap-model-factory.js', function () {
describe('.createBasemapModel', function () {
beforeEach(function () {
var layerDefinitionsCollection = new Backbone.Collection();
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-model.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-model.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-model.spec.js
index 039598a694..3d266894f9 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-model.spec.js
@@ -1,4 +1,4 @@
-var BasemapsModel = require('cartodb3/editor/layers/basemap-content-views/basemap-model');
+var BasemapsModel = require('builder/editor/layers/basemap-content-views/basemap-model');
describe('editor/layers/basemap-content-views/basemap-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-select-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-select-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js
index 2a32c07245..fe10e105ff 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemap-select-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js
@@ -1,10 +1,10 @@
-var BasemapSelectView = require('cartodb3/editor/layers/basemap-content-views/basemap-select-view');
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var CustomBaselayersCollection = require('cartodb3/data/custom-baselayers-collection');
+var BasemapSelectView = require('builder/editor/layers/basemap-content-views/basemap-select-view');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var CustomBaselayersCollection = require('builder/data/custom-baselayers-collection');
var FactoryModals = require('../../../factories/modals');
describe('editor/layers/basemap-content-views/basemap-select-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemaps-collection.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemaps-collection.spec.js
rename to lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js
index 9ce20ce6c6..1c2e1b5287 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/basemap-content-views/basemaps-collection.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js
@@ -1,4 +1,4 @@
-var BasemapsCollection = require('cartodb3/editor/layers/basemap-content-views/basemaps-collection');
+var BasemapsCollection = require('builder/editor/layers/basemap-content-views/basemaps-collection');
describe('editor/layers/basemap-content-views/basemaps-collection', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-view.spec.js
index 65d6438426..196d11f82d 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-view.spec.js
@@ -1,16 +1,16 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var EditFeatureContentView = require('cartodb3/editor/layers/edit-feature-content-view');
-var MapModeModel = require('cartodb3/map-mode-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var FeatureDefinitionModel = require('cartodb3/data/feature-definition-model');
-var EditorModel = require('cartodb3/data/editor-model');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var Stylehelper = require('cartodb3/helpers/style');
-var Router = require('cartodb3/routes/router');
+var EditFeatureContentView = require('builder/editor/layers/edit-feature-content-view');
+var MapModeModel = require('builder/map-mode-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var FeatureDefinitionModel = require('builder/data/feature-definition-model');
+var EditorModel = require('builder/data/editor-model');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var Stylehelper = require('builder/helpers/style');
+var Router = require('builder/routes/router');
var QueryGeometryModelMock = function (simple_geom) {
var geom = simple_geom || '';
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-action-view.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-action-view.spec.js
index 7ac5131032..f6e40b076b 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-action-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-action-view.spec.js
@@ -1,13 +1,13 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var EditFeatureActionView = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-action-view');
-var EditFeatureGeometryFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model');
-var EditFeatureAttributesFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var EditFeatureActionView = require('builder/editor/layers/edit-feature-content-views/edit-feature-action-view');
+var EditFeatureGeometryFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model');
+var EditFeatureAttributesFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
describe('editor/layers/edit-feature-content-views/edit-feature-action-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.spec.js
index 76b6eaf910..1b2d35dba6 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
-var EditFeatureAttributesFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var UserModel = require('cartodb3/data/user-model');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
+var EditFeatureAttributesFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var UserModel = require('builder/data/user-model');
var CDB = require('cartodb.js');
describe('editor/layers/edit-feature-content-views/edit-feature-attributes-form-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.spec.js
index da30a23863..fe91b799a2 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var EditFeatureAttributesFormView = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view');
+var EditFeatureAttributesFormView = require('builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-view');
describe('editor/layers/edit-feature-content-views/edit-feature-attributes-form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-control-view.spec.js
similarity index 77%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-control-view.spec.js
index 28bfee6b0b..20545a717a 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-control-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-control-view.spec.js
@@ -1,4 +1,4 @@
-var EditFeatureControlView = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-control-view');
+var EditFeatureControlView = require('builder/editor/layers/edit-feature-content-views/edit-feature-control-view');
describe('editor/layers/edit-feature-content-views/edit-feature-control-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.spec.js
index fd585b618d..72f8cff13e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
require('backbone-forms');
-var EditFeatureGeometryFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model');
-var EditFeatureGeometryPointFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-point-form-model');
+var EditFeatureGeometryFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model');
+var EditFeatureGeometryPointFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-geometry-point-form-model');
describe('editor/layers/edit-feature-content-views/edit-feature-geometry-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.spec.js
index 14306e9564..73e39c4639 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var EditFeatureGeometryFormView = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view');
+var EditFeatureGeometryFormView = require('builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-view');
describe('editor/layers/edit-feature-content-views/edit-feature-geometry-form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-header-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-header-view.spec.js
index eda0afd446..8675cc95ee 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-header-view.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var EditFeatureHeaderView = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-header-view');
+var EditFeatureHeaderView = require('builder/editor/layers/edit-feature-content-views/edit-feature-header-view');
var FactoryModals = require('../../../factories/modals');
describe('editor/layers/edit-feature-content-views/edit-feature-header-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-inner-view.spec.js b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-inner-view.spec.js
similarity index 76%
rename from lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-inner-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-inner-view.spec.js
index 5b51974068..5a562fb193 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/edit-feature-content-views/edit-feature-inner-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/edit-feature-content-views/edit-feature-inner-view.spec.js
@@ -1,14 +1,14 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var EditFeatureInnerView = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-inner-view');
-var EditFeatureGeometryFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model');
-var EditFeatureAttributesFormModel = require('cartodb3/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryColumnsCollection = require('cartodb3/data/query-columns-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var EditFeatureInnerView = require('builder/editor/layers/edit-feature-content-views/edit-feature-inner-view');
+var EditFeatureGeometryFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-geometry-form-model');
+var EditFeatureAttributesFormModel = require('builder/editor/layers/edit-feature-content-views/edit-feature-attributes-form-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryColumnsCollection = require('builder/data/query-columns-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
describe('editor/layers/edit-feature-content-views/edit-feature-inner-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-analyses-views.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-analyses-views.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-analyses-views.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-analyses-views.spec.js
index e10307fdc5..46c42d3311 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-analyses-views.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-analyses-views.spec.js
@@ -1,9 +1,9 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerAnalysesView = require('cartodb3/editor/layers/layer-analyses-view');
-var LayerAnalysisViewFactory = require('cartodb3/editor/layers/layer-analysis-view-factory');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerAnalysesView = require('builder/editor/layers/layer-analyses-view');
+var LayerAnalysisViewFactory = require('builder/editor/layers/layer-analysis-view-factory');
describe('editor/layers/layer-analyses-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-analysis-draggable-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-analysis-draggable-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-analysis-draggable-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-analysis-draggable-view.spec.js
index f17ae68d36..a232e2f894 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-analysis-draggable-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-analysis-draggable-view.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var LayerAnalysisDraggableView = require('cartodb3/editor/layers/layer-analysis-draggable-view');
+var LayerAnalysisDraggableView = require('builder/editor/layers/layer-analysis-draggable-view');
describe('editor/layers/layer-analysis-draggable-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view.spec.js
index 24fa41e44d..5dcc0e1412 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view.spec.js
@@ -1,18 +1,18 @@
var _ = require('underscore');
var $ = require('jquery');
var Backbone = require('backbone');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisFormsCollection = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LayerContentView = require('cartodb3/editor/layers/layer-content-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var EditorModel = require('cartodb3/data/editor-model');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisFormsCollection = require('builder/editor/layers/layer-content-views/analyses/analysis-forms-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LayerContentView = require('builder/editor/layers/layer-content-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var EditorModel = require('builder/data/editor-model');
+var UserNotifications = require('builder/data/user-notifications');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
var FactoryModals = require('../../factories/modals');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
describe('editor/layers/layer-content-view/layer-content-view', function () {
var view, analysisDefinitionNodeModel, editorModel, layerDefinitionModel;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses-content-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses-content-view.spec.js
index 5db0eef321..5da90b4230 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses-content-view.spec.js
@@ -1,19 +1,19 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisFormsCollection = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection');
-var AnalysesContentView = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-content-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var analysisPlaceholderTemplate = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl');
-var analysisSQLErrorTemplate = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
-var AnalysisControlsView = require('cartodb3/components/scroll/scroll-view');
-var Router = require('cartodb3/routes/router');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisFormsCollection = require('builder/editor/layers/layer-content-views/analyses/analysis-forms-collection');
+var AnalysesContentView = require('builder/editor/layers/layer-content-views/analyses/analyses-content-view');
+var ConfigModel = require('builder/data/config-model');
+var LayerContentModel = require('builder/data/layer-content-model');
+var analysisPlaceholderTemplate = require('builder/editor/layers/layer-content-views/analyses/analyses-placeholder.tpl');
+var analysisSQLErrorTemplate = require('builder/editor/layers/layer-content-views/analyses/analyses-sql-error.tpl');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
+var ScrollView = require('builder/components/scroll/scroll-view');
+var AnalysisControlsView = require('builder/components/scroll/scroll-view');
+var Router = require('builder/routes/router');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
describe('editor/layers/layer-content-view/analyses-content-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-form-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-form-model.spec.js
index 6bf5e25cb5..12032cf29b 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-form-model.spec.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AreaOfInfluenceFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AreaOfInfluenceFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-types.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-types.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-types.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-types.spec.js
index fe4a560146..4c4b3e604e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-types.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/area-of-influence-types.spec.js
@@ -1,4 +1,4 @@
-var AREA_OF_INFLUENCE_TYPES = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types');
+var AREA_OF_INFLUENCE_TYPES = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-types', function () {
AREA_OF_INFLUENCE_TYPES.forEach(function (d) {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/base-analysis-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/base-analysis-form-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/base-analysis-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/base-analysis-form-model.spec.js
index c65f7731b0..57b717f05a 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/base-analysis-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/base-analysis-form-model.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
-var UserActions = require('cartodb3/data/user-actions');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var BaseAnalysisFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
-var analyses = require('cartodb3/data/analyses');
+var camshaftReference = require('builder/data/camshaft-reference');
+var UserActions = require('builder/data/user-actions');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var BaseAnalysisFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/centroid-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/centroid-form-model.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/centroid-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/centroid-form-model.spec.js
index 5ab9911e09..4a22716b4e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/centroid-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/centroid-form-model.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var CentroidFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var CentroidFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/centroid-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/closest-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/closest-form-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/closest-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/closest-form-model.spec.js
index 260bbcff05..473d6740c3 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/closest-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/closest-form-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
var cdb = require('cartodb.js');
-var Model = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model');
-var BaseAnalysisFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
-var analyses = require('cartodb3/data/analyses');
+var Model = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model');
+var BaseAnalysisFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/closest-form-model', function () {
var cdbSQLBackup;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-measure-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-measure-model.spec.js
similarity index 79%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-measure-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-measure-model.spec.js
index e8c53947ea..2a6c375294 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-measure-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-measure-model.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var DataObservatoryMeasureModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var DataObservatoryMeasureModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-measure-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-measure-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-measure-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-measure-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-measure-model.spec.js
index 84d5d20917..ad9565b415 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-measure-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-measure-model.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var DataObservatoryMeasureModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var DataObservatoryMeasureModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-measure-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-nested-measure-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-nested-measure-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-nested-measure-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-nested-measure-model.spec.js
index c71ae89f05..147a4d7f8f 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-nested-measure-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/data-observatory-multiple-nested-measure-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var DataObservatoryMeasureModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model');
-var RegionsCollection = require('cartodb3/data/data-observatory/regions-collection');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var DataObservatoryMeasureModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model');
+var RegionsCollection = require('builder/data/data-observatory/regions-collection');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/data-observatory-multiple-nested-measure-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/deprecated-sql-function-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/deprecated-sql-function-form-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/deprecated-sql-function-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/deprecated-sql-function-form-model.spec.js
index 0907b738e9..374a34804f 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/deprecated-sql-function-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/deprecated-sql-function-form-model.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var cdb = require('cartodb.js');
-var FormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model');
-var BaseAnalysisFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
-var analyses = require('cartodb3/data/analyses');
-var availableFunctionsQuery = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/available-functions.tpl');
+var FormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model');
+var BaseAnalysisFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
+var analyses = require('builder/data/analyses');
+var availableFunctionsQuery = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/available-functions.tpl');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/deprecated-sql-function-form-model', function () {
var cdbSQLBackup;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/fallback-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/fallback-form-model.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/fallback-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/fallback-form-model.spec.js
index 46761fa3d3..0db53d7506 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/fallback-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/fallback-form-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisSourceOptionsModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model');
-var FallbackFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model');
-var analyses = require('cartodb3/data/analyses');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisSourceOptionsModel = require('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model');
+var FallbackFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/fallback-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/filter-by-node-column.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/filter-by-node-column.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/filter-by-node-column.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/filter-by-node-column.spec.js
index 7dcd85a6eb..f485e33a8b 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/filter-by-node-column.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/filter-by-node-column.spec.js
@@ -1,14 +1,14 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var FilterFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column');
-var AnalysisSourceOptionsModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var FilterFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column');
+var AnalysisSourceOptionsModel = require('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/filter-by-node-column', function () {
var createModelFn = function (attributes, options) {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/filter-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/filter-form-model.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/filter-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/filter-form-model.spec.js
index 43e6ea8aad..1b91557a1e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/filter-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/filter-form-model.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var analyses = require('cartodb3/data/analyses');
-var FilterFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
+var ConfigModel = require('builder/data/config-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var analyses = require('builder/data/analyses');
+var FilterFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/filter-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js
index ce0a460c4b..07a8c50287 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var analyses = require('cartodb3/data/analyses');
-var GeoreferenceFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var ConfigModel = require('builder/data/config-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var analyses = require('builder/data/analyses');
+var GeoreferenceFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/group-points-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/group-points-form-model.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/group-points-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/group-points-form-model.spec.js
index a42f0ab11a..1378af6cc5 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/group-points-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/group-points-form-model.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var GroupPointsFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var GroupPointsFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/group-points-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/merge-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/merge-form-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/merge-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/merge-form-model.spec.js
index 46ee8e1b90..ab3376ad27 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-form-models/merge-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/merge-form-model.spec.js
@@ -1,14 +1,14 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodeSourceModel = require('cartodb3/data/analysis-definition-node-source-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var MergeFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model');
-var AnalysisSourceOptionsModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var analyses = require('cartodb3/data/analyses');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodeSourceModel = require('builder/data/analysis-definition-node-source-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var MergeFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model');
+var AnalysisSourceOptionsModel = require('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model', function () {
var createModelFn = function (attributes, options) {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough.spec.js
index d56c423593..6b04c8c53b 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var AnalysesQuotaEnough = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough');
+var AnalysesQuotaEnough = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough');
describe('editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-enough', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input.spec.js
index 06d7a89a89..d30143c450 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var AnalysesQuotaEstimation = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input');
+var AnalysesQuotaEstimation = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input');
describe('editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-estimation-input', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info.spec.js
index f1457ef9ca..6eb110868f 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var AnalysesQuotaInfo = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var AnalysesQuotaInfo = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
describe('editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-info', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js
index 66f30f9b30..27056d73b5 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var AnalysesQuotaOptions = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options');
-var AnalysesQuotaInfo = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var AnalysesQuotaOptions = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options');
+var AnalysesQuotaInfo = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
describe('editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter.spec.js
index 6872d12e58..ed4a09b0ad 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var AnalysesQuotaPresenter = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter');
+var AnalysesQuotaPresenter = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-presenter');
describe('editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-presenter', function () {
var configModel = new Backbone.Model({
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/mock-sql.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/mock-sql.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-quota/mock-sql.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/mock-sql.js
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-service.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-service.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-service.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-service.spec.js
index 8079f795ef..45aa8338b6 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-service.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-service.spec.js
@@ -1,14 +1,14 @@
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
-var StackLayoutView = require('cartodb3/components/stack-layout/stack-layout-view');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var AddAnalysisView = require('cartodb3/components/modals/add-analysis/add-analysis-view');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
+var StackLayoutView = require('builder/components/stack-layout/stack-layout-view');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var AddAnalysisView = require('builder/components/modals/add-analysis/add-analysis-view');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
describe('editor/layers/layer-content-view/analyses/analyses-service', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-view.spec.js
index e0260c00ef..3cd3c14b14 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-view.spec.js
@@ -1,15 +1,15 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var AnalysesView = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-view');
-var PanelWithOptionsView = require('cartodb3/components/view-options/panel-with-options-view');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
-var OnboardingsServiceModel = require('cartodb3/components/onboardings/onboardings-service-model');
-var layerOnboardingKey = require('cartodb3/components/onboardings/layers/layer-onboarding-key');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
+var AnalysesView = require('builder/editor/layers/layer-content-views/analyses/analyses-view');
+var PanelWithOptionsView = require('builder/components/view-options/panel-with-options-view');
+var UserNotifications = require('builder/data/user-notifications');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
+var OnboardingsServiceModel = require('builder/components/onboardings/onboardings-service-model');
+var layerOnboardingKey = require('builder/components/onboardings/layers/layer-onboarding-key');
+var LayerContentModel = require('builder/data/layer-content-model');
describe('editor/layers/layer-content-views/analyses/analyses-view', function () {
var analysisFormsCollection;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-item-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-item-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-item-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-item-view.spec.js
index bca76eb780..81980b7a1a 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-item-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-item-view.spec.js
@@ -1,7 +1,7 @@
var _ = require('underscore');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var AnalysesWorkflowItemView = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-item-view');
-var Router = require('cartodb3/routes/router');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var AnalysesWorkflowItemView = require('builder/editor/layers/layer-content-views/analyses/analyses-workflow-item-view');
+var Router = require('builder/routes/router');
describe('editor/layers/layer-content-view/analyses/analyses-workflow-item-view', function () {
var view, analysisNode;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-list-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-list-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-list-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-list-view.spec.js
index 6b4539b28f..6fc27d0a95 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-list-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-list-view.spec.js
@@ -1,10 +1,10 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisFormsCollection = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection');
-var AnalysesWorkflowListView = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-list-view');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var Router = require('cartodb3/routes/router');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisFormsCollection = require('builder/editor/layers/layer-content-views/analyses/analysis-forms-collection');
+var AnalysesWorkflowListView = require('builder/editor/layers/layer-content-views/analyses/analyses-workflow-list-view');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var Router = require('builder/routes/router');
describe('editor/layers/layer-content-view/analyses/analyses-workflow-list-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-view.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-view.spec.js
index c2af054f0e..9e8e3136cd 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analyses-workflow-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-workflow-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisFormsCollection = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection');
-var AnalysesWorkflowView = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-workflow-view');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisFormsCollection = require('builder/editor/layers/layer-content-views/analyses/analysis-forms-collection');
+var AnalysesWorkflowView = require('builder/editor/layers/layer-content-views/analyses/analyses-workflow-view');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
describe('editor/layers/layer-content-view/analyses/analyses-workflow-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-controls-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-controls-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-controls-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-controls-view.spec.js
index 0bc113d921..838bf19fe6 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-controls-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-controls-view.spec.js
@@ -1,15 +1,15 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var userActions = require('cartodb3/data/user-actions');
-var UserModel = require('cartodb3/data/user-model');
-var BaseAnalysisFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
-var AnalysisControlsView = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-controls-view');
-var analyses = require('cartodb3/data/analyses');
-var AnalysesQuotaOptions = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options');
-var AnalysesQuotaInfo = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
-var AnalysesQuotaEnough = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough');
-var AnalysesQuotaEstimation = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input');
-var AnalysisFormsCollection = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection');
+var userActions = require('builder/data/user-actions');
+var UserModel = require('builder/data/user-model');
+var BaseAnalysisFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
+var AnalysisControlsView = require('builder/editor/layers/layer-content-views/analyses/analysis-controls-view');
+var analyses = require('builder/data/analyses');
+var AnalysesQuotaOptions = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-options');
+var AnalysesQuotaInfo = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info');
+var AnalysesQuotaEnough = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-enough');
+var AnalysesQuotaEstimation = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-estimation-input');
+var AnalysisFormsCollection = require('builder/editor/layers/layer-content-views/analyses/analysis-forms-collection');
var mockSQL = require('./analyses-quota/mock-sql');
describe('editor/layers/layer-content-view/analyses/analysis-controls-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-form-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-form-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-form-view.spec.js
index 3bdea3474a..5dcea984b4 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-form-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var camshaftReference = require('cartodb3/data/camshaft-reference');
-var areaOfInfluenceTemplate = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form.tpl');
-var BaseAnalysisFormModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
-var AnalysisFormView = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-form-view');
-var analyses = require('cartodb3/data/analyses');
+var camshaftReference = require('builder/data/camshaft-reference');
+var areaOfInfluenceTemplate = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/area-of-influence-form.tpl');
+var BaseAnalysisFormModel = require('builder/editor/layers/layer-content-views/analyses/analysis-form-models/base-analysis-form-model');
+var AnalysisFormView = require('builder/editor/layers/layer-content-views/analyses/analysis-form-view');
+var analyses = require('builder/data/analyses');
describe('editor/layers/layer-content-view/analyses/analysis-form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-forms-collection.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-forms-collection.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-forms-collection.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-forms-collection.spec.js
index c4915dda3f..93cfff6fb1 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-forms-collection.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-forms-collection.spec.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisSourceOptionsModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model');
-var AnalysisFormsCollection = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-forms-collection');
-var UserActions = require('cartodb3/data/user-actions');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
-
-describe('cartodb3/editor/layers/layer-content-view/analyses/analysis-forms-collection', function () {
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisSourceOptionsModel = require('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model');
+var AnalysisFormsCollection = require('builder/editor/layers/layer-content-views/analyses/analysis-forms-collection');
+var UserActions = require('builder/data/user-actions');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
+
+describe('builder/editor/layers/layer-content-view/analyses/analysis-forms-collection', function () {
beforeEach(function () {
var configModel = new Backbone.Model();
configModel.dataServiceEnabled = function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-source-options-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-source-options-model.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-source-options-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-source-options-model.spec.js
index 138ad8e44d..77904cb812 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/analyses/analysis-source-options-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analysis-source-options-model.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var TablesCollection = require('cartodb3/data/tables-collection');
-var TableModel = require('cartodb3/data/table-model');
-var AnalysisSourceOptionsModel = require('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var TablesCollection = require('builder/data/tables-collection');
+var TableModel = require('builder/data/table-model');
+var AnalysisSourceOptionsModel = require('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model');
-describe('cartodb3/editor/layers/layer-content-views/analyses/analysis-source-options-model', function () {
+describe('builder/editor/layers/layer-content-views/analyses/analysis-source-options-model', function () {
beforeEach(function () {
var configModel = new ConfigModel({
base_url: '/u/pepe'
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/data-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/data/data-content-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/data-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/data/data-content-view.spec.js
index f64a74aa71..62cef9829f 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/data-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/data/data-content-view.spec.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var DataContentView = require('cartodb3/editor/layers/layer-content-views/data/data-content-view');
-var DataColumnsModel = require('cartodb3/editor/layers/layer-content-views/data/data-columns-model');
-var TableStats = require('cartodb3/components/modals/add-widgets/tablestats');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var dataNoGeometryTemplate = require('cartodb3/editor/layers/layer-content-views/data/data-content-nogeometry.tpl');
+var ConfigModel = require('builder/data/config-model');
+var LayerContentModel = require('builder/data/layer-content-model');
+var DataContentView = require('builder/editor/layers/layer-content-views/data/data-content-view');
+var DataColumnsModel = require('builder/editor/layers/layer-content-views/data/data-columns-model');
+var TableStats = require('builder/components/modals/add-widgets/tablestats');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var dataNoGeometryTemplate = require('builder/editor/layers/layer-content-views/data/data-content-nogeometry.tpl');
describe('editor/layers/layers-content-view/data/data-content-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/data-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/data/data-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/data-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/data/data-view.spec.js
index 789e3e428d..0c01c14534 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/data-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/data/data-view.spec.js
@@ -1,17 +1,17 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var SQLModel = require('cartodb3/editor/layers/layer-content-views/data/data-sql-model');
-var UserModel = require('cartodb3/data/user-model');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var Notifier = require('cartodb3/components/notifier/notifier.js');
-var DataView = require('cartodb3/editor/layers/layer-content-views/data/data-view');
-var SQLNotifications = require('cartodb3/sql-notifications.js');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var layerOnboardingKey = require('cartodb3/components/onboardings/layers/layer-onboarding-key');
+var ConfigModel = require('builder/data/config-model');
+var LayerContentModel = require('builder/data/layer-content-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var SQLModel = require('builder/editor/layers/layer-content-views/data/data-sql-model');
+var UserModel = require('builder/data/user-model');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var Notifier = require('builder/components/notifier/notifier.js');
+var DataView = require('builder/editor/layers/layer-content-views/data/data-view');
+var SQLNotifications = require('builder/sql-notifications.js');
+var UserNotifications = require('builder/data/user-notifications');
+var layerOnboardingKey = require('builder/components/onboardings/layers/layer-onboarding-key');
describe('editor/layers/layers-content-view/data/data-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/stat-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/data/stat-view.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/stat-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/data/stat-view.spec.js
index 38997a2651..dea74084ab 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/data/stat-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/data/stat-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var WidgetOptionModel = require('cartodb3/components/modals/add-widgets/widget-option-model');
-var StatView = require('cartodb3/editor/layers/layer-content-views/data/stat-view');
-var TableStats = require('cartodb3/components/modals/add-widgets/tablestats');
-var Router = require('cartodb3/routes/router');
+var WidgetOptionModel = require('builder/components/modals/add-widgets/widget-option-model');
+var StatView = require('builder/editor/layers/layer-content-views/data/stat-view');
+var TableStats = require('builder/components/modals/add-widgets/tablestats');
+var Router = require('builder/routes/router');
describe('editor/layers/layers-content-view/data/stat-view', function () {
var nullValue = 0.0059;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-base-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-base-view.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-base-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-base-view.spec.js
index 3a6d4a550b..a052448912 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-base-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-base-view.spec.js
@@ -1,19 +1,19 @@
var _ = require('underscore');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var InfowindowBaseView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-base-view');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var EditorModel = require('cartodb3/data/editor-model');
-var ScrollView = require('cartodb3/components/scroll/scroll-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var InfowindowBaseView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-base-view');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var EditorModel = require('builder/data/editor-model');
+var ScrollView = require('builder/components/scroll/scroll-view');
var TEMPLATES = [
{
value: '',
- infowindowIcon: require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-none.tpl'),
+ infowindowIcon: require('builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-none.tpl'),
label: _t('editor.layers.infowindow.style.none'),
tooltip: _t('editor.layers.infowindow.tooltips.none')
}, {
value: 'infowindow_light',
- infowindowIcon: require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-light.tpl'),
+ infowindowIcon: require('builder/editor/layers/layer-content-views/infowindow/infowindow-icons/infowindow-light.tpl'),
label: _t('editor.layers.infowindow.style.infowindow_light'),
tooltip: _t('editor.layers.infowindow.tooltips.infowindow_light')
}
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-click-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-click-model.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-click-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-click-model.spec.js
index 7398540942..c6d5fbeb13 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-click-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-click-model.spec.js
@@ -1,5 +1,5 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var InfowindowModel = require('cartodb3/data/infowindow-click-model');
+var ConfigModel = require('builder/data/config-model');
+var InfowindowModel = require('builder/data/infowindow-click-model');
describe('editor/layers/layer-content-view/infowindow/infowindow-click-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-content-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-content-view.spec.js
index 41b9fcb8e5..e6886118b4 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-content-view.spec.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var InfowindowContentView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-content-view');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var EditorModel = require('cartodb3/data/editor-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var InfowindowContentView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-content-view');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var EditorModel = require('builder/data/editor-model');
+var ConfigModel = require('builder/data/config-model');
describe('editor/layers/layer-content-view/infowindow/infowindow-content-view', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-description-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-description-view.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-description-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-description-view.spec.js
index e767a26de6..5240de75d9 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-description-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-description-view.spec.js
@@ -1,6 +1,6 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var InfowindowDescriptionView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-description-view.js');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var InfowindowDescriptionView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-description-view.js');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
describe('editor/layers/layer-content-view/infowindows/infowindow-description-view', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-field-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-field-view.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-field-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-field-view.spec.js
index 13d2fb9e0a..0f7c7cea2c 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-field-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-field-view.spec.js
@@ -1,8 +1,8 @@
var $ = require('jquery');
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var InfowindowFieldView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-field-view');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var InfowindowFieldView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-field-view');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
describe('editor/layers/layer-content-view/infowindows/infowindow-field-view', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-fields-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-fields-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-fields-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-fields-view.spec.js
index 2da3f07dde..caa2d4f1b2 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-fields-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-fields-view.spec.js
@@ -1,8 +1,8 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var InfowindowFieldsView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-fields-view');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var InfowindowFieldsView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-fields-view');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
require('jquery-ui');
describe('editor/layers/layer-content-view/infowindows/infowindow-fields-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-form-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-form-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-form-view.spec.js
index 59f13343e1..3facc40ad1 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-form-view.spec.js
@@ -1,6 +1,6 @@
-var InfowindowFormView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-form-view.js');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var InfowindowFormView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-form-view.js');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var ConfigModel = require('builder/data/config-model');
describe('editor/layers/layer-content-view/infowindows/infowindow-form-view', function () {
var view, model;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-items-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-items-view.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-items-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-items-view.spec.js
index b80c3bd474..0d37960fb5 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-items-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-items-view.spec.js
@@ -1,8 +1,8 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var InfowindowItemsView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-items-view');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var InfowindowItemsView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-items-view');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
var _ = require('underscore');
describe('editor/layers/layer-content-view/infowindows/infowindow-items-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-select-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-select-view.spec.js
similarity index 82%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-select-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-select-view.spec.js
index e86712ed4b..63c6a8e46d 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindow-select-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindow-select-view.spec.js
@@ -1,7 +1,7 @@
-var InfowindowSelectView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-select-view.js');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var CarouselCollection = require('cartodb3/components/custom-carousel/custom-carousel-collection');
+var InfowindowSelectView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-select-view.js');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var CarouselCollection = require('builder/components/custom-carousel/custom-carousel-collection');
var _ = require('underscore');
describe('editor/layers/layer-content-view/infowindows/infowindow-select-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindows-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindows-view.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindows-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindows-view.spec.js
index 44bc055756..c4857a4b20 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/infowindows/infowindows-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/infowindows/infowindows-view.spec.js
@@ -1,19 +1,19 @@
var _ = require('underscore');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var InfowindowsView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindows-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var InfowindowView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-click-view');
-var TooltipView = require('cartodb3/editor/layers/layer-content-views/infowindow/infowindow-hover-view');
-var InfowindowDefinitionModel = require('cartodb3/data/infowindow-definition-model');
-var EditorModel = require('cartodb3/data/editor-model');
-var UserActions = require('cartodb3/data/user-actions');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var AnalysisDefinitionsCollection = require('cartodb3/data/analysis-definitions-collection');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var InfowindowsView = require('builder/editor/layers/layer-content-views/infowindow/infowindows-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var InfowindowView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-click-view');
+var TooltipView = require('builder/editor/layers/layer-content-views/infowindow/infowindow-hover-view');
+var InfowindowDefinitionModel = require('builder/data/infowindow-definition-model');
+var EditorModel = require('builder/data/editor-model');
+var UserActions = require('builder/data/user-actions');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var AnalysisDefinitionsCollection = require('builder/data/analysis-definitions-collection');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
describe('editor/layers/layer-content-view/infowindow/infowindows-view', function () {
var view, configModel, layerDefinitionModel, querySchemaModel;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-color-helper.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-color-helper.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-color-helper.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-color-helper.spec.js
index e1e0a82ffe..2d5a6e4e7a 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-color-helper.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-color-helper.spec.js
@@ -1,4 +1,4 @@
-var LegendColorHelper = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-color-helper');
+var LegendColorHelper = require('builder/editor/layers/layer-content-views/legend/form/legend-color-helper');
describe('editor/layers/layer-content-views/legends/form/legend-color-helper', function () {
it('should return collection category items properly', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-color-range.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-color-range.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-color-range.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-color-range.spec.js
index 4de235e852..93e582666e 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-color-range.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-color-range.spec.js
@@ -1,4 +1,4 @@
-var LegendColors = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-color-range');
+var LegendColors = require('builder/editor/layers/layer-content-views/legend/form/legend-color-range');
describe('editor/layers/layer-content-views/legends/form/legend-color-range', function () {
var COLORS = [
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-custom-definition-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-custom-definition-form-model.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-custom-definition-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-custom-definition-form-model.spec.js
index d9c9697450..bb37bbdb79 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/form/legend-custom-definition-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/form/legend-custom-definition-form-model.spec.js
@@ -1,9 +1,9 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LegendCustomDefinitionModel = require('cartodb3/data/legends/legend-custom-definition-model');
-var LegendCustomFormDefinitionModel = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-custom-definition-form-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LegendCustomDefinitionModel = require('builder/data/legends/legend-custom-definition-model');
+var LegendCustomFormDefinitionModel = require('builder/editor/layers/layer-content-views/legend/form/legend-custom-definition-form-model');
var FactoryModals = require('../../../../../factories/modals');
describe('editor/layers/layer-content-views/legends/form/legend-custom-definition-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-base-type-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-base-type-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-base-type-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-base-type-view.spec.js
index 7ebc5b847b..54df311793 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-base-type-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-base-type-view.spec.js
@@ -1,11 +1,11 @@
var Backbone = require('backbone');
-var LegendBaseTypeView = require('cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view');
-var MapDefinitionModel = require('cartodb3/data/map-definition-model');
-var LegendDefinitionsCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
+var LegendBaseTypeView = require('builder/editor/layers/layer-content-views/legend/legend-base-type-view');
+var MapDefinitionModel = require('builder/data/map-definition-model');
+var LegendDefinitionsCollection = require('builder/data/legends/legend-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LayerContentModel = require('builder/data/layer-content-model');
var FactoryModals = require('../../../../factories/modals');
describe('editor/layers/layer-content-view/legend/legend-base-type-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-content-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-content-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-content-view.spec.js
index f4140cd5b7..b8736092d6 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-content-view.spec.js
@@ -1,14 +1,14 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LegendContentView = require('cartodb3/editor/layers/layer-content-views/legend/legend-content-view');
-var LegendColorTypes = require('cartodb3/editor/layers/layer-content-views/legend/color/legend-color-types');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LegendDefinitionCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LegendContentView = require('builder/editor/layers/layer-content-views/legend/legend-content-view');
+var LegendColorTypes = require('builder/editor/layers/layer-content-views/legend/color/legend-color-types');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LegendDefinitionCollection = require('builder/data/legends/legend-definitions-collection');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
var FactoryModals = require('../../../../factories/modals');
-var CategoryFormModel = require('cartodb3/editor/layers/layer-content-views/legend/form/legend-category-definition-form-model');
+var CategoryFormModel = require('builder/editor/layers/layer-content-views/legend/form/legend-category-definition-form-model');
describe('editor/layers/layer-content-view/legend/legend-content-view', function () {
var legendType = {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-factory.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-factory.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-factory.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-factory.spec.js
index 581907c88a..e714f93bbe 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-factory.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-factory.spec.js
@@ -1,11 +1,11 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var LegendDefinitionsCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var LegendsState = require('cartodb3/data/legends/legends-state');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var ConfigModel = require('cartodb3/data/config-model');
-var Validations = require('cartodb3/editor/layers/layer-content-views/legend/legend-validations');
+var LegendDefinitionsCollection = require('builder/data/legends/legend-definitions-collection');
+var LegendsState = require('builder/data/legends/legends-state');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var ConfigModel = require('builder/data/config-model');
+var Validations = require('builder/editor/layers/layer-content-views/legend/legend-validations');
function getSuccessResponse (id, type, title) {
var success = _.clone(TestResponses.save.success);
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-properties-form.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-properties-form.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-properties-form.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-properties-form.spec.js
index c114393d19..42895f7ba6 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legend-properties-form.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legend-properties-form.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var LegendPropertiesFormView = require('cartodb3/editor/layers/layer-content-views/legend/legend-properties-form');
+var LegendPropertiesFormView = require('builder/editor/layers/layer-content-views/legend/legend-properties-form');
describe('editor/layers/layer-content-views/legend/legend-properties-form', function () {
var view;
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legends-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legends-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legends-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legends-view.spec.js
index ea8b7d829e..daeb8b25a2 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/legends-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/legends-view.spec.js
@@ -1,20 +1,20 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LegendsView = require('cartodb3/editor/layers/layer-content-views/legend/legends-view');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var LegendDefinitionsCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LegendsView = require('builder/editor/layers/layer-content-views/legend/legends-view');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var LayerContentModel = require('builder/data/layer-content-model');
+var LegendDefinitionsCollection = require('builder/data/legends/legend-definitions-collection');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
var FactoryModals = require('../../../../factories/modals');
-var sqlErrorTemplate = require('cartodb3/editor/layers/layer-content-views/legend/legend-content-sql-error.tpl');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
+var sqlErrorTemplate = require('builder/editor/layers/layer-content-views/legend/legend-content-sql-error.tpl');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
describe('editor/layers/layer-content-view/legend/legends-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/size/legend-size-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/size/legend-size-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/size/legend-size-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/size/legend-size-view.spec.js
index 5f51fefe9b..6b8a9d89c2 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-content-view/legend/size/legend-size-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/legend/size/legend-size-view.spec.js
@@ -1,16 +1,16 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var LegendSizeView = require('cartodb3/editor/layers/layer-content-views/legend/size/legend-size-view');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LegendDefinitionsCollection = require('cartodb3/data/legends/legend-definitions-collection');
-var LegendBaseDefinitionModel = require('cartodb3/data/legends/legend-base-definition-model');
-var LegendCustomDefinitionModel = require('cartodb3/data/legends/legend-custom-definition-model');
-var LegendFactory = require('cartodb3/editor/layers/layer-content-views/legend/legend-factory');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var LegendSizeView = require('builder/editor/layers/layer-content-views/legend/size/legend-size-view');
+var LayerContentModel = require('builder/data/layer-content-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LegendDefinitionsCollection = require('builder/data/legends/legend-definitions-collection');
+var LegendBaseDefinitionModel = require('builder/data/legends/legend-base-definition-model');
+var LegendCustomDefinitionModel = require('builder/data/legends/legend-custom-definition-model');
+var LegendFactory = require('builder/editor/layers/layer-content-views/legend/legend-factory');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
var FactoryModals = require('../../../../../factories/modals');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
describe('editor/layers/layer-content-view/legend/size/legend-size-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-header-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-header-view.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-header-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-header-view.spec.js
index 66997a5a12..4c09da200f 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-header-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-header-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var LayerHeaderView = require('cartodb3/editor/layers/layer-header-view');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var SyncModel = require('cartodb3/data/synchronization-model');
+var LayerHeaderView = require('builder/editor/layers/layer-header-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var SyncModel = require('builder/data/synchronization-model');
var FactoryModals = require('../../factories/modals');
describe('editor/layers/layer-header-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-view-factory.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-view-factory.spec.js
similarity index 80%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-view-factory.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-view-factory.spec.js
index 77827dc588..f5a3a1a992 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-view-factory.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-view-factory.spec.js
@@ -1,16 +1,16 @@
var Backbone = require('backbone');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var BaseTiledLayerView = require('cartodb3/editor/layers/layer-views/base-tiled-layer-view');
-var PlainColorLayerView = require('cartodb3/editor/layers/layer-views/plain-color-layer-view');
-var BackgroundImageLayerView = require('cartodb3/editor/layers/layer-views/background-image-layer-view');
-var DataLayerView = require('cartodb3/editor/layers/layer-views/data-layer-view');
-var ErroredDataLayerView = require('cartodb3/editor/layers/layer-views/errored-data-layer-view');
-var LabelsLayerView = require('cartodb3/editor/layers/layer-views/labels-layer-view');
-var LayerViewFactory = require('cartodb3/editor/layers/layer-view-factory');
-var ModalsService = require('cartodb3/components/modals/modals-service-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var BaseTiledLayerView = require('builder/editor/layers/layer-views/base-tiled-layer-view');
+var PlainColorLayerView = require('builder/editor/layers/layer-views/plain-color-layer-view');
+var BackgroundImageLayerView = require('builder/editor/layers/layer-views/background-image-layer-view');
+var DataLayerView = require('builder/editor/layers/layer-views/data-layer-view');
+var ErroredDataLayerView = require('builder/editor/layers/layer-views/errored-data-layer-view');
+var LabelsLayerView = require('builder/editor/layers/layer-views/labels-layer-view');
+var LayerViewFactory = require('builder/editor/layers/layer-view-factory');
+var ModalsService = require('builder/components/modals/modals-service-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
-describe('cartodb3/editor/layers/layer-view-factory', function () {
+describe('builder/editor/layers/layer-view-factory', function () {
beforeEach(function () {
this.nodeDefModel = new AnalysisDefinitionNodeModel({
id: 'a2',
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/background-image-layer-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-views/background-image-layer-view.spec.js
similarity index 82%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-views/background-image-layer-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-views/background-image-layer-view.spec.js
index 152d85f22e..48ac6ed0eb 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/background-image-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-views/background-image-layer-view.spec.js
@@ -1,5 +1,5 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var BackgroundImageLayerView = require('cartodb3/editor/layers/layer-views/background-image-layer-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var BackgroundImageLayerView = require('builder/editor/layers/layer-views/background-image-layer-view');
describe('editor/layers/layer-views/background-image-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/base-tiled-layer-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-views/base-tiled-layer-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-views/base-tiled-layer-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-views/base-tiled-layer-view.spec.js
index 64c581753e..acd4b76e7b 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/base-tiled-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-views/base-tiled-layer-view.spec.js
@@ -1,5 +1,5 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var BaseTiledLayerView = require('cartodb3/editor/layers/layer-views/base-tiled-layer-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var BaseTiledLayerView = require('builder/editor/layers/layer-views/base-tiled-layer-view');
describe('editor/layers/layer-views/base-tiled-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/data-layer-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-views/data-layer-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-views/data-layer-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-views/data-layer-view.spec.js
index 5edc5bd154..c0944b3e52 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/data-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-views/data-layer-view.spec.js
@@ -2,19 +2,19 @@ var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var UserActions = require('cartodb3/data/user-actions');
-var UserModel = require('cartodb3/data/user-model');
-var StackLayoutModel = require('cartodb3/components/stack-layout/stack-layout-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var DataLayerView = require('cartodb3/editor/layers/layer-views/data-layer-view');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
+var UserActions = require('builder/data/user-actions');
+var UserModel = require('builder/data/user-model');
+var StackLayoutModel = require('builder/components/stack-layout/stack-layout-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var DataLayerView = require('builder/editor/layers/layer-views/data-layer-view');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
var FactoryModals = require('../../../factories/modals');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
describe('editor/layers/data-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/errored-data-layer-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-views/errored-data-layer-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-views/errored-data-layer-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-views/errored-data-layer-view.spec.js
index d58df636e5..378da2a7e4 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/errored-data-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-views/errored-data-layer-view.spec.js
@@ -1,14 +1,14 @@
var $ = require('jquery');
var Backbone = require('backbone');
var CoreView = require('backbone/core-view');
-var UserActions = require('cartodb3/data/user-actions');
-var StackLayoutModel = require('cartodb3/components/stack-layout/stack-layout-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var ErroredDataLayerView = require('cartodb3/editor/layers/layer-views/errored-data-layer-view');
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
+var UserActions = require('builder/data/user-actions');
+var StackLayoutModel = require('builder/components/stack-layout/stack-layout-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var ErroredDataLayerView = require('builder/editor/layers/layer-views/errored-data-layer-view');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/layers/errored-data-layer-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/labels-layer-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-views/labels-layer-view.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-views/labels-layer-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-views/labels-layer-view.spec.js
index 99b7cdb6ae..0e5f298655 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/labels-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-views/labels-layer-view.spec.js
@@ -1,5 +1,5 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var LabelsLayerView = require('cartodb3/editor/layers/layer-views/labels-layer-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var LabelsLayerView = require('builder/editor/layers/layer-views/labels-layer-view');
describe('editor/layers/layer-views/labels-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/plain-layer-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-views/plain-layer-view.spec.js
similarity index 82%
rename from lib/assets/test/spec/cartodb3/editor/layers/layer-views/plain-layer-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layer-views/plain-layer-view.spec.js
index c10e7d1b4d..f3c322ed4c 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layer-views/plain-layer-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layer-views/plain-layer-view.spec.js
@@ -1,5 +1,5 @@
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var PlainColorLayerView = require('cartodb3/editor/layers/layer-views/plain-color-layer-view');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var PlainColorLayerView = require('builder/editor/layers/layer-views/plain-color-layer-view');
describe('editor/layers/layer-views/plain-color-layer-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/layers-view.spec.js b/lib/assets/test/spec/builder/editor/layers/layers-view.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/layers/layers-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/layers-view.spec.js
index 77a997d3b5..e510bb8325 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/layers-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/layers-view.spec.js
@@ -1,14 +1,14 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var ModalsServiceModel = require('cartodb3/components/modals/modals-service-model');
-var StackLayoutModel = require('cartodb3/components/stack-layout/stack-layout-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var UserActions = require('cartodb3/data/user-actions');
-var LayersView = require('cartodb3/editor/layers/layers-view');
-var EditorModel = require('cartodb3/data/editor-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var ModalsServiceModel = require('builder/components/modals/modals-service-model');
+var StackLayoutModel = require('builder/components/stack-layout/stack-layout-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var UserActions = require('builder/data/user-actions');
+var LayersView = require('builder/editor/layers/layers-view');
+var EditorModel = require('builder/data/editor-model');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
describe('editor/layers/layers-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/notification-error-message-handler.spec.js b/lib/assets/test/spec/builder/editor/layers/notification-error-message-handler.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/layers/notification-error-message-handler.spec.js
rename to lib/assets/test/spec/builder/editor/layers/notification-error-message-handler.spec.js
index 2ad2225165..5a49157cb2 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/notification-error-message-handler.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/notification-error-message-handler.spec.js
@@ -1,5 +1,5 @@
var cdb = require('cartodb.js');
-var NotificationErrorHandler = require('cartodb3/editor/layers/notification-error-message-handler');
+var NotificationErrorHandler = require('builder/editor/layers/notification-error-message-handler');
describe('NotificationErrorHandler.extractErrorFromAnalysisNode', function () {
it('should extract the right error message', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/layers/sync-info/sync-info-view.spec.js b/lib/assets/test/spec/builder/editor/layers/sync-info/sync-info-view.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/editor/layers/sync-info/sync-info-view.spec.js
rename to lib/assets/test/spec/builder/editor/layers/sync-info/sync-info-view.spec.js
index 74e614aebb..84b36b050f 100644
--- a/lib/assets/test/spec/cartodb3/editor/layers/sync-info/sync-info-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/layers/sync-info/sync-info-view.spec.js
@@ -1,7 +1,7 @@
-var SyncInfoView = require('cartodb3/editor/layers/sync-info/sync-info-view');
-var SyncModel = require('cartodb3/data/synchronization-model');
-var TableModel = require('cartodb3/data/table-model');
-var UserModel = require('cartodb3/data/user-model');
+var SyncInfoView = require('builder/editor/layers/sync-info/sync-info-view');
+var SyncModel = require('builder/data/synchronization-model');
+var TableModel = require('builder/data/table-model');
+var UserModel = require('builder/data/user-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/layers/sync-info/sync-info-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/map-operations/rename-map.spec.js b/lib/assets/test/spec/builder/editor/map-operations/rename-map.spec.js
similarity index 85%
rename from lib/assets/test/spec/cartodb3/editor/map-operations/rename-map.spec.js
rename to lib/assets/test/spec/builder/editor/map-operations/rename-map.spec.js
index 0f1a059077..d57d0811ec 100644
--- a/lib/assets/test/spec/cartodb3/editor/map-operations/rename-map.spec.js
+++ b/lib/assets/test/spec/builder/editor/map-operations/rename-map.spec.js
@@ -1,6 +1,6 @@
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var renameMap = require('cartodb3/editor/map-operations/rename-map');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var renameMap = require('builder/editor/map-operations/rename-map');
describe('editor/map-operations/rename-map', function () {
var visDefinitionModel;
diff --git a/lib/assets/test/spec/cartodb3/editor/map-operations/zoom-to-data.spec.js b/lib/assets/test/spec/builder/editor/map-operations/zoom-to-data.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/map-operations/zoom-to-data.spec.js
rename to lib/assets/test/spec/builder/editor/map-operations/zoom-to-data.spec.js
index ba44acc5bc..77d409596f 100644
--- a/lib/assets/test/spec/cartodb3/editor/map-operations/zoom-to-data.spec.js
+++ b/lib/assets/test/spec/builder/editor/map-operations/zoom-to-data.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var zoomToData = require('cartodb3/editor/map-operations/zoom-to-data');
+var zoomToData = require('builder/editor/map-operations/zoom-to-data');
describe('map-operations/zoom-to-data', function () {
var bounds = {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-content-view.spec.js b/lib/assets/test/spec/builder/editor/style/style-content-view.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/editor/style/style-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-content-view.spec.js
index 416778b61a..8bfd6270d9 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-content-view.spec.js
@@ -1,21 +1,21 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var UserActions = require('cartodb3/data/user-actions');
-var StyleContentView = require('cartodb3/editor/style/style-content-view');
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var UserActions = require('builder/data/user-actions');
+var StyleContentView = require('builder/editor/style/style-content-view');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var LayerContentModel = require('builder/data/layer-content-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
var FactoryModals = require('../../factories/modals');
-var styleSQLErrorTemplate = require('cartodb3/editor/style/style-content-sql-error.tpl');
-var actionErrorTemplate = require('cartodb3/editor/layers/sql-error-action.tpl');
+var styleSQLErrorTemplate = require('builder/editor/style/style-content-sql-error.tpl');
+var actionErrorTemplate = require('builder/editor/layers/sql-error-action.tpl');
describe('editor/style/style-content-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-converter-fixtures.spec.js b/lib/assets/test/spec/builder/editor/style/style-converter-fixtures.spec.js
similarity index 99%
rename from lib/assets/test/spec/cartodb3/editor/style/style-converter-fixtures.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-converter-fixtures.spec.js
index 99b778ea36..8c2dfe528d 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-converter-fixtures.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-converter-fixtures.spec.js
@@ -1,4 +1,4 @@
-var StyleGenerator = require('cartodb3/editor/style/style-converter');
+var StyleGenerator = require('builder/editor/style/style-converter');
module.exports = [
{
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-converter.spec.js b/lib/assets/test/spec/builder/editor/style/style-converter.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/style/style-converter.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-converter.spec.js
index f378176dba..646b72a974 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-converter.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-converter.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var StyleGenerator = require('cartodb3/editor/style/style-converter');
+var StyleGenerator = require('builder/editor/style/style-converter');
var FIXTURES = require('./style-converter-fixtures.spec');
function assertCartoCSS (a, b) {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-definition-model.spec.js b/lib/assets/test/spec/builder/editor/style/style-definition-model.spec.js
similarity index 99%
rename from lib/assets/test/spec/cartodb3/editor/style/style-definition-model.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-definition-model.spec.js
index cc7b2c5eaf..0d92d43933 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-definition-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-definition-model.spec.js
@@ -1,4 +1,4 @@
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
describe('editor/style/style-definition-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl.spec.js
similarity index 73%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl.spec.js
index b3fb351a87..22354bd485 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl.spec.js
@@ -1,5 +1,5 @@
var $ = require('jquery');
-var template = require('cartodb3/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl');
+var template = require('builder/editor/style/style-form/style-aggregation-form/style-aggregation-form.tpl');
describe('editor/style/style-form/style-aggregation-form/style-aggregation-template', function () {
it('should have proper class name for onboarding', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-animated-properties-form-model.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-animated-properties-form-model.spec.js
similarity index 88%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-animated-properties-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-animated-properties-form-model.spec.js
index add9427ac5..dcf9e8551a 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-animated-properties-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-animated-properties-form-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var StyleModel = require('cartodb3/editor/style/style-definition-model.js');
-var StyleFormDefaultModel = require('cartodb3/editor/style/style-form/style-form-default-model');
-var StyleAnimatedFormModel = require('cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var StyleModel = require('builder/editor/style/style-definition-model.js');
+var StyleFormDefaultModel = require('builder/editor/style/style-form/style-form-default-model');
+var StyleAnimatedFormModel = require('builder/editor/style/style-form/style-properties-form/style-animated-properties-form-model');
describe('editor/style/style-form/style-animated-properties-form-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-animated-properties-form-view.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-animated-properties-form-view.spec.js
similarity index 81%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-animated-properties-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-animated-properties-form-view.spec.js
index 3317028e03..68d799a1bb 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-animated-properties-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-animated-properties-form-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var StyleModel = require('cartodb3/editor/style/style-definition-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var StyleAnimatedPropertiesFormView = require('cartodb3/editor/style/style-form/style-properties-form/style-animated-properties-form-view');
+var StyleModel = require('builder/editor/style/style-definition-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var StyleAnimatedPropertiesFormView = require('builder/editor/style/style-form/style-properties-form/style-animated-properties-form-view');
var FactoryModals = require('../../../factories/modals');
describe('editor/style/style-form/style-animated-properties-form-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-components-dictionary.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-form-components-dictionary.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-components-dictionary.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-form-components-dictionary.spec.js
index f48ffb75ba..48f44953ce 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-components-dictionary.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-form-components-dictionary.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
-var Dictionary = require('cartodb3/editor/style/style-form/style-form-components-dictionary');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var Dictionary = require('builder/editor/style/style-form/style-form-components-dictionary');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var ConfigModel = require('builder/data/config-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/style/style-form/style-form-components-dictionary', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-default-model.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-form-default-model.spec.js
similarity index 84%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-default-model.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-form-default-model.spec.js
index b60cf6974d..eb71b92e6e 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-default-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-form-default-model.spec.js
@@ -1,7 +1,7 @@
var Backbone = require('backbone');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var StyleModel = require('cartodb3/editor/style/style-definition-model.js');
-var StyleFormDefaultModel = require('cartodb3/editor/style/style-form/style-form-default-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var StyleModel = require('builder/editor/style/style-definition-model.js');
+var StyleFormDefaultModel = require('builder/editor/style/style-form/style-form-default-model');
describe('editor/style/style-form/style-form-default-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-view.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-form-view.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-form-view.spec.js
index ccf6668724..311df89d71 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-form-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var StyleFormView = require('cartodb3/editor/style/style-form/style-form-view');
-var StyleDefinitionModel = require('cartodb3/editor/style/style-definition-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
+var StyleFormView = require('builder/editor/style/style-form/style-form-view');
+var StyleDefinitionModel = require('builder/editor/style/style-definition-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/style/style-form/style-form-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-labels-properties-form-view.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-labels-properties-form-view.spec.js
similarity index 86%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-labels-properties-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-labels-properties-form-view.spec.js
index c977e2b49f..75972db66c 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-labels-properties-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-labels-properties-form-view.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
-var StyleModel = require('cartodb3/editor/style/style-definition-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var StyleLabelsPropertiesFormView = require('cartodb3/editor/style/style-form/style-properties-form/style-labels-properties-form-view');
+var StyleModel = require('builder/editor/style/style-definition-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var StyleLabelsPropertiesFormView = require('builder/editor/style/style-form/style-properties-form/style-labels-properties-form-view');
describe('editor/style/style-form/style-labels-properties-form-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-properties-form-view.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-properties-form-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-properties-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-properties-form-view.spec.js
index 3820eb7b94..7db43e0cb4 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-properties-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-properties-form-view.spec.js
@@ -1,12 +1,12 @@
var Backbone = require('backbone');
var _ = require('underscore');
-var StyleModel = require('cartodb3/editor/style/style-definition-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var StylePropertiesFormView = require('cartodb3/editor/style/style-form/style-properties-form/style-properties-form-view');
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
+var StyleModel = require('builder/editor/style/style-definition-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var StylePropertiesFormView = require('builder/editor/style/style-form/style-properties-form/style-properties-form-view');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/style/style-form/style-properties-form-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-shape-properties-form-model.spec.js b/lib/assets/test/spec/builder/editor/style/style-form/style-shape-properties-form-model.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/style/style-form/style-shape-properties-form-model.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-form/style-shape-properties-form-model.spec.js
index fe44c44f88..9a78e01cbc 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-form/style-shape-properties-form-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-form/style-shape-properties-form-model.spec.js
@@ -1,4 +1,4 @@
-var StyleShapePropertiesFormModel = require('cartodb3/editor/style/style-form/style-properties-form/style-shape-properties-form-model');
+var StyleShapePropertiesFormModel = require('builder/editor/style/style-form/style-properties-form/style-shape-properties-form-model');
describe('editor/style/style-form/style-shape-properties-form-model', function () {
describe('.parse', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-manager.spec.js b/lib/assets/test/spec/builder/editor/style/style-manager.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/style/style-manager.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-manager.spec.js
index b5f5782b7c..d5c3dc2b86 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-manager.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-manager.spec.js
@@ -1,9 +1,9 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var UserModel = require('cartodb3/data/user-model');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
+var ConfigModel = require('builder/data/config-model');
+var UserModel = require('builder/data/user-model');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
var createDefaultVis = require('../../create-default-vis');
-var StyleManager = require('cartodb3/editor/style/style-manager');
+var StyleManager = require('builder/editor/style/style-manager');
describe('editor/style/style-manager', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/style-view.spec.js b/lib/assets/test/spec/builder/editor/style/style-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/style/style-view.spec.js
rename to lib/assets/test/spec/builder/editor/style/style-view.spec.js
index 08b7624e07..e43aa2351e 100644
--- a/lib/assets/test/spec/cartodb3/editor/style/style-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/style/style-view.spec.js
@@ -1,22 +1,22 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var StyleModel = require('cartodb3/editor/style/style-definition-model');
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var CartoCSSModel = require('cartodb3/editor/style/style-cartocss-model');
-var LayerDefinitionsCollection = require('cartodb3/data/layer-definitions-collection');
-var LayerContentModel = require('cartodb3/data/layer-content-model');
-var StyleView = require('cartodb3/editor/style/style-view');
-var UserActions = require('cartodb3/data/user-actions');
-var MetricsTracker = require('cartodb3/components/metrics/metrics-tracker');
-var UserNotifications = require('cartodb3/data/user-notifications');
-var ConfigModel = require('cartodb3/data/config-model');
-var layerOnboardingKey = require('cartodb3/components/onboardings/layers/layer-onboarding-key');
-var AnalysisDefinitionNodesCollection = require('cartodb3/data/analysis-definition-nodes-collection');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var UserModel = require('cartodb3/data/user-model');
-var QueryRowsCollection = require('cartodb3/data/query-rows-collection');
+var StyleModel = require('builder/editor/style/style-definition-model');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var CartoCSSModel = require('builder/editor/style/style-cartocss-model');
+var LayerDefinitionsCollection = require('builder/data/layer-definitions-collection');
+var LayerContentModel = require('builder/data/layer-content-model');
+var StyleView = require('builder/editor/style/style-view');
+var UserActions = require('builder/data/user-actions');
+var MetricsTracker = require('builder/components/metrics/metrics-tracker');
+var UserNotifications = require('builder/data/user-notifications');
+var ConfigModel = require('builder/data/config-model');
+var layerOnboardingKey = require('builder/components/onboardings/layers/layer-onboarding-key');
+var AnalysisDefinitionNodesCollection = require('builder/data/analysis-definition-nodes-collection');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var UserModel = require('builder/data/user-model');
+var QueryRowsCollection = require('builder/data/query-rows-collection');
var FactoryModals = require('../../factories/modals');
describe('editor/style/style-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/style/styles-factory.spec.js b/lib/assets/test/spec/builder/editor/style/styles-factory.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/editor/style/styles-factory.spec.js
rename to lib/assets/test/spec/builder/editor/style/styles-factory.spec.js
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/time-series-query-model.spec.js b/lib/assets/test/spec/builder/editor/widgets/time-series-query-model.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/editor/widgets/time-series-query-model.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/time-series-query-model.spec.js
index 7b6ea0c344..c1c78bab68 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/time-series-query-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/time-series-query-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
var moment = require('moment');
-var TimeSeriesQueryModel = require('cartodb3/editor/widgets/time-series-query-model');
+var TimeSeriesQueryModel = require('builder/editor/widgets/time-series-query-model');
describe('editor/widgets/time-series-query-model', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widget-view.spec.js b/lib/assets/test/spec/builder/editor/widgets/widget-view.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widget-view.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widget-view.spec.js
index 8a736a36bc..e40ff37740 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widget-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widget-view.spec.js
@@ -1,9 +1,9 @@
var $ = require('jquery');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var EditorWidgetView = require('cartodb3/editor/widgets/widget-view');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
-var WidgetsService = require('cartodb3/editor/widgets/widgets-service');
-var Router = require('cartodb3/routes/router');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var EditorWidgetView = require('builder/editor/widgets/widget-view');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
+var WidgetsService = require('builder/editor/widgets/widgets-service');
+var Router = require('builder/routes/router');
var FactoryModals = require('../../factories/modals');
var ENTER_KEY_CODE = 13;
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widget-form-base-schema-model.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widget-form-base-schema-model.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widget-form-base-schema-model.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widget-form-base-schema-model.spec.js
index 216706fc7c..318ec78084 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widget-form-base-schema-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widget-form-base-schema-model.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var WidgetsFormBaseSchemaModel = require('cartodb3/editor/widgets/widgets-form/schema/widgets-form-base-schema-model');
+var WidgetsFormBaseSchemaModel = require('builder/editor/widgets/widgets-form/schema/widgets-form-base-schema-model');
describe('editor/widgets/widgets-form/schema/widgets-form-base-schema-model', function () {
var userModel = {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-data-schema-model.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-category-data-schema-model.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-data-schema-model.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-category-data-schema-model.spec.js
index b0d26774e1..1371e982bc 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-data-schema-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-category-data-schema-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var WidgetsFormColumnOptionsFactory = require('cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory');
-var WidgetsFormCategorySchemaModel = require('cartodb3/editor/widgets/widgets-form/schema/widgets-form-category-schema-model');
+var WidgetsFormColumnOptionsFactory = require('builder/editor/widgets/widgets-form/widgets-form-column-options-factory');
+var WidgetsFormCategorySchemaModel = require('builder/editor/widgets/widgets-form/schema/widgets-form-category-schema-model');
var FactoryModals = require('../../../../factories/modals');
describe('editor/widgets/widgets-form/schema/widgets-form-category-schema-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.spec.js
similarity index 83%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.spec.js
index 79dcb46036..ed6f7fff46 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var WidgetsFormColumnOptionsFactory = require('cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory');
-var WidgetsFormFormulaSchemaModel = require('cartodb3/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model');
+var WidgetsFormColumnOptionsFactory = require('builder/editor/widgets/widgets-form/widgets-form-column-options-factory');
+var WidgetsFormFormulaSchemaModel = require('builder/editor/widgets/widgets-form/schema/widgets-form-formula-schema-model');
var FactoryModals = require('../../../../factories/modals');
describe('editor/widgets/widgets-form/schema/widgets-form-formula-schema-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.spec.js
similarity index 89%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.spec.js
index 28f27362b0..fdd14ecb48 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var WidgetsFormColumnOptionsFactory = require('cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory');
-var WidgetsFormHistogramSchemaModel = require('cartodb3/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model');
+var WidgetsFormColumnOptionsFactory = require('builder/editor/widgets/widgets-form/widgets-form-column-options-factory');
+var WidgetsFormHistogramSchemaModel = require('builder/editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model');
var FactoryModals = require('../../../../factories/modals');
describe('editor/widgets/widgets-form/schema/widgets-form-histogram-schema-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.spec.js
index 5ef53b623e..6d812770ca 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model.spec.js
@@ -1,8 +1,8 @@
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var WidgetsFormColumnOptionsFactory = require('cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory');
-var WidgetsFormTimeSeriesSchemaModel = require('cartodb3/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var WidgetsFormColumnOptionsFactory = require('builder/editor/widgets/widgets-form/widgets-form-column-options-factory');
+var WidgetsFormTimeSeriesSchemaModel = require('builder/editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model');
var FactoryModals = require('../../../../factories/modals');
describe('editor/widgets/widgets-form/schema/widgets-form-time-series-schema-model', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-column-options-factory.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-column-options-factory.spec.js
index 6a5bde2773..5424fedeae 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-column-options-factory.spec.js
@@ -1,6 +1,6 @@
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var WidgetsFormColumnOptionsFactory = require('cartodb3/editor/widgets/widgets-form/widgets-form-column-options-factory');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var WidgetsFormColumnOptionsFactory = require('builder/editor/widgets/widgets-form/widgets-form-column-options-factory');
describe('editor/widgets/widgets-form/widgets-form-column-options-factory', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-content-view.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-content-view.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-content-view.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-content-view.spec.js
index 2394e906c8..17685a3eff 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-content-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-content-view.spec.js
@@ -1,10 +1,10 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var WidgetsFormContentView = require('cartodb3/editor/widgets/widgets-form/widgets-form-content-view');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
-var Router = require('cartodb3/routes/router');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var WidgetsFormContentView = require('builder/editor/widgets/widgets-form/widgets-form-content-view');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
+var Router = require('builder/routes/router');
var FactoryModals = require('../../../factories/modals');
describe('editor/widgets/widgets-form/widgets-form-content-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-factory.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-factory.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-factory.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-factory.spec.js
index 0c94a9ed22..cfc5391577 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-factory.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-factory.spec.js
@@ -1,8 +1,8 @@
var _ = require('underscore');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var WidgetsFormFactory = require('cartodb3/editor/widgets/widgets-form/widgets-form-factory');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var WidgetsFormFactory = require('builder/editor/widgets/widgets-form/widgets-form-factory');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/widgets/widgets-form/widgets-form-factory', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-fields-view.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-fields-view.spec.js
similarity index 87%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-fields-view.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-fields-view.spec.js
index 859184e348..d11ce94637 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-fields-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-fields-view.spec.js
@@ -1,6 +1,6 @@
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var WidgetsFormFieldsView = require('cartodb3/editor/widgets/widgets-form/widgets-form-fields-view');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var WidgetsFormFieldsView = require('builder/editor/widgets/widgets-form/widgets-form-fields-view');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
describe('editor/widgets/widgets-form/widgets-form-fields-view', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-view.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-view.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-view.spec.js
index b8f9acac2e..0f35238dfe 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-form-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-form-view.spec.js
@@ -1,11 +1,11 @@
var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
-var ConfigModel = require('cartodb3/data/config-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var WidgetsFormView = require('cartodb3/editor/widgets/widgets-form/widgets-form-view');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
-var UserActions = require('cartodb3/data/user-actions');
+var ConfigModel = require('builder/data/config-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var WidgetsFormView = require('builder/editor/widgets/widgets-form/widgets-form-view');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
+var UserActions = require('builder/data/user-actions');
var FactoryModals = require('../../../factories/modals');
describe('editor/widgets/widgets-form/widgets-form-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-header.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-header.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-header.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-header.spec.js
index b85451ec4e..ab517b6361 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-form/widgets-header.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-form/widgets-header.spec.js
@@ -1,9 +1,9 @@
var Backbone = require('backbone');
var $ = require('jquery');
-var ConfigModel = require('cartodb3/data/config-model');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var WidgetHeader = require('cartodb3/editor/widgets/widgets-form/widget-header');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
+var ConfigModel = require('builder/data/config-model');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var WidgetHeader = require('builder/editor/widgets/widgets-form/widget-header');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
var FactoryModals = require('../../../factories/modals');
describe('editor/widgets/widgets-form/widgets-header', function () {
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-service.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-service.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-service.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-service.spec.js
index fa1f258f4c..325251dafa 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-service.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-service.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var WidgetsService = require('cartodb3/editor/widgets/widgets-service');
-var Router = require('cartodb3/routes/router');
+var WidgetsService = require('builder/editor/widgets/widgets-service');
+var Router = require('builder/routes/router');
describe('editor/widgets/widgets-service', function () {
var widgetModel;
diff --git a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-view.spec.js b/lib/assets/test/spec/builder/editor/widgets/widgets-view.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/editor/widgets/widgets-view.spec.js
rename to lib/assets/test/spec/builder/editor/widgets/widgets-view.spec.js
index fb33b35cf3..21a8820ddc 100644
--- a/lib/assets/test/spec/cartodb3/editor/widgets/widgets-view.spec.js
+++ b/lib/assets/test/spec/builder/editor/widgets/widgets-view.spec.js
@@ -1,10 +1,10 @@
var $ = require('jquery');
var Backbone = require('backbone');
-var UserActions = require('cartodb3/data/user-actions');
-var LayerDefinitionModel = require('cartodb3/data/layer-definition-model');
-var EditorWidgetsView = require('cartodb3/editor/widgets/widgets-view');
-var WidgetDefinitionModel = require('cartodb3/data/widget-definition-model');
-var Router = require('cartodb3/routes/router');
+var UserActions = require('builder/data/user-actions');
+var LayerDefinitionModel = require('builder/data/layer-definition-model');
+var EditorWidgetsView = require('builder/editor/widgets/widgets-view');
+var WidgetDefinitionModel = require('builder/data/widget-definition-model');
+var Router = require('builder/routes/router');
var FactoryModals = require('../../factories/modals');
describe('editor/widgets/widgets-view', function () {
diff --git a/lib/assets/test/spec/cartodb3/embed-integrations.spec.js b/lib/assets/test/spec/builder/embed-integrations.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/embed-integrations.spec.js
rename to lib/assets/test/spec/builder/embed-integrations.spec.js
index f39f44ae7d..d7d7dbd55e 100644
--- a/lib/assets/test/spec/cartodb3/embed-integrations.spec.js
+++ b/lib/assets/test/spec/builder/embed-integrations.spec.js
@@ -2,8 +2,8 @@ var $ = require('jquery');
var _ = require('underscore');
var Backbone = require('backbone');
var deepInsights = require('deep-insights/index');
-var LayerStyleCollection = require('cartodb3/embed/style-collection');
-var EmbedIntegrations = require('cartodb3/embed/embed-integrations');
+var LayerStyleCollection = require('builder/embed/style-collection');
+var EmbedIntegrations = require('builder/embed/embed-integrations');
describe('embed-integrations', function () {
var el;
diff --git a/lib/assets/test/spec/cartodb3/embed/embed-overlay-view.spec.js b/lib/assets/test/spec/builder/embed/embed-overlay-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/embed/embed-overlay-view.spec.js
rename to lib/assets/test/spec/builder/embed/embed-overlay-view.spec.js
index ee3423e71c..d82eda188f 100644
--- a/lib/assets/test/spec/cartodb3/embed/embed-overlay-view.spec.js
+++ b/lib/assets/test/spec/builder/embed/embed-overlay-view.spec.js
@@ -1,5 +1,5 @@
var _ = require('underscore');
-var EmbedOverlayView = require('cartodb3/embed/embed-overlay-view');
+var EmbedOverlayView = require('builder/embed/embed-overlay-view');
describe('embed/embed-overlay-view', function () {
var TITLE = 'Awesome Embed Map';
diff --git a/lib/assets/test/spec/cartodb3/embed/embed-view.spec.js b/lib/assets/test/spec/builder/embed/embed-view.spec.js
similarity index 98%
rename from lib/assets/test/spec/cartodb3/embed/embed-view.spec.js
rename to lib/assets/test/spec/builder/embed/embed-view.spec.js
index 780e1a0735..5360e5f171 100644
--- a/lib/assets/test/spec/cartodb3/embed/embed-view.spec.js
+++ b/lib/assets/test/spec/builder/embed/embed-view.spec.js
@@ -1,6 +1,6 @@
var $ = require('jquery');
var _ = require('underscore');
-var EmbedView = require('cartodb3/embed/embed-view');
+var EmbedView = require('builder/embed/embed-view');
describe('embed/embed-view', function () {
var TITLE = 'Awesome Embed Map';
diff --git a/lib/assets/test/spec/cartodb3/embed/tabs-view/tabs-view.spec.js b/lib/assets/test/spec/builder/embed/tabs-view/tabs-view.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/embed/tabs-view/tabs-view.spec.js
rename to lib/assets/test/spec/builder/embed/tabs-view/tabs-view.spec.js
index 21ae98e852..168a5efeaa 100644
--- a/lib/assets/test/spec/cartodb3/embed/tabs-view/tabs-view.spec.js
+++ b/lib/assets/test/spec/builder/embed/tabs-view/tabs-view.spec.js
@@ -1,6 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
-var TabsView = require('cartodb3/embed/tabs/tabs-view');
+var TabsView = require('builder/embed/tabs/tabs-view');
describe('embed/tabs/tabs-view', function () {
var view;
diff --git a/lib/assets/test/spec/builder/factories/modals.js b/lib/assets/test/spec/builder/factories/modals.js
new file mode 100644
index 0000000000..0d1c7f545a
--- /dev/null
+++ b/lib/assets/test/spec/builder/factories/modals.js
@@ -0,0 +1,7 @@
+var ModalsServiceModel = require('../../../../javascripts/builder/components/modals/modals-service-model');
+
+module.exports = {
+ createModalService: function () {
+ return new ModalsServiceModel();
+ }
+};
diff --git a/lib/assets/test/spec/cartodb3/helpers/error-parser.spec.js b/lib/assets/test/spec/builder/helpers/error-parser.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/helpers/error-parser.spec.js
rename to lib/assets/test/spec/builder/helpers/error-parser.spec.js
index 99925fd87d..72436115fc 100644
--- a/lib/assets/test/spec/cartodb3/helpers/error-parser.spec.js
+++ b/lib/assets/test/spec/builder/helpers/error-parser.spec.js
@@ -1,4 +1,4 @@
-var errorParser = require('cartodb3/helpers/error-parser');
+var errorParser = require('builder/helpers/error-parser');
describe('helpers/error-parser', function () {
it('should not provide error info if there isn\'t anything', function () {
diff --git a/lib/assets/test/spec/cartodb3/helpers/fetch-all-query-objects.spec.js b/lib/assets/test/spec/builder/helpers/fetch-all-query-objects.spec.js
similarity index 94%
rename from lib/assets/test/spec/cartodb3/helpers/fetch-all-query-objects.spec.js
rename to lib/assets/test/spec/builder/helpers/fetch-all-query-objects.spec.js
index 9ea877095d..122ed5ea76 100644
--- a/lib/assets/test/spec/cartodb3/helpers/fetch-all-query-objects.spec.js
+++ b/lib/assets/test/spec/builder/helpers/fetch-all-query-objects.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var fetchAllQueryObjectsIfNecessary = require('cartodb3/helpers/fetch-all-query-objects');
+var fetchAllQueryObjectsIfNecessary = require('builder/helpers/fetch-all-query-objects');
describe('helpers/fetch-all-query-objects', function () {
describe('repeated errors', function () {
diff --git a/lib/assets/test/spec/cartodb3/helpers/locale.spec.js b/lib/assets/test/spec/builder/helpers/locale.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/helpers/locale.spec.js
rename to lib/assets/test/spec/builder/helpers/locale.spec.js
index aa26866cb4..504c1f527a 100644
--- a/lib/assets/test/spec/cartodb3/helpers/locale.spec.js
+++ b/lib/assets/test/spec/builder/helpers/locale.spec.js
@@ -1,4 +1,4 @@
-var localeHelper = require('cartodb3/helpers/locale');
+var localeHelper = require('builder/helpers/locale');
describe('helpers/locale', function () {
var data = {
diff --git a/lib/assets/test/spec/cartodb3/helpers/magic-positioner.spec.js b/lib/assets/test/spec/builder/helpers/magic-positioner.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/helpers/magic-positioner.spec.js
rename to lib/assets/test/spec/builder/helpers/magic-positioner.spec.js
index 70b4b44ff8..74c1a32c0c 100644
--- a/lib/assets/test/spec/cartodb3/helpers/magic-positioner.spec.js
+++ b/lib/assets/test/spec/builder/helpers/magic-positioner.spec.js
@@ -1,4 +1,4 @@
-var MagicPositioner = require('cartodb3/helpers/magic-positioner');
+var MagicPositioner = require('builder/helpers/magic-positioner');
var $ = require('jquery');
describe('helpers/magic-positioner', function () {
diff --git a/lib/assets/test/spec/cartodb3/helpers/mapcard-preview.spec.js b/lib/assets/test/spec/builder/helpers/mapcard-preview.spec.js
similarity index 81%
rename from lib/assets/test/spec/cartodb3/helpers/mapcard-preview.spec.js
rename to lib/assets/test/spec/builder/helpers/mapcard-preview.spec.js
index 71a6e7bd86..7b3100f656 100644
--- a/lib/assets/test/spec/cartodb3/helpers/mapcard-preview.spec.js
+++ b/lib/assets/test/spec/builder/helpers/mapcard-preview.spec.js
@@ -1,6 +1,6 @@
-var mapCardPreview = require('cartodb3/helpers/mapcard-preview');
-var VisDefinitionModel = require('cartodb3/data/vis-definition-model');
-var ConfigModel = require('cartodb3/data/config-model');
+var mapCardPreview = require('builder/helpers/mapcard-preview');
+var VisDefinitionModel = require('builder/data/vis-definition-model');
+var ConfigModel = require('builder/data/config-model');
describe('helpers/mapcard-preview', function () {
var configData = {
diff --git a/lib/assets/test/spec/cartodb3/helpers/required-opts.spec.js b/lib/assets/test/spec/builder/helpers/required-opts.spec.js
similarity index 90%
rename from lib/assets/test/spec/cartodb3/helpers/required-opts.spec.js
rename to lib/assets/test/spec/builder/helpers/required-opts.spec.js
index e37a746b21..ad6660a9b2 100644
--- a/lib/assets/test/spec/cartodb3/helpers/required-opts.spec.js
+++ b/lib/assets/test/spec/builder/helpers/required-opts.spec.js
@@ -1,4 +1,4 @@
-var checkAndBuildOpts = require('cartodb3/helpers/required-opts');
+var checkAndBuildOpts = require('builder/helpers/required-opts');
describe('required opts', function () {
describe('basic usage', function () {
diff --git a/lib/assets/test/spec/cartodb3/helpers/reset-style-per-node.spec.js b/lib/assets/test/spec/builder/helpers/reset-style-per-node.spec.js
similarity index 96%
rename from lib/assets/test/spec/cartodb3/helpers/reset-style-per-node.spec.js
rename to lib/assets/test/spec/builder/helpers/reset-style-per-node.spec.js
index 9d5b7f3d4f..2fd97011f6 100644
--- a/lib/assets/test/spec/cartodb3/helpers/reset-style-per-node.spec.js
+++ b/lib/assets/test/spec/builder/helpers/reset-style-per-node.spec.js
@@ -1,9 +1,9 @@
-var QueryGeometryModel = require('cartodb3/data/query-geometry-model');
-var QuerySchemaModel = require('cartodb3/data/query-schema-model');
-var ConfigModel = require('cartodb3/data/config-model');
-var AnalysisDefinitionNodeModel = require('cartodb3/data/analysis-definition-node-model');
-var LayerDefModel = require('cartodb3/data/layer-definition-model');
-var resetStylePerNode = require('cartodb3/helpers/reset-style-per-node');
+var QueryGeometryModel = require('builder/data/query-geometry-model');
+var QuerySchemaModel = require('builder/data/query-schema-model');
+var ConfigModel = require('builder/data/config-model');
+var AnalysisDefinitionNodeModel = require('builder/data/analysis-definition-node-model');
+var LayerDefModel = require('builder/data/layer-definition-model');
+var resetStylePerNode = require('builder/helpers/reset-style-per-node');
describe('helpers/reset-style-per-node', function () {
var layerDefModel;
diff --git a/lib/assets/test/spec/cartodb3/helpers/sql-utils.spec.js b/lib/assets/test/spec/builder/helpers/sql-utils.spec.js
similarity index 99%
rename from lib/assets/test/spec/cartodb3/helpers/sql-utils.spec.js
rename to lib/assets/test/spec/builder/helpers/sql-utils.spec.js
index 9a6ee7b3e2..cd78356102 100644
--- a/lib/assets/test/spec/cartodb3/helpers/sql-utils.spec.js
+++ b/lib/assets/test/spec/builder/helpers/sql-utils.spec.js
@@ -1,4 +1,4 @@
-var SQLUtils = require('cartodb3/helpers/sql-utils');
+var SQLUtils = require('builder/helpers/sql-utils');
describe('helpers/sql-utils', function () {
it('.isSameQuery', function () {
diff --git a/lib/assets/test/spec/cartodb3/helpers/table-name-utils.spec.js b/lib/assets/test/spec/builder/helpers/table-name-utils.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/helpers/table-name-utils.spec.js
rename to lib/assets/test/spec/builder/helpers/table-name-utils.spec.js
index 19b564b42e..f75d11a524 100644
--- a/lib/assets/test/spec/cartodb3/helpers/table-name-utils.spec.js
+++ b/lib/assets/test/spec/builder/helpers/table-name-utils.spec.js
@@ -1,4 +1,4 @@
-var TableNameUtils = require('cartodb3/helpers/table-name-utils');
+var TableNameUtils = require('builder/helpers/table-name-utils');
describe('helpers/sql-utils', function () {
it('._quoteIfNeeded', function () {
diff --git a/lib/assets/test/spec/cartodb3/helpers/utils.spec.js b/lib/assets/test/spec/builder/helpers/utils.spec.js
similarity index 99%
rename from lib/assets/test/spec/cartodb3/helpers/utils.spec.js
rename to lib/assets/test/spec/builder/helpers/utils.spec.js
index 01768f3be1..328dad1432 100644
--- a/lib/assets/test/spec/cartodb3/helpers/utils.spec.js
+++ b/lib/assets/test/spec/builder/helpers/utils.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var Utils = require('cartodb3/helpers/utils');
+var Utils = require('builder/helpers/utils');
describe('helpers/utils', function () {
describe('isURL', function () {
diff --git a/lib/assets/test/spec/cartodb3/locale/en.json.spec.js b/lib/assets/test/spec/builder/locale/en.json.spec.js
similarity index 100%
rename from lib/assets/test/spec/cartodb3/locale/en.json.spec.js
rename to lib/assets/test/spec/builder/locale/en.json.spec.js
diff --git a/lib/assets/test/spec/cartodb3/node-geometry-tracker.spec.js b/lib/assets/test/spec/builder/node-geometry-tracker.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/node-geometry-tracker.spec.js
rename to lib/assets/test/spec/builder/node-geometry-tracker.spec.js
index 689aa2ee64..18f2c03660 100644
--- a/lib/assets/test/spec/cartodb3/node-geometry-tracker.spec.js
+++ b/lib/assets/test/spec/builder/node-geometry-tracker.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var NodeGeometryTracker = require('cartodb3/node-geometry-tracker');
+var NodeGeometryTracker = require('builder/node-geometry-tracker');
describe('NodeGeometryTracker.track', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/routes/handle-analyses-route.spec.js b/lib/assets/test/spec/builder/routes/handle-analyses-route.spec.js
similarity index 63%
rename from lib/assets/test/spec/cartodb3/routes/handle-analyses-route.spec.js
rename to lib/assets/test/spec/builder/routes/handle-analyses-route.spec.js
index fc5a00b6b7..b36fa5866a 100644
--- a/lib/assets/test/spec/cartodb3/routes/handle-analyses-route.spec.js
+++ b/lib/assets/test/spec/builder/routes/handle-analyses-route.spec.js
@@ -1,5 +1,5 @@
-var handleAnalysesRoute = require('cartodb3/routes/handle-analyses-route');
-var AnalysesService = require('cartodb3/editor/layers/layer-content-views/analyses/analyses-service');
+var handleAnalysesRoute = require('builder/routes/handle-analyses-route');
+var AnalysesService = require('builder/editor/layers/layer-content-views/analyses/analyses-service');
describe('routes/handleAnalysesRoute', function () {
it('should handle analyses route', function () {
diff --git a/lib/assets/test/spec/cartodb3/routes/handle-modals-route.spec.js b/lib/assets/test/spec/builder/routes/handle-modals-route.spec.js
similarity index 91%
rename from lib/assets/test/spec/cartodb3/routes/handle-modals-route.spec.js
rename to lib/assets/test/spec/builder/routes/handle-modals-route.spec.js
index 2e5ddf9ee0..8f4009174e 100644
--- a/lib/assets/test/spec/cartodb3/routes/handle-modals-route.spec.js
+++ b/lib/assets/test/spec/builder/routes/handle-modals-route.spec.js
@@ -1,4 +1,4 @@
-var handleModalsRoute = require('cartodb3/routes/handle-modals-route');
+var handleModalsRoute = require('builder/routes/handle-modals-route');
describe('routes/handleModalsRoute', function () {
it('should handle modals route', function () {
diff --git a/lib/assets/test/spec/cartodb3/routes/populate-route.spec.js b/lib/assets/test/spec/builder/routes/populate-route.spec.js
similarity index 93%
rename from lib/assets/test/spec/cartodb3/routes/populate-route.spec.js
rename to lib/assets/test/spec/builder/routes/populate-route.spec.js
index a1729d4f61..d289dc66ea 100644
--- a/lib/assets/test/spec/cartodb3/routes/populate-route.spec.js
+++ b/lib/assets/test/spec/builder/routes/populate-route.spec.js
@@ -1,4 +1,4 @@
-var populateRoute = require('cartodb3/routes/populate-route');
+var populateRoute = require('builder/routes/populate-route');
describe('routes/populateRoute', function () {
it('should return the route if no arguments', function () {
diff --git a/lib/assets/test/spec/cartodb3/routes/router.spec.js b/lib/assets/test/spec/builder/routes/router.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/routes/router.spec.js
rename to lib/assets/test/spec/builder/routes/router.spec.js
index 2f7459e26c..9fa49e067d 100644
--- a/lib/assets/test/spec/cartodb3/routes/router.spec.js
+++ b/lib/assets/test/spec/builder/routes/router.spec.js
@@ -1,5 +1,5 @@
var Backbone = require('backbone');
-var Router = require('cartodb3/routes/router');
+var Router = require('builder/routes/router');
Backbone.history.start({ pushState: false, hashChange: true, root: 'builder/id' });
diff --git a/lib/assets/test/spec/cartodb3/value-objects/analysis-node-ids.spec.js b/lib/assets/test/spec/builder/value-objects/analysis-node-ids.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/value-objects/analysis-node-ids.spec.js
rename to lib/assets/test/spec/builder/value-objects/analysis-node-ids.spec.js
index ba1fa746c2..4f09f6c696 100644
--- a/lib/assets/test/spec/cartodb3/value-objects/analysis-node-ids.spec.js
+++ b/lib/assets/test/spec/builder/value-objects/analysis-node-ids.spec.js
@@ -1,4 +1,4 @@
-var analysisDefinitionNodeIds = require('cartodb3/value-objects/analysis-node-ids');
+var analysisDefinitionNodeIds = require('builder/value-objects/analysis-node-ids');
describe('value-objects/analysis-node-ids', function () {
describe('.next', function () {
diff --git a/lib/assets/test/spec/cartodb3/value-objects/distance-converter.spec.js b/lib/assets/test/spec/builder/value-objects/distance-converter.spec.js
similarity index 97%
rename from lib/assets/test/spec/cartodb3/value-objects/distance-converter.spec.js
rename to lib/assets/test/spec/builder/value-objects/distance-converter.spec.js
index 5b5bcab1fd..5d2ada9fbb 100644
--- a/lib/assets/test/spec/cartodb3/value-objects/distance-converter.spec.js
+++ b/lib/assets/test/spec/builder/value-objects/distance-converter.spec.js
@@ -1,4 +1,4 @@
-var DistanceConverter = require('cartodb3/value-objects/distance-converter');
+var DistanceConverter = require('builder/value-objects/distance-converter');
describe('value-objects/distance-converter', function () {
it('should have a set of static distance options', function () {
diff --git a/lib/assets/test/spec/cartodb3/vis-notifications.spec.js b/lib/assets/test/spec/builder/vis-notifications.spec.js
similarity index 92%
rename from lib/assets/test/spec/cartodb3/vis-notifications.spec.js
rename to lib/assets/test/spec/builder/vis-notifications.spec.js
index b5a9b62305..2755106592 100644
--- a/lib/assets/test/spec/cartodb3/vis-notifications.spec.js
+++ b/lib/assets/test/spec/builder/vis-notifications.spec.js
@@ -1,6 +1,6 @@
var Backbone = require('backbone');
-var VisNotifications = require('cartodb3/vis-notifications');
-var Notifier = require('cartodb3/components/notifier/notifier');
+var VisNotifications = require('builder/vis-notifications');
+var Notifier = require('builder/components/notifier/notifier');
describe('VisNotifications.track', function () {
beforeEach(function () {
diff --git a/lib/assets/test/spec/cartodb3/widgets-notifications.spec.js b/lib/assets/test/spec/builder/widgets-notifications.spec.js
similarity index 95%
rename from lib/assets/test/spec/cartodb3/widgets-notifications.spec.js
rename to lib/assets/test/spec/builder/widgets-notifications.spec.js
index e7d3e50b0a..06bf589e69 100644
--- a/lib/assets/test/spec/cartodb3/widgets-notifications.spec.js
+++ b/lib/assets/test/spec/builder/widgets-notifications.spec.js
@@ -1,4 +1,4 @@
-var widgetsNotifications = require('cartodb3/widgets-notifications');
+var widgetsNotifications = require('builder/widgets-notifications');
describe('widget-notifications', function () {
describe('._showErrorNotification', function () {
diff --git a/lib/assets/test/spec/cartodb3/factories/modals.js b/lib/assets/test/spec/cartodb3/factories/modals.js
deleted file mode 100644
index b87d512596..0000000000
--- a/lib/assets/test/spec/cartodb3/factories/modals.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var ModalsServiceModel = require('../../../../javascripts/cartodb3/components/modals/modals-service-model');
-
-module.exports = {
- createModalService: function () {
- return new ModalsServiceModel();
- }
-};
diff --git a/lib/build/affectedFiles/affectedFiles.js b/lib/build/affectedFiles/affectedFiles.js
index bf6720b69c..d8de71fc9e 100644
--- a/lib/build/affectedFiles/affectedFiles.js
+++ b/lib/build/affectedFiles/affectedFiles.js
@@ -8,7 +8,7 @@
*
* It needs a config file called `tree.config.json` with the next properties:
* - testsFolder: the folder to build the dependency tree from. In our case, the specs folder.
- * ex: "testsFolder": "lib/assets/test/spec/cartodb3/"
+ * ex: "testsFolder": "lib/assets/test/spec/builder/"
* - filesRegex: the regular expression for knowing what files must be taken into account for building the dependency tree.
* ex: "filesRegex": "spec\\.js$"
*
diff --git a/lib/build/tasks/copy.js b/lib/build/tasks/copy.js
index a15e421e7a..b2c0e096c8 100644
--- a/lib/build/tasks/copy.js
+++ b/lib/build/tasks/copy.js
@@ -135,7 +135,7 @@ exports.task = function (grunt) {
}]
},
- css_cartodb3: {
+ css_builder: {
files: [{
// TODO: remove editor
expand: true,
@@ -145,7 +145,7 @@ exports.task = function (grunt) {
}]
},
- css_vendor_cartodb3: {
+ css_vendor_builder: {
files: [{
expand: true,
cwd: 'node_modules/cartoassets/src/scss/',
diff --git a/lib/build/tasks/watch.js b/lib/build/tasks/watch.js
index 9781519058..ab699bd3e4 100644
--- a/lib/build/tasks/watch.js
+++ b/lib/build/tasks/watch.js
@@ -12,8 +12,8 @@ exports.task = function () {
'node_modules/cartodb.js/themes/scss/**/*.scss'
],
tasks: [
- 'copy:css_vendor_cartodb3',
- 'copy:css_cartodb3',
+ 'copy:css_vendor_builder',
+ 'copy:css_builder',
'sass',
'concat:css'
],
@@ -24,8 +24,8 @@ exports.task = function () {
},
js_affected: {
files: [
- 'lib/assets/javascripts/cartodb3/**/*',
- 'lib/assets/test/spec/cartodb3/**/*',
+ 'lib/assets/javascripts/builder/**/*',
+ 'lib/assets/test/spec/builder/**/*',
'lib/assets/javascripts/deep-insights/**/*',
'lib/assets/test/spec/deep-insights/**/*',
'lib/assets/javascripts/locale/*'
diff --git a/lib/build/tasks/webpack/webpack.js b/lib/build/tasks/webpack/webpack.js
index ebcf6175b6..8fdea94ae7 100644
--- a/lib/build/tasks/webpack/webpack.js
+++ b/lib/build/tasks/webpack/webpack.js
@@ -10,7 +10,7 @@ var compiler = {};
var affectedSpecs = [];
var cache = {};
var paths = {
- builder_specs: './lib/assets/test/spec/cartodb3/**/*.spec.js',
+ builder_specs: './lib/assets/test/spec/builder/**/*.spec.js',
dashboard_specs: './lib/assets/test/spec/dashboard/**/*.spec.js',
deep_insights_specs: './lib/assets/test/spec/deep-insights/**/*.spec.js'
};
@@ -23,9 +23,9 @@ var affected = function (option, grunt) {
affectedSpecs = [
'./lib/build/source-map-support.js',
- './lib/assets/javascripts/cartodb3/components/form-components/index.js',
- './lib/assets/test/spec/cartodb3/components/modals/add-analysis/analysis-options.spec.js',
- './lib/assets/test/spec/cartodb3/routes/router.spec.js'
+ './lib/assets/javascripts/builder/components/form-components/index.js',
+ './lib/assets/test/spec/builder/components/modals/add-analysis/analysis-options.spec.js',
+ './lib/assets/test/spec/builder/routes/router.spec.js'
];
var allSpecs = glob.sync(paths.builder_specs).concat(glob.sync(paths.deep_insights_specs));
diff --git a/lib/carto/form.rb b/lib/carto/form.rb
index 1323e59083..df531f255f 100644
--- a/lib/carto/form.rb
+++ b/lib/carto/form.rb
@@ -5,7 +5,7 @@ require_relative './definition'
module Carto
class Form
DEFAULT_FORMS_DEFINITION_LOCATION =
- "#{Rails.root}/lib/assets/javascripts/cartodb3/data/default-form-styles.json".freeze
+ "#{Rails.root}/lib/assets/javascripts/builder/data/default-form-styles.json".freeze
def initialize(geometry_type)
@geometry_type = geometry_type
diff --git a/lib/carto/styles/style.rb b/lib/carto/styles/style.rb
index c01b7eb089..a76333f68b 100644
--- a/lib/carto/styles/style.rb
+++ b/lib/carto/styles/style.rb
@@ -6,7 +6,7 @@ module Carto
module Styles
class Style
CARTOGRAPHY_DEFINITION_LOCATION =
- "#{Rails.root}/lib/assets/javascripts/cartodb3/data/default-cartography.json".freeze
+ "#{Rails.root}/lib/assets/javascripts/builder/data/default-cartography.json".freeze
def initialize(definition)
@definition = definition
diff --git a/lib/carto/table_utils.rb b/lib/carto/table_utils.rb
index 49f3f08ef9..010bcb4717 100644
--- a/lib/carto/table_utils.rb
+++ b/lib/carto/table_utils.rb
@@ -1,7 +1,7 @@
module Carto
module TableUtils
# Returns a (double) quoted table name if needed (if it contains a dash, for example).
- # Coupled to lib/assets/javascripts/cartodb3/helpers/utils.js#safeTableNameQuoting
+ # Coupled to lib/assets/javascripts/builder/helpers/utils.js#safeTableNameQuoting
def safe_table_name_quoting(table_name)
can_be_quoted?(table_name) ? dashes_quoting(table_name) : table_name
end
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index fcd1605f35..f640583259 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
- "version": "4.11.45",
+ "version": "4.11.45.1",
"dependencies": {
"accessory": {
"version": "1.0.1",
diff --git a/package.json b/package.json
index abdd12f77f..ff9a45eff7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
- "version": "4.11.45",
+ "version": "4.11.45.1",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
diff --git a/spec/factories/layers.rb b/spec/factories/layers.rb
index 665e35aead..14bc2add5d 100644
--- a/spec/factories/layers.rb
+++ b/spec/factories/layers.rb
@@ -93,7 +93,7 @@ module Fixtures
# These depend on tooltip_light.jst.mustache at the following paths:
# - /lib/assets/javascripts/cartodb/table/views/tooltip/templates/tooltip_light.jst.mustache
- # - /lib/assets/javascripts/cartodb3/mustache-templates/tooltips/tooltip_light.jst.mustache
+ # - /lib/assets/javascripts/builder/mustache-templates/tooltips/tooltip_light.jst.mustache
def v2_tooltip_light_template_fragment
'
'
end
@@ -105,7 +105,7 @@ module Fixtures
# These depend on infowindow_light.jst.mustache at the following paths:
# - /lib/assets/javascripts/cartodb/table/views/infowindow/templates/infowindow_light.jst.mustache
- # - /lib/assets/javascripts/cartodb3/mustache-templates/infowindows/infowindow_light.jst.mustache
+ # - /lib/assets/javascripts/builder/mustache-templates/infowindows/infowindow_light.jst.mustache
module Infowindows
def custom_infowindow(template = 'wadus infowindow')
{
diff --git a/spec/lib/carto/definition_spec.rb b/spec/lib/carto/definition_spec.rb
index 22c96ba114..ba31d6a764 100644
--- a/spec/lib/carto/definition_spec.rb
+++ b/spec/lib/carto/definition_spec.rb
@@ -14,7 +14,7 @@ module Carto
end
it 'doesn\'t read the same file twice' do
- file_path = 'lib/assets/javascripts/cartodb3/data/default-cartography.json'
+ file_path = 'lib/assets/javascripts/builder/data/default-cartography.json'
File.expects(:read).with(file_path).returns('{}').at_most(1)
diff --git a/tree.config.json b/tree.config.json
index f8cdf73a9f..8caacb9382 100644
--- a/tree.config.json
+++ b/tree.config.json
@@ -1,6 +1,6 @@
{
"testsFolder": [
- "lib/assets/test/spec/cartodb3/",
+ "lib/assets/test/spec/builder/",
"lib/assets/test/spec/deep-insights"
],
"filesRegex": "spec\\.js$"
diff --git a/webpack/builder/webpack.dev.config.js b/webpack/builder/webpack.dev.config.js
index 0f57f4eaa0..946c2df08d 100644
--- a/webpack/builder/webpack.dev.config.js
+++ b/webpack/builder/webpack.dev.config.js
@@ -14,9 +14,9 @@ const isVendor = (module, count) => {
};
const entryPoints = {
- builder_embed: ['whatwg-fetch', resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3/public_editor.js')],
- dataset: resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3/dataset.js'),
- builder: resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3/editor.js')
+ builder_embed: ['whatwg-fetch', resolve(__dirname, '../../', 'lib/assets/javascripts/builder/public_editor.js')],
+ dataset: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/dataset.js'),
+ builder: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/editor.js')
};
module.exports = env => {
@@ -99,7 +99,7 @@ module.exports = env => {
test: /\.tpl$/,
use: 'tpl-loader',
include: [
- resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3'),
+ resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/deep-insights'),
resolve(__dirname, '../../', 'node_modules/cartodb.js')
]
@@ -108,7 +108,7 @@ module.exports = env => {
test: /\.mustache$/,
use: 'raw-loader',
include: [
- resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3'),
+ resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/deep-insights'),
resolve(__dirname, '../../', 'node_modules/cartodb.js')
]
diff --git a/webpack/builder/webpack.prod.config.js b/webpack/builder/webpack.prod.config.js
index 16cb65a299..dea15d64c8 100644
--- a/webpack/builder/webpack.prod.config.js
+++ b/webpack/builder/webpack.prod.config.js
@@ -9,9 +9,9 @@ const isVendor = (module, count) => {
};
const entryPoints = {
- builder_embed: ['whatwg-fetch', resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3/public_editor.js')],
- dataset: resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3/dataset.js'),
- builder: resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3/editor.js')
+ builder_embed: ['whatwg-fetch', resolve(__dirname, '../../', 'lib/assets/javascripts/builder/public_editor.js')],
+ dataset: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/dataset.js'),
+ builder: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/editor.js')
};
module.exports = env => {
@@ -102,7 +102,7 @@ module.exports = env => {
test: /\.tpl$/,
use: 'tpl-loader',
include: [
- resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3'),
+ resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/dashboard'),
resolve(__dirname, '../../', 'lib/assets/javascripts/deep-insights'),
resolve(__dirname, '../../', 'node_modules/cartodb.js')
@@ -112,7 +112,7 @@ module.exports = env => {
test: /\.mustache$/,
use: 'raw-loader',
include: [
- resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3'),
+ resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/deep-insights'),
resolve(__dirname, '../../', 'node_modules/cartodb.js')
]
diff --git a/webpack/dashboard/webpack.dev.config.js b/webpack/dashboard/webpack.dev.config.js
index 672ca1f5de..ea7ee2d99f 100644
--- a/webpack/dashboard/webpack.dev.config.js
+++ b/webpack/dashboard/webpack.dev.config.js
@@ -97,7 +97,7 @@ module.exports = env => {
test: /\.tpl$/,
use: 'tpl-loader',
include: [
- resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3'),
+ resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/dashboard'),
resolve(__dirname, '../../', 'node_modules/cartodb.js')
]
diff --git a/webpack/dashboard/webpack.prod.config.js b/webpack/dashboard/webpack.prod.config.js
index f9c3775693..e3c30a0127 100644
--- a/webpack/dashboard/webpack.prod.config.js
+++ b/webpack/dashboard/webpack.prod.config.js
@@ -101,7 +101,7 @@ module.exports = env => {
test: /\.tpl$/,
use: 'tpl-loader',
include: [
- resolve(__dirname, '../../', 'lib/assets/javascripts/cartodb3'),
+ resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/dashboard'),
resolve(__dirname, '../../', 'node_modules/cartodb.js')
]