diff --git a/src/network.js b/src/shell/network.js
similarity index 100%
rename from src/network.js
rename to src/shell/network.js
diff --git a/src/shell/shell.js b/src/shell/shell.js
index 61dd3cc..4c66782 100644
--- a/src/shell/shell.js
+++ b/src/shell/shell.js
@@ -2,7 +2,7 @@ var Path = require('../path.js');
 var Errors = require('../errors.js');
 var Environment = require('./environment.js');
 var async = require('../../lib/async.js');
-var Network = require('../network.js');
+var Network = require('./network.js');
 var Zlib = require('../../lib/zip-utils.js');
 var TextEncoder = require('../../lib/encoding.js').TextEncoder;
 
diff --git a/tests/index.js b/tests/index.js
index c5890fa..5bf4b58 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -54,9 +54,7 @@ require("./spec/shell/env.spec");
 require("./spec/shell/mkdirp.spec");
 require("./spec/shell/wget.spec");
 require("./spec/shell/zip-unzip.spec");
-
-// Custom Filer library modules
-require("./spec/libs/network.spec");
+require("./spec/shell/network.spec");
 
 // Ported node.js tests (filenames match names in https://github.com/joyent/node/tree/master/test)
 require("./spec/node-js/simple/test-fs-mkdir");
diff --git a/tests/spec/libs/network.spec.js b/tests/spec/shell/network.spec.js
similarity index 96%
rename from tests/spec/libs/network.spec.js
rename to tests/spec/shell/network.spec.js
index 7f0dc35..b46b9dc 100644
--- a/tests/spec/libs/network.spec.js
+++ b/tests/spec/shell/network.spec.js
@@ -1,4 +1,4 @@
-var network = require('../../../src/network.js');
+var network = require('../../../src/shell/network.js');
 var expect = require('chai').expect;
 
 describe('Network module', function() {