diff --git a/vinyl-fs/vinyl-fs.d.ts b/vinyl-fs/vinyl-fs.d.ts
index 9b03a1ddb7..29094f68db 100644
--- a/vinyl-fs/vinyl-fs.d.ts
+++ b/vinyl-fs/vinyl-fs.d.ts
@@ -4,164 +4,162 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../glob-stream/glob-stream.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts" />
 
-declare namespace NodeJS {
-   interface WritableStream {
-      write(buffer: any/* Vinyl.File */, cb?: Function): boolean;
+declare global {
+   namespace NodeJS {
+      interface WritableStream {
+         write(buffer: any/* Vinyl.File */, cb?: Function): boolean;
+      }
    }
 }
 
-declare module "vinyl-fs" {
-   import _events = require("events");
-   import File = require("vinyl");
-   import globStream = require("glob-stream");
+import _events = require("events");
+import File = require("../vinyl");
+import globStream = require("../glob-stream");
 
-   interface ISrcOptions extends globStream.Options {
-      /** Specifies the working directory the folder is relative to */
-      cwd?: string;
-
-      /**
-      * Specifies the folder relative to the cwd
-      * This is used to determine the file names when saving in .dest()
-      * Default is where the glob begins
-      */
-      base?: string;
-
-      /**
-      * Setting this to false will make file.contents a paused stream
-      * If true it will buffer the file contents
-      * Defaults to true
-      */
-      buffer?: boolean;
-
-      /**
-      * Setting this to false will ignore the contents of the file and disable writing to disk to speed up operations
-      * Defaults to true
-      */
-      read?: boolean;
-
-      /**  Only find files that have been modified since the time specified */
-      since?: Date|number;
-
-      /** Setting this to true will create a duplex stream, one that passes through items and emits globbed files.
-      * Defaults to false */
-      passthrough?: boolean;
-
-      /** Setting this to true will enable sourcemaps.
-      * Defaults to false */
-      sourcemaps?: boolean;
-   }
+interface ISrcOptions extends globStream.Options {
+   /** Specifies the working directory the folder is relative to */
+   cwd?: string;
 
    /**
-   * Gets files that match the glob and converts them into the vinyl format
-   * @param globs Takes a glob string or an array of glob strings as the first argument
-   * Globs are executed in order, so negations should follow positive globs
-   * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
-   * @param opt Options Vinyl source options, changes the way the files are read, found, or stored in the vinyl stream
+   * Specifies the folder relative to the cwd
+   * This is used to determine the file names when saving in .dest()
+   * Default is where the glob begins
    */
-   function src(globs: string|string[], opt?: ISrcOptions): NodeJS.ReadWriteStream;
+   base?: string;
 
    /**
-   * This is just a glob-watcher
-   *
-   * @param globs Takes a glob string or an array of glob strings as the first argument
-   * Globs are executed in order, so negations should follow positive globs
-   * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+   * Setting this to false will make file.contents a paused stream
+   * If true it will buffer the file contents
+   * Defaults to true
    */
-   function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+   buffer?: boolean;
 
    /**
-   * This is just a glob-watcher
-   *
-   * @param globs Takes a glob string or an array of glob strings as the first argument
-   * Globs are executed in order, so negations should follow positive globs
-   * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+   * Setting this to false will ignore the contents of the file and disable writing to disk to speed up operations
+   * Defaults to true
    */
-   function watch(globs: string|string[], opt?: { interval?: number; debounceDelay?: number; cwd?: string; maxListeners?: Function; }, cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+   read?: boolean;
+
+   /**  Only find files that have been modified since the time specified */
+   since?: Date|number;
+
+   /** Setting this to true will create a duplex stream, one that passes through items and emits globbed files.
+   * Defaults to false */
+   passthrough?: boolean;
+
+   /** Setting this to true will enable sourcemaps.
+   * Defaults to false */
+   sourcemaps?: boolean;
+}
+
+/**
+* Gets files that match the glob and converts them into the vinyl format
+* @param globs Takes a glob string or an array of glob strings as the first argument
+* Globs are executed in order, so negations should follow positive globs
+* fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+* @param opt Options Vinyl source options, changes the way the files are read, found, or stored in the vinyl stream
+*/
+declare function src(globs: string|string[], opt?: ISrcOptions): NodeJS.ReadWriteStream;
+
+/**
+* This is just a glob-watcher
+*
+* @param globs Takes a glob string or an array of glob strings as the first argument
+* Globs are executed in order, so negations should follow positive globs
+* fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+*/
+declare function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+* This is just a glob-watcher
+*
+* @param globs Takes a glob string or an array of glob strings as the first argument
+* Globs are executed in order, so negations should follow positive globs
+* fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+*/
+declare function watch(globs: string|string[], opt?: { interval?: number; debounceDelay?: number; cwd?: string; maxListeners?: Function; }, cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+* On write the stream will save the vinyl File to disk at the folder/cwd specified.
+* After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+* stat.mode will be overwritten if you used a mode parameter
+* contents will have it's position reset to the beginning if it is a stream
+* @param folder destination folder
+*/
+declare function dest(folder: string, opt?: {
+   /** Specify the working directory the folder is relative to
+   * Default is process.cwd()
+   */
+   cwd?: string;
+
+   /** Specify the mode the files should be created with
+   * Default is the mode of the input file (file.stat.mode)
+   * or the process mode if the input file has no mode property
+   */
+   mode?: number|string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   dirMode?: number|string;
+
+   /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
+   overwrite?: boolean;
+}): NodeJS.ReadWriteStream;
+
+/**
+* On write the stream will save the vinyl File to disk at the folder/cwd specified.
+* After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+* stat.mode will be overwritten if you used a mode parameter
+* contents will have it's position reset to the beginning if it is a stream
+* @param getFolderPath function that takes in a file and returns a folder path
+*/
+declare function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStream;
+
+/**
+* On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd specified.
+* After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+*/
+declare function symlink(folder: string, opts?: {
+   /**
+   * Specify the working directory the folder is relative to
+   * Default is process.cwd()
+   */
+   cwd?: string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   mode?: number|string;
 
    /**
-   * On write the stream will save the vinyl File to disk at the folder/cwd specified.
-   * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   * stat.mode will be overwritten if you used a mode parameter
-   * contents will have it's position reset to the beginning if it is a stream
-   * @param folder destination folder
+   * Specify the mode the directory should be created with
+   * Default is the process mode
    */
-   function dest(folder: string, opt?: {
-      /** Specify the working directory the folder is relative to
-      * Default is process.cwd()
-      */
-      cwd?: string;
+   dirMode?: number
+}): NodeJS.ReadWriteStream;
 
-      /** Specify the mode the files should be created with
-      * Default is the mode of the input file (file.stat.mode)
-      * or the process mode if the input file has no mode property
-      */
-      mode?: number|string;
-
-      /** Specify the mode the directory should be created with. Default is the process mode */
-      dirMode?: number|string;
-
-      /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
-      overwrite?: boolean;
-   }): NodeJS.ReadWriteStream;
-
-   /**
-   * On write the stream will save the vinyl File to disk at the folder/cwd specified.
-   * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   * stat.mode will be overwritten if you used a mode parameter
-   * contents will have it's position reset to the beginning if it is a stream
-   * @param getFolderPath function that takes in a file and returns a folder path
-   */
-   function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStream;
-
-   /**
-   * On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd specified.
-   * After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   */
-   function symlink(folder: string, opts?: {
+/**
+* On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd generated from getFolderPath.
+* After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+*/
+declare function symlink(getFolderPath: (File: File) => string, opts?:
+   {
       /**
       * Specify the working directory the folder is relative to
       * Default is process.cwd()
       */
       cwd?: string;
 
-      /** Specify the mode the directory should be created with. Default is the process mode */
-      mode?: number|string;
-
       /**
       * Specify the mode the directory should be created with
       * Default is the process mode
       */
       dirMode?: number
+
    }): NodeJS.ReadWriteStream;
-
-   /**
-   * On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd generated from getFolderPath.
-   * After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   */
-   function symlink(getFolderPath: (File: File) => string, opts?:
-      {
-         /**
-         * Specify the working directory the folder is relative to
-         * Default is process.cwd()
-         */
-         cwd?: string;
-
-         /**
-         * Specify the mode the directory should be created with
-         * Default is the process mode
-         */
-         dirMode?: number
-
-      }): NodeJS.ReadWriteStream;
-}
diff --git a/vinyl/vinyl.d.ts b/vinyl/index.d.ts
similarity index 100%
rename from vinyl/vinyl.d.ts
rename to vinyl/index.d.ts
diff --git a/vinyl/vinyl-tests.ts b/vinyl/vinyl-tests.ts
index 1d39646b11..4039af1939 100644
--- a/vinyl/vinyl-tests.ts
+++ b/vinyl/vinyl-tests.ts
@@ -1,9 +1,7 @@
 /// <reference path="../mocha/mocha.d.ts" />
 /// <reference path="../should/should.d.ts" />
 
-/// <reference path="./vinyl.d.ts" />
-
-import File = require('vinyl');
+import File = require('../vinyl');
 import Stream = require('stream');
 import fs = require('fs');