diff --git a/build.gradle b/build.gradle
index aadc307eef..6958e7cbf1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ allprojects {
 
     // Our version: bump this on release.
     group 'com.r3corda'
-    version '0.2-SNAPSHOT'
+    version '0.3-SNAPSHOT'
 }
 
 repositories {
@@ -192,7 +192,7 @@ applicationDistribution.into("bin") {
 }
 
 task createCapsule(type:FatCapsule, dependsOn: 'quasarScan') {
-    applicationClass 'com.r3corda.standalone.MainKt'
+    applicationClass 'com.r3corda.node.MainKt'
 
     capsuleManifest {
         appClassPath = ["jolokia-agent-war-${project.ext.jolokia_version}.war"]
diff --git a/src/main/kotlin/com/r3corda/standalone/Main.kt b/node/src/main/kotlin/com/r3corda/node/Main.kt
similarity index 96%
rename from src/main/kotlin/com/r3corda/standalone/Main.kt
rename to node/src/main/kotlin/com/r3corda/node/Main.kt
index c8380ad036..63209e5211 100644
--- a/src/main/kotlin/com/r3corda/standalone/Main.kt
+++ b/node/src/main/kotlin/com/r3corda/node/Main.kt
@@ -1,4 +1,4 @@
-package com.r3corda.standalone
+package com.r3corda.node
 
 import com.r3corda.node.services.config.FullNodeConfiguration
 import com.typesafe.config.ConfigFactory
@@ -68,6 +68,7 @@ fun main(args: Array<String>) {
         val node = conf.createNode()
         node.start()
         try {
+            // TODO create a proper daemon and/or provide some console handler to give interactive commands
             while (true) Thread.sleep(Long.MAX_VALUE)
         } catch(e: InterruptedException) {
             node.stop()