     SCOPE.SAILS  = @_resolvePath 'sails'
     SCOPE.SAILOR = @_resolvePath 'sailor'
 
-    console.log SCOPE
-
     # search the depndencies in the SCOPE's or download
     @_copyDependencies(appJSON, args.cb)
 
 
 
   ###
-   * Generate a new module
+   * Generate a new module for a project
    * @param  {String} dir     Optional path
    * @param  {Object} options Optional options, like:
    *   - name
    *   - organization
    *   - repository
-   * @param  {Function} cb      Optional Callback
+   * @param  {Function} cb    Optional Callback
   ###
   @newModule: (dir, options, cb) =>
     args = Args([
-      {name         : Args.STRING   | Args.Optional, _default: OPTIONS.NAME}
-      {organization : Args.STRING   | Args.Optional, _default: OPTIONS.ORGANIZATION}
-      {repository   : Args.STRING   | Args.Optional, _default: name}
-      {dir          : Args.STRING   | Args.Optional, _default: "#{process.cwd()}"}
-      {done         : Args.FUNCTION | Args.Optional, _default: undefined}
-    ], arguments)
-
-    SCOPE.APP    = "#{args.dir}/#{args.name}"
+      {dir          : Args.STRING   | Args.Optional, _default: "#{process.cwd()}" }
+      {options      : Args.OBJECT   | Args.Optional, _default: OPTIONS            }
+      {cb           : Args.FUNCTION | Args.Optional, _default: undefined          }
+    ], arguments)
+
+    SCOPE.APP    = "#{args.dir}/#{args.options.name}"
     wrench.copyDirSyncRecursive TEMPLATE.MODULE, SCOPE.APP, forceDelete: true
 
-    options =
-      name         : args.name
-      organization : args.organization
-      repository   : args.repository
-
-    @_copyTemplate template, options for template in TEMPLATE.FILES
+    @_copyTemplate template, args.options for template in TEMPLATE.FILES
 
     appJSON  = require("#{SCOPE.APP}/package.json")
     delete appJSON.dependencies?.sailorjs

  APP    : null

OPTIONS =
  NAME         : 'testApp'
  ORGANIZATION : 'sailorjs'
  REPOSITORY   : 'testApp'

TEMPLATE =
  BASE  : path.join(__dirname, '../template/base')

   *   - name
   *   - organization
   *   - repository
   * @param  {Function} cb    Optional Callback
  ###
  @newBase: (dir, options, cb) =>
    args = Args([
