 titaniumArgs.push "--log-level", "debug" if options.verbose
 titaniumArgs.push options.extraArgs...
 
-unless options.install or options.android or not config.server?
-  require("./#{config.server}")
+unless options.install or options.android
+  require("./dev_server/server")
 
 waitingForTitanium = promisedSpawn titanium, titaniumArgs...
 waitingForTitanium.then (val) ->

      args = []
    else
      options.extraArgs.push arg

try
  config = require("./dev_config.json")
catch
  console.log "dev_config.json file missing. Please create one with --make-config."
  process.exit(128)

if options.clean
  promisedSpawn(titanium, "clean").then ->

      # console.log "  -a, --android      Build and install on an attached Android device"
      console.log "  -s, --sim simtype  One of: iphone, iphone4, iphone5 (default)"
      console.log "  --sdk version      Choose the SDK version (default: 7.0)"
      console.log "  --                 Stop reading arguments and pass everything else"
      console.log "                     directly to the titanium cli"
      process.exit 0
    when "-v", "--verbose"
      options.verbose = on
