diff --git a/bin/svgo b/bin/svgo
index c46d5f4f..2fd77c02 100755
--- a/bin/svgo
+++ b/bin/svgo
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('../lib/coa').run();
\ No newline at end of file
+require('../lib/svgo/coa').run();
diff --git a/lib/svgo.js b/lib/svgo.js
index 450a096b..3a84c13c 100644
--- a/lib/svgo.js
+++ b/lib/svgo.js
@@ -11,10 +11,10 @@
  */
 
 var INHERIT = require('inherit'),
-    CONFIG = require('./config'),
-    SVG2JS = require('./svg2js'),
-    PLUGINS = require('./plugins'),
-    JS2SVG = require('./js2svg');
+    CONFIG = require('./svgo/config'),
+    SVG2JS = require('./svgo/svg2js'),
+    PLUGINS = require('./svgo/plugins'),
+    JS2SVG = require('./svgo/js2svg');
 
 /**
  * @class SVGO.
diff --git a/lib/coa.js b/lib/svgo/coa.js
similarity index 99%
rename from lib/coa.js
rename to lib/svgo/coa.js
index 8fca0571..58ae41a2 100644
--- a/lib/coa.js
+++ b/lib/svgo/coa.js
@@ -1,8 +1,8 @@
 var Q = require('q'),
     FS = require('fs'),
     UTIL = require('util'),
-    SVGO = require('./svgo'),
-    info = JSON.parse(require('fs').readFileSync(__dirname + '/../package.json')),
+    SVGO = require('../svgo'),
+    info = JSON.parse(require('fs').readFileSync(__dirname + '/../../package.json')),
     datauriPrefix = 'data:image/svg+xml;base64,';
 
 /**
diff --git a/lib/config.js b/lib/svgo/config.js
similarity index 96%
rename from lib/config.js
rename to lib/svgo/config.js
index 79b88cfc..11408a9a 100644
--- a/lib/config.js
+++ b/lib/svgo/config.js
@@ -37,7 +37,7 @@ module.exports = function(params) {
  */
 function _getConfig(params) {
 
-    var defaultConfigPath = PATH.resolve(__dirname, '../config.yml');
+    var defaultConfigPath = PATH.resolve(__dirname, '../../config.yml');
 
     // if there are no any params then return default config
     if (!params) return readConfig(defaultConfigPath);
@@ -129,7 +129,7 @@ function readConfig(path) {
 function preparePluginsArray(plugins) {
 
     return plugins.map(function(plugin) {
-        plugin.fn = require('../plugins/' + plugin.name)[plugin.name];
+        plugin.fn = require('../../plugins/' + plugin.name)[plugin.name];
 
         return [plugin];
     });
diff --git a/lib/js2svg.js b/lib/svgo/js2svg.js
similarity index 100%
rename from lib/js2svg.js
rename to lib/svgo/js2svg.js
diff --git a/lib/jsAPI.js b/lib/svgo/jsAPI.js
similarity index 100%
rename from lib/jsAPI.js
rename to lib/svgo/jsAPI.js
diff --git a/lib/phantom.js b/lib/svgo/phantom.js
similarity index 100%
rename from lib/phantom.js
rename to lib/svgo/phantom.js
diff --git a/lib/phantom_test.js b/lib/svgo/phantom_test.js
similarity index 100%
rename from lib/phantom_test.js
rename to lib/svgo/phantom_test.js
diff --git a/lib/plugins.js b/lib/svgo/plugins.js
similarity index 100%
rename from lib/plugins.js
rename to lib/svgo/plugins.js
diff --git a/lib/svg2js.js b/lib/svgo/svg2js.js
similarity index 100%
rename from lib/svg2js.js
rename to lib/svgo/svg2js.js
diff --git a/lib/tools.js b/lib/svgo/tools.js
similarity index 100%
rename from lib/tools.js
rename to lib/svgo/tools.js
diff --git a/plugins/collapseGroups.js b/plugins/collapseGroups.js
index f3455726..407cb78c 100644
--- a/plugins/collapseGroups.js
+++ b/plugins/collapseGroups.js
@@ -1,4 +1,4 @@
-var flattenOneLevel = require('../lib/tools').flattenOneLevel;
+var flattenOneLevel = require('../lib/svgo/tools').flattenOneLevel;
 
 /*
  * Collapse useless groups.
diff --git a/plugins/convertPathData.js b/plugins/convertPathData.js
index 3c3fb4ad..b2a8700f 100644
--- a/plugins/convertPathData.js
+++ b/plugins/convertPathData.js
@@ -1,4 +1,4 @@
-var cleanupOutData = require('../lib/tools').cleanupOutData,
+var cleanupOutData = require('../lib/svgo/tools').cleanupOutData,
     regPathInstructions = /([MmLlHhVvCcSsQqTtAaZz])\s*/,
     regPathData = /(?=-)|[\s,]+/,
     pathElems = ['path', 'glyph', 'missing-glyph'];
diff --git a/plugins/convertStyleToAttrs.js b/plugins/convertStyleToAttrs.js
index e3c7e6b9..d7186588 100644
--- a/plugins/convertStyleToAttrs.js
+++ b/plugins/convertStyleToAttrs.js
@@ -1,4 +1,4 @@
-var extend = require('../lib/tools').extend,
+var extend = require('../lib/svgo/tools').extend,
     stylingProps = require('./_collections').stylingProps,
     regCleanupStyle = /(:|;)\s+/g;
 
diff --git a/plugins/convertTransform.js b/plugins/convertTransform.js
index 38ce464f..c864cc0c 100644
--- a/plugins/convertTransform.js
+++ b/plugins/convertTransform.js
@@ -1,4 +1,4 @@
-var cleanupOutData = require('../lib/tools').cleanupOutData,
+var cleanupOutData = require('../lib/svgo/tools').cleanupOutData,
     regTransformTypes = /matrix|translate|scale|rotate|skewX|skewY/,
     regTransformSplit = /(matrix|translate|scale|rotate|skewX|skewY)\s*\((.+?)\)[\s,]*/,
     regTransformDataSplit = /[\s,]+/;
diff --git a/plugins/moveElemsAttrsToGroup.js b/plugins/moveElemsAttrsToGroup.js
index 932efe3a..5eef08ac 100644
--- a/plugins/moveElemsAttrsToGroup.js
+++ b/plugins/moveElemsAttrsToGroup.js
@@ -1,4 +1,4 @@
-var intersectAttrs = require('../lib/tools').intersectAttrs;
+var intersectAttrs = require('../lib/svgo/tools').intersectAttrs;
 
 /**
  * Collapse content's intersected attributes to the existing group wrapper.
diff --git a/test/config/_index.js b/test/config/_index.js
index ef35aa84..a93b5a7c 100644
--- a/test/config/_index.js
+++ b/test/config/_index.js
@@ -1,5 +1,5 @@
 var cover = process.argv[3] === 'mocha-istanbul',
-    config = require(cover ? '../../lib-cov/config' : '../../lib/config');
+    config = require(cover ? '../../lib-cov/svgo/config' : '../../lib/svgo/config');
 
 function getPlugin(name, config) {
 
diff --git a/test/svg2js/_index.js b/test/svg2js/_index.js
index d0892f39..0154ac2e 100644
--- a/test/svg2js/_index.js
+++ b/test/svg2js/_index.js
@@ -1,5 +1,5 @@
 var cover = process.argv[3] === 'mocha-istanbul',
-    svg2js = require(cover ? '../../lib-cov/svg2js' : '../../lib/svg2js');
+    svg2js = require(cover ? '../../lib-cov/svgo/svg2js' : '../../lib/svgo/svg2js');
 
 describe('svg2js', function() {