diff --git a/.classpath b/.classpath
index 0914d5f..92cedde 100644
--- a/.classpath
+++ b/.classpath
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ceylon-common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/tautua/markdownpapers/core/1.3.4/org.tautua.markdownpapers.core-1.3.4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ceylon-module-resolver"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ceylon-model"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ceylon-cli"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ceylon-typechecker"/>
-	<classpathentry kind="lib" path="/ceylon/lib/antlr-complete-3.5.2.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.project b/.project
index 93bf9c1..39fbf4f 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ceylon-bootstrap</name>
+	<name>ceylon-cli</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/README.md b/README.md
index c418b75..7781721 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Ceylon bootstrap
-================
+Ceylon cli
+==========
 
 License
 -------
@@ -13,8 +13,8 @@ agree to license your contribution under the license mentioned above.
 Directory structure
 -------------------
 
-* `src`       - the Ceylon bootstrap module sources
-* `test-src`  - the Ceylon bootstrap module unit tests
+* `src`       - the Ceylon cli module sources
+* `test-src`  - the Ceylon cli module unit tests
 
 Build the module
 ----------------
@@ -32,5 +32,5 @@ And to run the tests type
 
 Once built, the module lives in this jar:
 
-    ~/.ceylon/repo/ceylon/bootstrap/0.2/ceylon.bootstrap-0.2.jar
+    ~/.ceylon/repo/org/eclipse/ceylon/cli/0.2/org.eclipse.ceylon.cli-0.2.jar
 
diff --git a/build.xml b/build.xml
index cf35914..e32b41c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<project name="Ceylon CLI tools module" default="publish" basedir=".">
+<project name="Ceylon CLI module" default="publish" basedir=".">
 
     <property file="../user-build.properties" />
     <property file="../common-build.properties" />
@@ -10,9 +10,9 @@
     <property name="test.reports" location="${build.dir}/test-reports" />
 
     <!-- Local repository -->
-    <property name="ceylon.bootstrap.src" value="${ceylon.bootstrap.dir}/ceylon.bootstrap-${module.ceylon.bootstrap.version}.src" />
-    <property name="ceylon.bootstrap.repo" value="${ceylon.repo.dir}/${ceylon.bootstrap.dir}" />
-    <property name="ceylon.bootstrap.dist" value="${build.dist}/${ceylon.bootstrap.dir}" />
+    <property name="ceylon.cli.src" value="${ceylon.cli.dir}/org.eclipse.ceylon.cli-${module.org.eclipse.ceylon.cli.version}.src" />
+    <property name="ceylon.cli.repo" value="${ceylon.repo.dir}/${ceylon.cli.dir}" />
+    <property name="ceylon.cli.dist" value="${build.dist}/${ceylon.cli.dir}" />
 
     <!-- Classpath for the build tools. -->
     <path id="classpath">
@@ -36,7 +36,7 @@
     </target>
 
     <!-- project compilation -->
-    <target name="compile" description="compile Ceylon CLI tools">
+    <target name="compile" description="compile Ceylon cli">
         <mkdir dir="${build.classes}" />
         <javac
             srcdir="${src}"
@@ -73,26 +73,34 @@
         </if>
     </target>
 
-    <target name="ceylon-bootstrap.jar" depends="compile">
-        <mkdir dir="${build.dist.repo}/${ceylon.bootstrap.dir}"/>
+    <target name="ceylon-cli.jar" depends="compile">
+        <mkdir dir="${build.dist.repo}/${ceylon.cli.dir}"/>
+        <mkdir dir="${build.bin}"/>
         <tstamp>
             <format property="qualifier" timezone="GMT" pattern="yyyyMMdd-HHmm"/>
         </tstamp>       
-        <jar destfile="${build.dist.repo}/${ceylon.bootstrap.jar}">
+        <jar destfile="${build.dist.repo}/${ceylon.cli.jar}">
             <fileset dir="${build.classes}">
             </fileset>
             <manifest>
-                <attribute name="Main-Class" value="org.eclipse.ceylon.launcher.Bootstrap"/>
-                <attribute name="Bundle-SymbolicName" value="ceylon.bootstrap"/>
-                <attribute name="Bundle-Version" value="${module.ceylon.bootstrap.osgi.version}-${qualifier}"/>
+                <attribute name="Bundle-SymbolicName" value="org.eclipse.ceylon.cli"/>
+                <attribute name="Bundle-Version" value="${module.org.eclipse.ceylon.cli.osgi.version}-${qualifier}"/>
             </manifest>
         </jar>
         <antcall target="sha1sum">
-            <param name="file" value="${build.dist.repo}/${ceylon.bootstrap.jar}" />
+            <param name="file" value="${build.dist.repo}/${ceylon.cli.jar}" />
         </antcall>
     </target>
 
-    <target name="build" depends="ceylon-bootstrap.jar">
+    <target name="build" depends="ceylon-cli.jar">
+        <mkdir dir="${build.bin}" />
+        <copy todir="${build.bin}">
+            <fileset dir="${basedir}/bin">
+            </fileset>
+            <filterset>
+                <filter token="ceylon-version" value="${ceylon.version}"/>
+            </filterset>
+        </copy>
     </target>
 
     <!-- constant to declare a file binary for checksumsum -->
@@ -109,15 +117,15 @@
     </target>
 
     <!-- Repository targets -->
-    <target name="init.repo" description="Init local ceylon repository and add ceylon.bootstrap">
-        <mkdir dir="${ceylon.bootstrap.repo}" />
+    <target name="init.repo" description="Init local ceylon repository and add ceylon.cli">
+        <mkdir dir="${ceylon.cli.repo}" />
     </target>
 
     <target name="clean.repo" description="Clean local ceylon repository">
-        <delete file="${ceylon.bootstrap.lib}" />
-        <delete file="${ceylon.bootstrap.lib}.sha1" />
-        <delete file="${ceylon.repo.dir}/${ceylon.bootstrap.src}" />
-        <delete file="${ceylon.repo.dir}/${ceylon.bootstrap.src}.sha1" />
+        <delete file="${ceylon.cli.lib}" />
+        <delete file="${ceylon.cli.lib}.sha1" />
+        <delete file="${ceylon.repo.dir}/${ceylon.cli.src}" />
+        <delete file="${ceylon.repo.dir}/${ceylon.cli.src}.sha1" />
     </target>
 
     <target name="bundle-proxy">
@@ -183,18 +191,18 @@
     
     <target name="ide-quick-internal">
         <antcall target="bundle-proxy">
-            <param name="archivePath" value="${ceylon.bootstrap.lib}"/>
+            <param name="archivePath" value="${ceylon.cli.lib}"/>
         </antcall>
     </target>
 
     <target name="dist" depends="build">
-        <zip destfile="${build.dist.repo}/${ceylon.bootstrap.src}">
+        <zip destfile="${build.dist.repo}/${ceylon.cli.src}">
             <fileset dir="${src}">
                 <include name="**/*.java"/>
             </fileset>
         </zip>
         <antcall target="sha1sum">
-            <param name="file" value="${build.dist.repo}/${ceylon.bootstrap.src}"/>
+            <param name="file" value="${build.dist.repo}/${ceylon.cli.src}"/>
         </antcall>
     </target>
 
@@ -207,10 +215,12 @@
         <copy todir="${ceylon.repo.dir}" overwrite="true">
             <fileset dir="${build.dist.repo}" />
         </copy>
+        <copy todir="${ceylon.bin.dir}" overwrite="true">
+            <fileset dir="${build.bin}" />
+        </copy>
     </target>
 
     <target name="compile.tests">
-        <!-- No tests for now
         <mkdir dir="${build.classes}" />
         <javac
             srcdir="${test.src}"
@@ -228,7 +238,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-        -->
     </target>
 
     <target name="test"
@@ -237,6 +246,24 @@
 
     <target name="test-quick" depends="compile.tests">
         <mkdir dir="${test.reports}" />
-        <echo>No tests (yet)</echo>
+        <junit printsummary="yes" haltonfailure="no" failureproperty="test.failed" dir="${basedir}">
+            <classpath refid="test.run.classpath" />
+            <syspropertyset>
+                <propertyref prefix="ceylon.tests." />
+            </syspropertyset>
+
+            <formatter type="xml" />
+            <test
+                name="org.eclipse.ceylon.common.tool.AllCliTests"
+                fork="yes"
+                todir="${test.reports}" />
+        </junit>
+        <junitreport todir="${test.reports}">
+            <fileset dir="${test.reports}">
+                <include name="TEST-*.xml" />
+            </fileset>
+            <report format="frames" todir="${test.reports}" />
+        </junitreport>
+        <fail message="Test failure detected, check test results." if="test.failed" />
     </target>
 </project>
diff --git a/cli.gradle b/cli.gradle
new file mode 100644
index 0000000..cff2c3d
--- /dev/null
+++ b/cli.gradle
@@ -0,0 +1,47 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+ext {
+    ceylonModuleName = 'cli'
+}
+
+apply from : "${rootProject.projectDir}/gradle/java-for-modules.gradle"
+
+dependencies {
+    compile project(':common')
+    compile project(':model')
+    compile project(':cmr')
+}
+
+task startScripts( type : Copy ) {
+    group 'Application'
+    description 'Creates OS specific scripts to run Ceylon from the command-line'
+
+    from 'bin'
+    into "${buildDir}/bin"
+    filter ReplaceTokens, tokens : [ 'ceylon-version' : version ]
+}
+
+task publishScripts( type : Copy ) {
+    group 'Distribution'
+    description 'Copies scripts to distribution area'
+    into repoBinDir
+    from startScripts, {
+        exclude 'ceylon'
+    }
+    from startScripts, {
+        include 'ceylon'
+        fileMode 0755
+    }
+}
+
+assemble {
+    dependsOn startScripts
+}
+
+publishInternal {
+    dependsOn publishScripts
+}
+
+['common','cmr','model'].each {
+    publishInternal.dependsOn ":${it}:publishInternal"
+}