diff --git a/project/build.scala b/project/build.scala
index a5928233..7becf968 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -37,7 +37,7 @@ object BuildSettings extends Build {
       a.split(" ")
     },
     unmanagedSourceDirectories in Compile ++= addons.value.map(baseDirectory.value / _ / "src/main/scala"),
-    mainClass in (Compile, run) := Some("rocketchip.TestGenerator"),
+    mainClass in (Compile, run) := Some("rocketchip.RocketChipGenerator"),
     make := {
       val jobs = java.lang.Runtime.getRuntime.availableProcessors
       val (makeDir, target) = setMake.parsed
diff --git a/src/main/scala/Generator.scala b/src/main/scala/Generator.scala
index 68ae5486..15356680 100644
--- a/src/main/scala/Generator.scala
+++ b/src/main/scala/Generator.scala
@@ -4,58 +4,85 @@ package rocketchip
 
 import Chisel._
 import scala.collection.mutable.{LinkedHashSet,LinkedHashMap}
-import cde.{Parameters, ParameterDump, Config, Field, CDEMatchError}
+import cde.{Parameters, ParameterDump, Config, Field, CDEMatchError, World}
 import coreplex._
 
-object TestGenerator extends App {
+object GeneratorUtils {
+  def getConfig(projectName: String, configClassName: String): Config = {
+    val aggregateConfigs = configClassName.split('_')
+
+    aggregateConfigs.foldRight(new Config()) { case (currentConfigName, finalConfig) =>
+      val currentConfig = try {
+        Class.forName(s"$projectName.$currentConfigName").newInstance.asInstanceOf[Config]
+      } catch {
+        case e: java.lang.ClassNotFoundException =>
+          throwException("Unable to find part \"" + currentConfigName +
+            "\" of configClassName \"" + configClassName +
+            "\", did you misspell it?", e)
+      }
+      currentConfig ++ finalConfig
+    }
+  }
+
+  def getParameters(config: Config): Parameters =
+    Parameters.root(config.toInstance)
+
+  def getParameters(projectName: String, configClassName: String): Parameters =
+    getParameters(getConfig(projectName, configClassName))
+
+  def elaborate(fullName: String, args: Array[String], params: Parameters) {
+    val gen = () =>
+      Class.forName(fullName)
+        .getConstructor(classOf[cde.Parameters])
+        .newInstance(params)
+        .asInstanceOf[Module]
+
+    chiselMain.run(args, gen)
+  }
+
+  def dumpParameters(fname: String) {
+    val pdFile = TestGeneration.createOutputFile(fname)
+    pdFile.write(ParameterDump.getDump)
+    pdFile.close
+  }
+
+  def dumpKnobs(configClassName: String, world: World) {
+    val knbFile = TestGeneration.createOutputFile(configClassName + ".knb")
+    knbFile.write(world.getKnobs)
+    knbFile.close
+
+    val cstFile = TestGeneration.createOutputFile(configClassName + ".cst")
+    cstFile.write(world.getConstraints)
+    cstFile.close
+  }
+
+  def dumpConfigString(fname: String, params: Parameters) {
+    val cfgFile = new java.io.FileOutputStream(Driver.targetDir + "/" + fname)
+    cfgFile.write(params(ConfigString))
+    cfgFile.close
+  }
+}
+import GeneratorUtils._
+
+object RocketChipGenerator extends App {
   val projectName = args(0)
   val topModuleName = args(1)
   val configClassName = args(2)
 
-  val aggregateConfigs = configClassName.split('_')
+  val config = getConfig(projectName, configClassName)
+  val world = config.toInstance
+  val paramsFromConfig = Parameters.root(world)
 
-  val finalConfig = aggregateConfigs.foldRight(new Config()) { case (currentConfigName, finalConfig) =>
-    val currentConfig = try {
-      Class.forName(s"$projectName.$currentConfigName").newInstance.asInstanceOf[Config]
-    } catch {
-      case e: java.lang.ClassNotFoundException =>
-        throwException("Unable to find part \"" + currentConfigName +
-          "\" of configClassName \"" + configClassName +
-          "\", did you misspell it?", e)
-    }
-    currentConfig ++ finalConfig
-  }
-  val world = finalConfig.toInstance
-
-  val paramsFromConfig: Parameters = Parameters.root(world)
-
-  val gen = () => 
-    Class.forName(s"$projectName.$topModuleName")
-      .getConstructor(classOf[cde.Parameters])
-      .newInstance(paramsFromConfig)
-      .asInstanceOf[Module]
-
-  chiselMain.run(args.drop(3), gen)
-  //Driver.elaborate(gen, configName = configClassName)
+  elaborate(s"$projectName.$topModuleName", args.drop(3), paramsFromConfig)
 
   TestGeneration.addSuite(new RegressionTestSuite(paramsFromConfig(RegressionTestNames)))
-
   TestGeneration.generateMakefrag(topModuleName, configClassName)
   TestBenchGeneration.generateVerilogFragment(
     topModuleName, configClassName, paramsFromConfig)
   TestBenchGeneration.generateCPPFragment(
     topModuleName, configClassName, paramsFromConfig)
 
-  val pdFile = TestGeneration.createOutputFile(s"$topModuleName.$configClassName.prm")
-  pdFile.write(ParameterDump.getDump)
-  pdFile.close
-  val v = TestGeneration.createOutputFile(configClassName + ".knb")
-  v.write(world.getKnobs)
-  v.close
-  val d = new java.io.FileOutputStream(Driver.targetDir + "/" + configClassName + ".cfg")
-  d.write(paramsFromConfig(ConfigString))
-  d.close
-  val w = TestGeneration.createOutputFile(configClassName + ".cst")
-  w.write(world.getConstraints)
-  w.close
+  dumpParameters(s"$topModuleName.$configClassName.prm")
+  dumpKnobs(configClassName, world)
+  dumpConfigString(s"$configClassName.cfg", paramsFromConfig)
 }