Merge pull request bokeh#3735 from bokeh/task/3651_unify_directory_st…

…ructure

Task/3651 unify directory structure

.gitignore

@@ -108,5 +108,5 @@ win-64
 .cache/
 
 # generated coffeescript
-/bokehjs/src/coffee/widget/defaults.coffee
+/bokehjs/src/coffee/models/widgets/defaults.coffee
 /bokehjs/src/coffee/common/defaults.coffee

bokehjs/gulp/tasks/generate_defaults.py

@@ -104,8 +104,5 @@ def output_defaults_module(filename, defaults):
 
 output_defaults_module(filename = os.path.join(dest_dir, 'common/defaults.coffee'),
                        defaults = all_json)
-output_defaults_module(filename = os.path.join(dest_dir, 'widget/defaults.coffee'),
+output_defaults_module(filename = os.path.join(dest_dir, 'models/widgets/defaults.coffee'),
                        defaults = widgets_json)
-
-
-

bokehjs/gulp/tasks/scripts.coffee

@@ -159,7 +159,7 @@ gulp.task "scripts:build", ["scripts:compile"], (cb) ->
   preludeText = fs.readFileSync(preludePath, { encoding: 'utf8' })
 
   widgetsOpts = {
-    entries: [path.resolve(path.join(paths.buildDir.jsTree, 'widget/main.js'))]
+    entries: [path.resolve(path.join(paths.buildDir.jsTree, 'models/widgets/main.js'))]
     extensions: [".js"]
     debug: true
     preludePath: preludePath

bokehjs/src/coffee/api/figure.coffee

@@ -1,10 +1,9 @@
 _ = require "underscore"
 base = require "../common/base"
 Logging = require "../common/logging"
-FactorRange = require "../range/factor_range"
-Range1d = require "../range/range1d"
-ColumnDataSource = require "../source/column_data_source"
-helpers = "./helpers"
+FactorRange = require "../models/ranges/factor_range"
+Range1d = require "../models/ranges/range1d"
+ColumnDataSource = require "../models/sources/column_data_source"
 
 Collections = base.Collections
 logger = Logging.logger

bokehjs/src/coffee/common/cartesian_frame.coffee

@@ -1,10 +1,10 @@
 _ = require "underscore"
 LayoutBox = require "./layout_box"
 {logging} = require "./logging"
-LinearMapper = require "../mapper/linear_mapper"
-LogMapper = require "../mapper/log_mapper"
-CategoricalMapper = require "../mapper/categorical_mapper"
-GridMapper = require "../mapper/grid_mapper"
+LinearMapper = require "../models/mappers/linear_mapper"
+LogMapper = require "../models/mappers/log_mapper"
+CategoricalMapper = require "../models/mappers/categorical_mapper"
+GridMapper = require "../models/mappers/grid_mapper"
 
 class CartesianFrame extends LayoutBox.Model
   type: 'CartesianFrame'
@@ -94,4 +94,4 @@ class CartesianFrame extends LayoutBox.Model
     }
 
 module.exports =
-  Model: CartesianFrame
+  Model: CartesianFrame

bokehjs/src/coffee/common/layout_box.coffee

@@ -3,7 +3,7 @@ kiwi = require "kiwi"
 {Variable, Expression, Constraint, Operator } = kiwi
 {Eq, Le, Ge} = Operator
 Model = require "../model"
-Range1d = require "../range/range1d"
+Range1d = require "../models/ranges/range1d"
 
 
 class LayoutBox extends Model