Repository: ViacomInc/data-point
Pull request #120 (2018-01-04 22:41:55)

Add reducer types directory
<!-- What changes are being made? (What feature/bug is being fixed here?) -->
**What**: Move reducer directories into a reducer-types directory (#116)

<!-- Why are these changes necessary? -->
**Why**: Helps organize the code.

This was based on a branch that has since been merged to master, so commits that were squashed in that branch are showing up in the list of commits for this branch.

<!-- Have you done all of these things?  -->
**Checklist**:
<!-- add "N/A" to the end of each line that's irrelevant to your changes -->
<!-- to check an item, place an "x" in the box like so: "- [x] Documentation" -->
- [ ] Documentation n/a
- [ ] Tests n/a
- [x] Ready to be merged <!-- In your opinion, is this ready to be merged as soon as it's reviewed? -->

<!-- feel free to add additional comments -->

  

coveralls: 
[![Coverage Status](https://coveralls.io/builds/14907820/badge)](https://coveralls.io/builds/14907820)

Coverage remained the same at 100.0% when pulling **bacdfb1fd5648c82f7bca101557cef11c778f3d6 on raingerber:add-entity-types-directory** into **ff00ba87f4b5d43ed84b69df3bc5b3fb3b99f4f0 on ViacomInc:master**.

coveralls: 
[![Coverage Status](https://coveralls.io/builds/14907879/badge)](https://coveralls.io/builds/14907879)

Coverage remained the same at 100.0% when pulling **9a165bc4a641dbcc4053e3ed2377ba0f2bcd9d9c on raingerber:add-entity-types-directory** into **ff00ba87f4b5d43ed84b69df3bc5b3fb3b99f4f0 on ViacomInc:master**.

coveralls: 
[![Coverage Status](https://coveralls.io/builds/14915272/badge)](https://coveralls.io/builds/14915272)

Coverage remained the same at 100.0% when pulling **922e869b54ca3cf4df90c825d53afbc77f398b75 on raingerber:add-entity-types-directory** into **a1c64769c57c0b20fb7e4f132445bfd26021d1d2 on ViacomInc:master**.


Patch:
diff --git a/packages/data-point/lib/core/transform.js b/packages/data-point/lib/core/transform.js
index 105463a..9ff3e25 100644
--- a/packages/data-point/lib/core/transform.js
+++ b/packages/data-point/lib/core/transform.js
@@ -3,7 +3,7 @@
 const _ = require('lodash')
 const Promise = require('bluebird')
 
-const Reducer = require('../reducer')
+const Reducer = require('../reducer-types')
 const AccumulatorFactory = require('../accumulator/factory')
 
 function getOptions (spec) {
diff --git a/packages/data-point/lib/entity-types/base-entity/factory.js b/packages/data-point/lib/entity-types/base-entity/factory.js
index 48316c3..62ea1c9 100644
--- a/packages/data-point/lib/entity-types/base-entity/factory.js
+++ b/packages/data-point/lib/entity-types/base-entity/factory.js
@@ -1,7 +1,7 @@
 const deepFreeze = require('deep-freeze')
 const defaultTo = require('lodash/defaultTo')
 
-const createReducer = require('../../reducer').create
+const createReducer = require('../../reducer-types').create
 
 /**
  * @param {function} Factory - factory function to create the entity
diff --git a/packages/data-point/lib/entity-types/entity-collection/factory.js b/packages/data-point/lib/entity-types/entity-collection/factory.js
index e50ba66..6ec6ade 100644
--- a/packages/data-point/lib/entity-types/entity-collection/factory.js
+++ b/packages/data-point/lib/entity-types/entity-collection/factory.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash')
 const parseCompose = require('../parse-compose')
-const createReducer = require('../../reducer').create
+const createReducer = require('../../reducer-types').create
 const createBaseEntity = require('../base-entity').create
 
 /**
diff --git a/packages/data-point/lib/entity-types/entity-control/factory.js b/packages/data-point/lib/entity-types/entity-control/factory.js
index 4a5bec3..af24139 100644
--- a/packages/data-point/lib/entity-types/entity-control/factory.js
+++ b/packages/data-point/lib/entity-types/entity-control/factory.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash')
 
-const createReducer = require('../../reducer').create
+const createReducer = require('../../reducer-types').create
 const createBaseEntity = require('../base-entity').create
 
 /**
diff --git a/packages/data-point/lib/entity-types/entity-hash/factory.js b/packages/data-point/lib/entity-types/entity-hash/factory.js
index 2c3fa39..1a56330 100644
--- a/packages/data-point/lib/entity-types/entity-hash/factory.js
+++ b/packages/data-point/lib/entity-types/entity-hash/factory.js
@@ -1,8 +1,8 @@
 'use strict'
 
 const _ = require('lodash')
-const createReducer = require('../../reducer').create
-const createReducerObject = require('../../reducer-object').create
+const createReducer = require('../../reducer-types').create
+const createReducerObject = require('../../reducer-types/reducer-object').create
 const deepFreeze = require('deep-freeze')
 const parseCompose = require('../parse-compose')
 const createBaseEntity = require('../base-entity').create
diff --git a/packages/data-point/lib/entity-types/entity-request/factory.js b/packages/data-point/lib/entity-types/entity-request/factory.js
index e281622..1d56842 100644
--- a/packages/data-point/lib/entity-types/entity-request/factory.js
+++ b/packages/data-point/lib/entity-types/entity-request/factory.js
@@ -3,7 +3,7 @@
 const _ = require('lodash')
 const fp = require('lodash/fp')
 const createBaseEntity = require('../base-entity').create
-const createReducer = require('../../reducer').create
+const createReducer = require('../../reducer-types').create
 const TransformKeys = require('./transform-keys')
 
 /**
diff --git a/packages/data-point/lib/helpers/helpers.js b/packages/data-point/lib/helpers/helpers.js
index e15200d..b6c74e2 100644
--- a/packages/data-point/lib/helpers/helpers.js
+++ b/packages/data-point/lib/helpers/helpers.js
@@ -2,16 +2,19 @@
 
 const _ = require('lodash')
 const Promise = require('bluebird')
-const resolveReducer = require('../reducer').resolve
+const resolveReducer = require('../reducer-types').resolve
 const AccumulatorFactory = require('../accumulator/factory')
 
-const ReducerEntity = require('../reducer-entity/factory').ReducerEntity
-const ReducerFunction = require('../reducer-function/factory').ReducerFunction
-const ReducerList = require('../reducer-list/factory').ReducerList
-const ReducerObject = require('../reducer-object/factory').ReducerObject
-const ReducerPath = require('../reducer-path/factory').ReducerPath
+const ReducerEntity = require('../reducer-types/reducer-entity/factory')
+  .ReducerEntity
+const ReducerFunction = require('../reducer-types/reducer-function/factory')
+  .ReducerFunction
+const ReducerList = require('../reducer-types/reducer-list/factory').ReducerList
+const ReducerObject = require('../reducer-types/reducer-object/factory')
+  .ReducerObject
+const ReducerPath = require('../reducer-types/reducer-path/factory').ReducerPath
 
-module.exports.createReducer = require('../reducer').create
+module.exports.createReducer = require('../reducer-types').create
 
 module.exports.createEntity = require('../entity-types/base-entity').create
 
diff --git a/packages/data-point/lib/reducer/__snapshots__/factory.test.js.snap b/packages/data-point/lib/reducer-types/__snapshots__/factory.test.js.snap
similarity index 100%
rename from packages/data-point/lib/reducer/__snapshots__/factory.test.js.snap
rename to packages/data-point/lib/reducer-types/__snapshots__/factory.test.js.snap
diff --git a/packages/data-point/lib/reducer/factory.js b/packages/data-point/lib/reducer-types/factory.js
similarity index 85%
rename from packages/data-point/lib/reducer/factory.js
rename to packages/data-point/lib/reducer-types/factory.js
index 06939c9..6a15dc3 100644
--- a/packages/data-point/lib/reducer/factory.js
+++ b/packages/data-point/lib/reducer-types/factory.js
@@ -1,14 +1,14 @@
 'use strict'
 
 const _ = require('lodash')
-
-const ReducerPath = require('../reducer-path')
-const ReducerFunction = require('../reducer-function')
-const ReducerObject = require('../reducer-object')
-const ReducerEntity = require('../reducer-entity')
-const ReducerList = require('../reducer-list')
 const util = require('util')
 
+const ReducerEntity = require('./reducer-entity')
+const ReducerFunction = require('./reducer-function')
+const ReducerList = require('./reducer-list')
+const ReducerObject = require('./reducer-object')
+const ReducerPath = require('./reducer-path')
+
 const reducerTypes = [ReducerPath, ReducerFunction, ReducerEntity]
 
 /**
diff --git a/packages/data-point/lib/reducer/index.js b/packages/data-point/lib/reducer-types/index.js
similarity index 100%
rename from packages/data-point/lib/reducer/index.js
rename to packages/data-point/lib/reducer-types/index.js
diff --git a/packages/data-point/lib/reducer-entity/factory.js b/packages/data-point/lib/reducer-types/reducer-entity/factory.js
similarity index 100%
rename from packages/data-point/lib/reducer-entity/factory.js
rename to packages/data-point/lib/reducer-types/reducer-entity/factory.js
diff --git a/packages/data-point/lib/reducer-entity/factory.test.js b/packages/data-point/lib/reducer-types/reducer-entity/factory.test.js
similarity index 100%
rename from packages/data-point/lib/reducer-entity/factory.test.js
rename to packages/data-point/lib/reducer-types/reducer-entity/factory.test.js
diff --git a/packages/data-point/lib/reducer-entity/index.js b/packages/data-point/lib/reducer-types/reducer-entity/index.js
similarity index 100%
rename from packages/data-point/lib/reducer-entity/index.js
rename to packages/data-point/lib/reducer-types/reducer-entity/index.js
diff --git a/packages/data-point/lib/reducer-entity/resolve.js b/packages/data-point/lib/reducer-types/reducer-entity/resolve.js
similarity index 90%
rename from packages/data-point/lib/reducer-entity/resolve.js
rename to packages/data-point/lib/reducer-types/reducer-entity/resolve.js
index dc9b246..2f1f84d 100644
--- a/packages/data-point/lib/reducer-entity/resolve.js
+++ b/packages/data-point/lib/reducer-types/reducer-entity/resolve.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const BaseEntity = require('../entity-types/base-entity/resolve')
+const BaseEntity = require('../../entity-types/base-entity/resolve')
 
 /**
  * Resolve an Entity Reducer, actual entity resolution is delegated
diff --git a/packages/data-point/lib/reducer-function/__snapshots__/factory.test.js.snap b/packages/data-point/lib/reducer-types/reducer-function/__snapshots__/factory.test.js.snap
similarity index 100%
rename from packages/data-point/lib/reducer-function/__snapshots__/factory.test.js.snap
rename to packages/data-point/lib/reducer-types/reducer-function/__snapshots__/factory.test.js.snap
diff --git a/packages/data-point/lib/reducer-function/factory.js b/packages/data-point/lib/reducer-types/reducer-function/factory.js
similarity index 100%
rename from packages/data-point/lib/reducer-function/factory.js
rename to packages/data-point/lib/reducer-types/reducer-function/factory.js
diff --git a/packages/data-point/lib/reducer-function/factory.test.js b/packages/data-point/lib/reducer-types/reducer-function/factory.test.js
similarity index 100%
rename from packages/data-point/lib/reducer-function/factory.test.js
rename to packages/data-point/lib/reducer-types/reducer-function/factory.test.js
diff --git a/packages/data-point/lib/reducer-function/index.js b/packages/data-point/lib/reducer-types/reducer-function/index.js
similarity index 100%
rename from packages/data-point/lib/reducer-function/index.js
rename to packages/data-point/lib/reducer-types/reducer-function/index.js
diff --git a/packages/data-point/lib/reducer-function/resolve.js b/packages/data-point/lib/reducer-types/reducer-function/resolve.js
similarity index 96%
rename from packages/data-point/lib/reducer-function/resolve.js
rename to packages/data-point/lib/reducer-types/reducer-function/resolve.js
index adf787f..2e2cbba 100644
--- a/packages/data-point/lib/reducer-function/resolve.js
+++ b/packages/data-point/lib/reducer-types/reducer-function/resolve.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Promise = require('bluebird')
-const utils = require('../utils')
+const utils = require('../../utils')
 
 /**
  * Resolve a ReducerFunction
diff --git a/packages/data-point/lib/reducer-object/index.js b/packages/data-point/lib/reducer-types/reducer-object/index.js
similarity index 100%
rename from packages/data-point/lib/reducer-object/index.js
rename to packages/data-point/lib/reducer-types/reducer-object/index.js
diff --git a/packages/data-point/lib/reducer-object/resolve.js b/packages/data-point/lib/reducer-types/reducer-object/resolve.js
similarity index 95%
rename from packages/data-point/lib/reducer-object/resolve.js
rename to packages/data-point/lib/reducer-types/reducer-object/resolve.js
index f8ab2d0..a9beaa3 100644
--- a/packages/data-point/lib/reducer-object/resolve.js
+++ b/packages/data-point/lib/reducer-types/reducer-object/resolve.js
@@ -1,6 +1,6 @@
 const Promise = require('bluebird')
 const set = require('lodash/set')
-const utils = require('../utils')
+const utils = require('../../utils')
 
 /**
  * @param {Object} manager
diff --git a/packages/data-point/lib/reducer-path/factory.js b/packages/data-point/lib/reducer-types/reducer-path/factory.js
similarity index 100%
rename from packages/data-point/lib/reducer-path/factory.js
rename to packages/data-point/lib/reducer-types/reducer-path/factory.js
diff --git a/packages/data-point/lib/reducer-path/factory.test.js b/packages/data-point/lib/reducer-types/reducer-path/factory.test.js
similarity index 100%
rename from packages/data-point/lib/reducer-path/factory.test.js
rename to packages/data-point/lib/reducer-types/reducer-path/factory.test.js
diff --git a/packages/data-point/lib/reducer-path/index.js b/packages/data-point/lib/reducer-types/reducer-path/index.js
similarity index 100%
rename from packages/data-point/lib/reducer-path/index.js
rename to packages/data-point/lib/reducer-types/reducer-path/index.js
diff --git a/packages/data-point/lib/reducer-path/resolve.js b/packages/data-point/lib/reducer-types/reducer-path/resolve.js
similarity index 90%
rename from packages/data-point/lib/reducer-path/resolve.js
rename to packages/data-point/lib/reducer-types/reducer-path/resolve.js
index fc956f2..8d7420c 100644
--- a/packages/data-point/lib/reducer-path/resolve.js
+++ b/packages/data-point/lib/reducer-types/reducer-path/resolve.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const utils = require('../utils')
+const utils = require('../../utils')
 
 /**
  * @param {Accumulator} accumulator - current accumulator
diff --git a/packages/data-point/lib/reducer/resolve.js b/packages/data-point/lib/reducer-types/resolve.js
similarity index 82%
rename from packages/data-point/lib/reducer/resolve.js
rename to packages/data-point/lib/reducer-types/resolve.js
index 51cd6d0..3a2679a 100644
--- a/packages/data-point/lib/reducer/resolve.js
+++ b/packages/data-point/lib/reducer-types/resolve.js
@@ -1,9 +1,10 @@
 const partial = require('lodash/partial')
-const resolveReducerPath = require('../reducer-path').resolve
-const resolveReducerFunction = require('../reducer-function').resolve
-const resolveReducerObject = require('../reducer-object').resolve
-const resolveReducerEntity = require('../reducer-entity').resolve
-const resolveReducerList = require('../reducer-list').resolve
+
+const resolveReducerEntity = require('./reducer-entity').resolve
+const resolveReducerFunction = require('./reducer-function').resolve
+const resolveReducerList = require('./reducer-list').resolve
+const resolveReducerObject = require('./reducer-object').resolve
+const resolveReducerPath = require('./reducer-path').resolve
 
 /**
  * @param {Object} manager


Test patch:
diff --git a/packages/data-point/lib/entity-types/base-entity/resolve.test.js b/packages/data-point/lib/entity-types/base-entity/resolve.test.js
index 713bf4c..3fd3161 100644
--- a/packages/data-point/lib/entity-types/base-entity/resolve.test.js
+++ b/packages/data-point/lib/entity-types/base-entity/resolve.test.js
@@ -2,9 +2,9 @@
 'use strict'
 
 const ResolveEntity = require('./resolve')
-const createReducerEntity = require('../../reducer-entity').create
-const createReducer = require('../../reducer').create
-const resolveReducer = require('../../reducer').resolve
+const createReducerEntity = require('../../reducer-types/reducer-entity').create
+const createReducer = require('../../reducer-types').create
+const resolveReducer = require('../../reducer-types').resolve
 
 const FixtureStore = require('../../../test/utils/fixture-store')
 const helpers = require('../../helpers')
diff --git a/packages/data-point/lib/entity-types/entity-request/resolve.test.js b/packages/data-point/lib/entity-types/entity-request/resolve.test.js
index 138c66a..7eaf8dd 100644
--- a/packages/data-point/lib/entity-types/entity-request/resolve.test.js
+++ b/packages/data-point/lib/entity-types/entity-request/resolve.test.js
@@ -6,7 +6,7 @@ const nock = require('nock')
 const Resolve = require('./resolve')
 
 const AccumulatorFactory = require('../../accumulator/factory')
-const ReducerFactory = require('../../reducer/factory')
+const ReducerFactory = require('../../reducer-types/factory')
 const LocalsFactory = require('../../locals/factory')
 
 const ResolveEntity = require('../base-entity/resolve')
diff --git a/packages/data-point/lib/helpers/helpers.test.js b/packages/data-point/lib/helpers/helpers.test.js
index f9f7056..49fed6f 100644
--- a/packages/data-point/lib/helpers/helpers.test.js
+++ b/packages/data-point/lib/helpers/helpers.test.js
@@ -4,11 +4,14 @@
 const _ = require('lodash')
 const helpers = require('./helpers')
 
-const ReducerEntity = require('../reducer-entity/factory').ReducerEntity
-const ReducerFunction = require('../reducer-function/factory').ReducerFunction
-const ReducerList = require('../reducer-list/factory').ReducerList
-const ReducerObject = require('../reducer-object/factory').ReducerObject
-const ReducerPath = require('../reducer-path/factory').ReducerPath
+const ReducerEntity = require('../reducer-types/reducer-entity/factory')
+  .ReducerEntity
+const ReducerFunction = require('../reducer-types/reducer-function/factory')
+  .ReducerFunction
+const ReducerList = require('../reducer-types/reducer-list/factory').ReducerList
+const ReducerObject = require('../reducer-types/reducer-object/factory')
+  .ReducerObject
+const ReducerPath = require('../reducer-types/reducer-path/factory').ReducerPath
 
 describe('helpers.reducify', () => {
   test('pass simple', done => {
diff --git a/packages/data-point/lib/reducer/factory.test.js b/packages/data-point/lib/reducer-types/factory.test.js
similarity index 85%
rename from packages/data-point/lib/reducer/factory.test.js
rename to packages/data-point/lib/reducer-types/factory.test.js
index bb428af..66e95ed 100644
--- a/packages/data-point/lib/reducer/factory.test.js
+++ b/packages/data-point/lib/reducer-types/factory.test.js
@@ -3,10 +3,10 @@
 
 const Factory = require('./factory')
 
-const ReducerPath = require('../reducer-path')
-const ReducerFunction = require('../reducer-function')
-const ReducerObject = require('../reducer-object')
-const ReducerEntity = require('../reducer-entity')
+const ReducerPath = require('./reducer-path')
+const ReducerFunction = require('./reducer-function')
+const ReducerObject = require('./reducer-object')
+const ReducerEntity = require('./reducer-entity')
 
 describe('reducer#create', () => {
   test('create path', () => {
diff --git a/packages/data-point/lib/reducer-function/resolve.test.js b/packages/data-point/lib/reducer-types/reducer-function/resolve.test.js
similarity index 93%
rename from packages/data-point/lib/reducer-function/resolve.test.js
rename to packages/data-point/lib/reducer-types/reducer-function/resolve.test.js
index 324193f..8d3e485 100644
--- a/packages/data-point/lib/reducer-function/resolve.test.js
+++ b/packages/data-point/lib/reducer-types/reducer-function/resolve.test.js
@@ -1,8 +1,8 @@
 /* eslint-env jest */
 'use strict'
 
-const AccumulatorFactory = require('../accumulator/factory')
-const reducerFactory = require('../reducer/factory')
+const AccumulatorFactory = require('../../accumulator/factory')
+const reducerFactory = require('../factory')
 const resolveFunction = require('./resolve')
 
 describe('resolve#filter.resolve', () => {
diff --git a/packages/data-point/lib/reducer-list/factory.js b/packages/data-point/lib/reducer-types/reducer-list/factory.js
similarity index 100%
rename from packages/data-point/lib/reducer-list/factory.js
rename to packages/data-point/lib/reducer-types/reducer-list/factory.js
diff --git a/packages/data-point/lib/reducer-list/factory.test.js b/packages/data-point/lib/reducer-types/reducer-list/factory.test.js
similarity index 98%
rename from packages/data-point/lib/reducer-list/factory.test.js
rename to packages/data-point/lib/reducer-types/reducer-list/factory.test.js
index 34ea863..4cc9b1e 100644
--- a/packages/data-point/lib/reducer-list/factory.test.js
+++ b/packages/data-point/lib/reducer-types/reducer-list/factory.test.js
@@ -3,7 +3,7 @@
 
 const _ = require('lodash')
 const factory = require('./factory')
-const createReducer = require('../reducer').create
+const createReducer = require('../index').create
 
 describe('factory#create', () => {
   test('factory#create default', () => {
diff --git a/packages/data-point/lib/reducer-list/index.js b/packages/data-point/lib/reducer-types/reducer-list/index.js
similarity index 100%
rename from packages/data-point/lib/reducer-list/index.js
rename to packages/data-point/lib/reducer-types/reducer-list/index.js
diff --git a/packages/data-point/lib/reducer-list/resolve.js b/packages/data-point/lib/reducer-types/reducer-list/resolve.js
similarity index 100%
rename from packages/data-point/lib/reducer-list/resolve.js
rename to packages/data-point/lib/reducer-types/reducer-list/resolve.js
diff --git a/packages/data-point/lib/reducer-list/resolve.test.js b/packages/data-point/lib/reducer-types/reducer-list/resolve.test.js
similarity index 92%
rename from packages/data-point/lib/reducer-list/resolve.test.js
rename to packages/data-point/lib/reducer-types/reducer-list/resolve.test.js
index acc38b5..75a0d2b 100644
--- a/packages/data-point/lib/reducer-list/resolve.test.js
+++ b/packages/data-point/lib/reducer-types/reducer-list/resolve.test.js
@@ -5,12 +5,12 @@ const nock = require('nock')
 
 const createReducerList = require('./index').create
 const resolveReducerList = require('./index').resolve
-const createReducer = require('../reducer').create
-const resolveReducer = require('../reducer').resolve
-const AccumulatorFactory = require('../accumulator/factory')
+const createReducer = require('../index').create
+const resolveReducer = require('../index').resolve
+const AccumulatorFactory = require('../../accumulator/factory')
 
-const fixtureStore = require('../../test/utils/fixture-store')
-const testData = require('../../test/data.json')
+const fixtureStore = require('../../../test/utils/fixture-store')
+const testData = require('../../../test/data.json')
 
 let manager
 
diff --git a/packages/data-point/lib/reducer-object/__snapshots__/factory.test.js.snap b/packages/data-point/lib/reducer-types/reducer-object/__snapshots__/factory.test.js.snap
similarity index 100%
rename from packages/data-point/lib/reducer-object/__snapshots__/factory.test.js.snap
rename to packages/data-point/lib/reducer-types/reducer-object/__snapshots__/factory.test.js.snap
diff --git a/packages/data-point/lib/reducer-object/factory.js b/packages/data-point/lib/reducer-types/reducer-object/factory.js
similarity index 100%
rename from packages/data-point/lib/reducer-object/factory.js
rename to packages/data-point/lib/reducer-types/reducer-object/factory.js
diff --git a/packages/data-point/lib/reducer-object/factory.test.js b/packages/data-point/lib/reducer-types/reducer-object/factory.test.js
similarity index 96%
rename from packages/data-point/lib/reducer-object/factory.test.js
rename to packages/data-point/lib/reducer-types/reducer-object/factory.test.js
index c699823..4fa709a 100644
--- a/packages/data-point/lib/reducer-object/factory.test.js
+++ b/packages/data-point/lib/reducer-types/reducer-object/factory.test.js
@@ -2,7 +2,7 @@
 'use strict'
 
 const factory = require('./factory')
-const createReducer = require('../reducer').create
+const createReducer = require('../index').create
 
 test('reducer/reducer-function#isObject', () => {
   expect(factory.isObject('$foo')).toBe(false)
diff --git a/packages/data-point/lib/reducer-object/resolve.test.js b/packages/data-point/lib/reducer-types/reducer-object/resolve.test.js
similarity index 92%
rename from packages/data-point/lib/reducer-object/resolve.test.js
rename to packages/data-point/lib/reducer-types/reducer-object/resolve.test.js
index e628f06..de08af2 100644
--- a/packages/data-point/lib/reducer-object/resolve.test.js
+++ b/packages/data-point/lib/reducer-types/reducer-object/resolve.test.js
@@ -3,10 +3,10 @@
 
 const createReducerObject = require('./index').create
 const resolveReducerObject = require('./index').resolve
-const createReducer = require('../reducer').create
-const resolveReducer = require('../reducer').resolve
-const AccumulatorFactory = require('../accumulator/factory')
-const FixtureStore = require('../../test/utils/fixture-store')
+const createReducer = require('../index').create
+const resolveReducer = require('../index').resolve
+const AccumulatorFactory = require('../../accumulator/factory')
+const FixtureStore = require('../../../test/utils/fixture-store')
 
 let dataPoint
 
diff --git a/packages/data-point/lib/reducer-path/resolve.test.js b/packages/data-point/lib/reducer-types/reducer-path/resolve.test.js
similarity index 93%
rename from packages/data-point/lib/reducer-path/resolve.test.js
rename to packages/data-point/lib/reducer-types/reducer-path/resolve.test.js
index b2748b8..c6f1f44 100644
--- a/packages/data-point/lib/reducer-path/resolve.test.js
+++ b/packages/data-point/lib/reducer-types/reducer-path/resolve.test.js
@@ -2,7 +2,7 @@
 'use strict'
 
 const reducerPath = require('./index')
-const AccumulatorFactory = require('../accumulator/factory')
+const AccumulatorFactory = require('../../accumulator/factory')
 
 describe('ReducerPath#resolve', () => {
   function resolve (value, reducerSource) {
diff --git a/packages/data-point/lib/reducer/resolve.test.js b/packages/data-point/lib/reducer-types/resolve.test.js
similarity index 96%
rename from packages/data-point/lib/reducer/resolve.test.js
rename to packages/data-point/lib/reducer-types/resolve.test.js
index ad58a76..6aafbc5 100644
--- a/packages/data-point/lib/reducer/resolve.test.js
+++ b/packages/data-point/lib/reducer-types/resolve.test.js
@@ -5,7 +5,7 @@ const Factory = require('./factory')
 const Resolve = require('./resolve')
 
 const reducers = require('../../test/utils/reducers')
-const resolveReducerList = require('../reducer-list').resolve
+const resolveReducerList = require('./reducer-list').resolve
 
 const fixtureStore = require('../../test/utils/fixture-store')
 const testData = require('../../test/data.json')
diff --git a/packages/data-point/lib/utils/utils.test.js b/packages/data-point/lib/utils/utils.test.js
index a10e049..1bde712 100644
--- a/packages/data-point/lib/utils/utils.test.js
+++ b/packages/data-point/lib/utils/utils.test.js
@@ -3,7 +3,7 @@
 
 const _ = require('lodash')
 const utils = require('./index')
-const createReducer = require('../reducer/factory').create
+const createReducer = require('../reducer-types/factory').create
 
 describe('utils.set', () => {
   const target = { b: 1 }
diff --git a/packages/data-point/test/utils/mocks.js b/packages/data-point/test/utils/mocks.js
index 53e079a..1fb1d7e 100644
--- a/packages/data-point/test/utils/mocks.js
+++ b/packages/data-point/test/utils/mocks.js
@@ -1,5 +1,5 @@
 // const AccumulatorFactory = require('../../lib/accumulator/factory')
-// const reducerFactory = require('../../lib/reducer/factory')
+// const reducerFactory = require('../../lib/reducer-types/factory')
 
 // const rs = require('./reducer-entity-request')
 // const resolveReducer = require('./reducer')