reorganized for building

build/wrap.end

@@ -1,5 +1,5 @@
 
-  var IDBFS = require( "src/fs" );
+  var IDBFS = require( "src/index" );
 
   return IDBFS;
 

dist/idbfs.js

@@ -4054,7 +4054,7 @@ define('src/adapters/adapters',['require','src/adapters/crypto','src/adapters/zl
   };
 });
 
-define('src/fs',['require','nodash','encoding','src/path','src/path','src/path','src/shared','src/shared','src/shared','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/providers/providers','src/adapters/adapters','src/path'],function(require) {
+define('src/fs',['require','nodash','encoding','src/path','src/path','src/path','src/shared','src/shared','src/shared','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/error','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/constants','src/providers/providers','src/adapters/adapters'],function(require) {
 
   var _ = require('nodash');
 
@@ -5952,14 +5952,21 @@ define('src/fs',['require','nodash','encoding','src/path','src/path','src/path',
     if(error) callback(error);
   };
 
-  return {
-    FileSystem: FileSystem,
-    Path: require('src/path')
-  };
+  return FileSystem;
 
 });
 
-  var IDBFS = require( "src/fs" );
+define('src/index',['require','src/fs','src/fs','src/path'],function(require) {
+
+  var fs = require('src/fs');
+
+  return {
+    FileSystem: require('src/fs'),
+    Path: require('src/path')
+  }
+
+});
+  var IDBFS = require( "src/index" );
 
   return IDBFS;
 

gruntfile.js

@@ -37,7 +37,7 @@ module.exports = function(grunt) {
           },
           baseUrl: "lib",
           name: "build/almond",
-          include: ["src/fs"],
+          include: ["src/index"],
           out: "dist/idbfs.js",
           optimize: "none",
           wrap: {

src/fs.js

@@ -1896,9 +1896,6 @@ define(function(require) {
     if(error) callback(error);
   };
 
-  return {
-    FileSystem: FileSystem,
-    Path: require('src/path')
-  };
+  return FileSystem;
 
 });

src/index.js

@@ -0,0 +1,10 @@
+define(function(require) {
+
+  var fs = require('src/fs');
+
+  return {
+    FileSystem: require('src/fs'),
+    Path: require('src/path')
+  }
+
+});

tests/require-config.js

@@ -8,7 +8,7 @@ require.config({
     "tests": "../tests",
     "src": "../src",
     "spec": "../tests/spec",
-    "IDBFS": "../src/fs"
+    "IDBFS": "../src/index"
   },
   baseUrl: "../lib",
   optimize: "none",