25 files changed, 48 insertions, 38 deletions
diff --git a/node_modules/core-js/fn/object/assign.js b/node_modules/core-js/fn/object/assign.js
index a57c54aa5..97df6bf45 100644
--- a/node_modules/core-js/fn/object/assign.js
+++ b/node_modules/core-js/fn/object/assign.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.assign');
-module.exports = require('../../modules/$.core').Object.assign;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.assign;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/classof.js b/node_modules/core-js/fn/object/classof.js
index 3afc82686..993d04808 100644
--- a/node_modules/core-js/fn/object/classof.js
+++ b/node_modules/core-js/fn/object/classof.js
@@ -1,2 +1,2 @@
 require('../../modules/core.object.classof');
-module.exports = require('../../modules/$.core').Object.classof;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.classof;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/create.js b/node_modules/core-js/fn/object/create.js
index 8f5f3263b..a05ca2fb0 100644
--- a/node_modules/core-js/fn/object/create.js
+++ b/node_modules/core-js/fn/object/create.js
@@ -1,4 +1,5 @@
-var $ = require('../../modules/$');
+require('../../modules/es6.object.create');
+var $Object = require('../../modules/_core').Object;
 module.exports = function create(P, D){
-  return $.create(P, D);
+  return $Object.create(P, D);
 };
 \ No newline at end of file
diff --git a/node_modules/core-js/fn/object/define-properties.js b/node_modules/core-js/fn/object/define-properties.js
index a857aab81..04160fb3a 100644
--- a/node_modules/core-js/fn/object/define-properties.js
+++ b/node_modules/core-js/fn/object/define-properties.js
@@ -1,4 +1,5 @@
-var $ = require('../../modules/$');
+require('../../modules/es6.object.define-properties');
+var $Object = require('../../modules/_core').Object;
 module.exports = function defineProperties(T, D){
-  return $.setDescs(T, D);
+  return $Object.defineProperties(T, D);
 };
 \ No newline at end of file
diff --git a/node_modules/core-js/fn/object/define-property.js b/node_modules/core-js/fn/object/define-property.js
index 7384315d5..078c56cbf 100644
--- a/node_modules/core-js/fn/object/define-property.js
+++ b/node_modules/core-js/fn/object/define-property.js
@@ -1,4 +1,5 @@
-var $ = require('../../modules/$');
+require('../../modules/es6.object.define-property');
+var $Object = require('../../modules/_core').Object;
 module.exports = function defineProperty(it, key, desc){
-  return $.setDesc(it, key, desc);
+  return $Object.defineProperty(it, key, desc);
 };
 \ No newline at end of file
diff --git a/node_modules/core-js/fn/object/define.js b/node_modules/core-js/fn/object/define.js
index 690773e2e..6ec19e904 100644
--- a/node_modules/core-js/fn/object/define.js
+++ b/node_modules/core-js/fn/object/define.js
@@ -1,2 +1,2 @@
 require('../../modules/core.object.define');
-module.exports = require('../../modules/$.core').Object.define;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.define;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/entries.js b/node_modules/core-js/fn/object/entries.js
index a32fe3911..fca1000e8 100644
--- a/node_modules/core-js/fn/object/entries.js
+++ b/node_modules/core-js/fn/object/entries.js
@@ -1,2 +1,2 @@
 require('../../modules/es7.object.entries');
-module.exports = require('../../modules/$.core').Object.entries;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.entries;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/freeze.js b/node_modules/core-js/fn/object/freeze.js
index 566eec51d..04eac5302 100644
--- a/node_modules/core-js/fn/object/freeze.js
+++ b/node_modules/core-js/fn/object/freeze.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.freeze');
-module.exports = require('../../modules/$.core').Object.freeze;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.freeze;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/get-own-property-descriptor.js b/node_modules/core-js/fn/object/get-own-property-descriptor.js
index 2e1845cfc..7d3f03b8b 100644
--- a/node_modules/core-js/fn/object/get-own-property-descriptor.js
+++ b/node_modules/core-js/fn/object/get-own-property-descriptor.js
@@ -1,5 +1,5 @@
-var $ = require('../../modules/$');
 require('../../modules/es6.object.get-own-property-descriptor');
+var $Object = require('../../modules/_core').Object;
 module.exports = function getOwnPropertyDescriptor(it, key){
-  return $.getDesc(it, key);
+  return $Object.getOwnPropertyDescriptor(it, key);
 };
 \ No newline at end of file
diff --git a/node_modules/core-js/fn/object/get-own-property-descriptors.js b/node_modules/core-js/fn/object/get-own-property-descriptors.js
index f26341d57..dfeb547ce 100644
--- a/node_modules/core-js/fn/object/get-own-property-descriptors.js
+++ b/node_modules/core-js/fn/object/get-own-property-descriptors.js
@@ -1,2 +1,2 @@
 require('../../modules/es7.object.get-own-property-descriptors');
-module.exports = require('../../modules/$.core').Object.getOwnPropertyDescriptors;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.getOwnPropertyDescriptors;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/get-own-property-names.js b/node_modules/core-js/fn/object/get-own-property-names.js
index 496eb1970..c91ce430f 100644
--- a/node_modules/core-js/fn/object/get-own-property-names.js
+++ b/node_modules/core-js/fn/object/get-own-property-names.js
@@ -1,5 +1,5 @@
-var $ = require('../../modules/$');
 require('../../modules/es6.object.get-own-property-names');
+var $Object = require('../../modules/_core').Object;
 module.exports = function getOwnPropertyNames(it){
-  return $.getNames(it);
+  return $Object.getOwnPropertyNames(it);
 };
 \ No newline at end of file
diff --git a/node_modules/core-js/fn/object/get-own-property-symbols.js b/node_modules/core-js/fn/object/get-own-property-symbols.js
index f78921b51..c3f528807 100644
--- a/node_modules/core-js/fn/object/get-own-property-symbols.js
+++ b/node_modules/core-js/fn/object/get-own-property-symbols.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.symbol');
-module.exports = require('../../modules/$.core').Object.getOwnPropertySymbols;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.getOwnPropertySymbols;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/get-prototype-of.js b/node_modules/core-js/fn/object/get-prototype-of.js
index 9a495afe7..bda934458 100644
--- a/node_modules/core-js/fn/object/get-prototype-of.js
+++ b/node_modules/core-js/fn/object/get-prototype-of.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.get-prototype-of');
-module.exports = require('../../modules/$.core').Object.getPrototypeOf;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.getPrototypeOf;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/index.js b/node_modules/core-js/fn/object/index.js
index 0fb75bc5e..4bd9825b4 100644
--- a/node_modules/core-js/fn/object/index.js
+++ b/node_modules/core-js/fn/object/index.js
@@ -1,23 +1,30 @@
 require('../../modules/es6.symbol');
-require('../../modules/es6.object.assign');
-require('../../modules/es6.object.is');
-require('../../modules/es6.object.set-prototype-of');
-require('../../modules/es6.object.to-string');
+require('../../modules/es6.object.create');
+require('../../modules/es6.object.define-property');
+require('../../modules/es6.object.define-properties');
+require('../../modules/es6.object.get-own-property-descriptor');
+require('../../modules/es6.object.get-prototype-of');
+require('../../modules/es6.object.keys');
+require('../../modules/es6.object.get-own-property-names');
 require('../../modules/es6.object.freeze');
 require('../../modules/es6.object.seal');
 require('../../modules/es6.object.prevent-extensions');
 require('../../modules/es6.object.is-frozen');
 require('../../modules/es6.object.is-sealed');
 require('../../modules/es6.object.is-extensible');
-require('../../modules/es6.object.get-own-property-descriptor');
-require('../../modules/es6.object.get-prototype-of');
-require('../../modules/es6.object.keys');
-require('../../modules/es6.object.get-own-property-names');
+require('../../modules/es6.object.assign');
+require('../../modules/es6.object.is');
+require('../../modules/es6.object.set-prototype-of');
+require('../../modules/es6.object.to-string');
 require('../../modules/es7.object.get-own-property-descriptors');
 require('../../modules/es7.object.values');
 require('../../modules/es7.object.entries');
+require('../../modules/es7.object.define-getter');
+require('../../modules/es7.object.define-setter');
+require('../../modules/es7.object.lookup-getter');
+require('../../modules/es7.object.lookup-setter');
 require('../../modules/core.object.is-object');
 require('../../modules/core.object.classof');
 require('../../modules/core.object.define');
 require('../../modules/core.object.make');
-module.exports = require('../../modules/$.core').Object;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/is-extensible.js b/node_modules/core-js/fn/object/is-extensible.js
index 8bb0cf9f7..43fb0e78a 100644
--- a/node_modules/core-js/fn/object/is-extensible.js
+++ b/node_modules/core-js/fn/object/is-extensible.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.is-extensible');
-module.exports = require('../../modules/$.core').Object.isExtensible;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.isExtensible;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/is-frozen.js b/node_modules/core-js/fn/object/is-frozen.js
index 7bf1f1270..cbff22421 100644
--- a/node_modules/core-js/fn/object/is-frozen.js
+++ b/node_modules/core-js/fn/object/is-frozen.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.is-frozen');
-module.exports = require('../../modules/$.core').Object.isFrozen;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.isFrozen;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/is-object.js b/node_modules/core-js/fn/object/is-object.js
index 935cb6ece..38feeff5c 100644
--- a/node_modules/core-js/fn/object/is-object.js
+++ b/node_modules/core-js/fn/object/is-object.js
@@ -1,2 +1,2 @@
 require('../../modules/core.object.is-object');
-module.exports = require('../../modules/$.core').Object.isObject;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.isObject;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/is-sealed.js b/node_modules/core-js/fn/object/is-sealed.js
index 05416f377..169a8ae73 100644
--- a/node_modules/core-js/fn/object/is-sealed.js
+++ b/node_modules/core-js/fn/object/is-sealed.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.is-sealed');
-module.exports = require('../../modules/$.core').Object.isSealed;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.isSealed;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/is.js b/node_modules/core-js/fn/object/is.js
index d07c3ae18..6ac9f19e1 100644
--- a/node_modules/core-js/fn/object/is.js
+++ b/node_modules/core-js/fn/object/is.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.is');
-module.exports = require('../../modules/$.core').Object.is;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.is;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/keys.js b/node_modules/core-js/fn/object/keys.js
index ebfb8c655..8eeb78eb8 100644
--- a/node_modules/core-js/fn/object/keys.js
+++ b/node_modules/core-js/fn/object/keys.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.keys');
-module.exports = require('../../modules/$.core').Object.keys;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.keys;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/make.js b/node_modules/core-js/fn/object/make.js
index fbfb2f858..f4d19d128 100644
--- a/node_modules/core-js/fn/object/make.js
+++ b/node_modules/core-js/fn/object/make.js
@@ -1,2 +1,2 @@
 require('../../modules/core.object.make');
-module.exports = require('../../modules/$.core').Object.make;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.make;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/prevent-extensions.js b/node_modules/core-js/fn/object/prevent-extensions.js
index 01d82fcbd..e43be05b1 100644
--- a/node_modules/core-js/fn/object/prevent-extensions.js
+++ b/node_modules/core-js/fn/object/prevent-extensions.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.prevent-extensions');
-module.exports = require('../../modules/$.core').Object.preventExtensions;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.preventExtensions;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/seal.js b/node_modules/core-js/fn/object/seal.js
index fdf84b821..8a56cd7f3 100644
--- a/node_modules/core-js/fn/object/seal.js
+++ b/node_modules/core-js/fn/object/seal.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.seal');
-module.exports = require('../../modules/$.core').Object.seal;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.seal;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/set-prototype-of.js b/node_modules/core-js/fn/object/set-prototype-of.js
index cd94d875b..c25170dbc 100644
--- a/node_modules/core-js/fn/object/set-prototype-of.js
+++ b/node_modules/core-js/fn/object/set-prototype-of.js
@@ -1,2 +1,2 @@
 require('../../modules/es6.object.set-prototype-of');
-module.exports = require('../../modules/$.core').Object.setPrototypeOf;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.setPrototypeOf;
+\ No newline at end of file
diff --git a/node_modules/core-js/fn/object/values.js b/node_modules/core-js/fn/object/values.js
index b96071ff3..b50336cf1 100644
--- a/node_modules/core-js/fn/object/values.js
+++ b/node_modules/core-js/fn/object/values.js
@@ -1,2 +1,2 @@
 require('../../modules/es7.object.values');
-module.exports = require('../../modules/$.core').Object.values;
-\ No newline at end of file
+module.exports = require('../../modules/_core').Object.values;
+\ No newline at end of file