diff --git a/core/modules/utils.argparser.js b/core/modules/utils/argparser.js
similarity index 100%
rename from core/modules/utils.argparser.js
rename to core/modules/utils/argparser.js
diff --git a/core/modules/utils.dom.js b/core/modules/utils/dom/dom.js
similarity index 100%
rename from core/modules/utils.dom.js
rename to core/modules/utils/dom/dom.js
diff --git a/core/modules/scroller.js b/core/modules/utils/dom/scroller.js
similarity index 100%
rename from core/modules/scroller.js
rename to core/modules/utils/dom/scroller.js
diff --git a/core/modules/popup.js b/core/modules/utils/popup.js
similarity index 100%
rename from core/modules/popup.js
rename to core/modules/utils/popup.js
diff --git a/core/modules/utils.js b/core/modules/utils/utils.js
similarity index 100%
rename from core/modules/utils.js
rename to core/modules/utils/utils.js