diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt
index d7a9afe2..7653c7f0 100644
--- a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt
@@ -12,11 +12,11 @@ import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.internal.build.BuildFile
 import com.beust.kobalt.app.ParsedBuildFile
 import com.beust.kobalt.internal.build.VersionFile
-import com.beust.kobalt.kotlin.kotlinCompilePrivate
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.log
+import com.beust.kobalt.plugin.kotlin.kotlinCompilePrivate
 import com.google.inject.assistedinject.Assisted
 import java.io.File
 import java.net.URL
diff --git a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
index 0f32797b..2623db8f 100644
--- a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
@@ -5,11 +5,11 @@ import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.build.BuildFile
 import com.beust.kobalt.internal.build.VersionFile
-import com.beust.kobalt.kotlin.kotlinCompilePrivate
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.countChar
 import com.beust.kobalt.misc.log
+import com.beust.kobalt.plugin.kotlin.kotlinCompilePrivate
 import java.io.File
 import java.net.URL
 import java.nio.charset.Charset
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaBuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt
similarity index 84%
rename from src/main/kotlin/com/beust/kobalt/plugin/java/JavaBuildGenerator.kt
rename to src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt
index 604c03c5..66f6ee82 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaBuildGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt
@@ -1,6 +1,7 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt.app.java
 
 import com.beust.kobalt.app.BuildGenerator
+import com.beust.kobalt.plugin.java.JavaProjectInfo
 import com.google.inject.Inject
 
 public class JavaBuildGenerator @Inject constructor (val projectInfo: JavaProjectInfo) : BuildGenerator() {
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinBuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt
similarity index 84%
rename from src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinBuildGenerator.kt
rename to src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt
index 8983a8b2..5002a704 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinBuildGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt
@@ -1,6 +1,7 @@
-package com.beust.kobalt.plugin.kotlin
+package com.beust.kobalt.app.kotlin
 
 import com.beust.kobalt.app.BuildGenerator
+import com.beust.kobalt.plugin.kotlin.KotlinProjectInfo
 import com.google.inject.Inject
 
 public class KotlinBuildGenerator @Inject constructor (val projectInfo: KotlinProjectInfo) : BuildGenerator() {
diff --git a/src/main/kotlin/com/beust/kobalt/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
similarity index 99%
rename from src/main/kotlin/com/beust/kobalt/kotlin/KotlinCompiler.kt
rename to src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
index 3cc13a3a..467d8cb5 100644
--- a/src/main/kotlin/com/beust/kobalt/kotlin/KotlinCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
@@ -1,10 +1,10 @@
-package com.beust.kobalt.kotlin
+package com.beust.kobalt.plugin.kotlin
 
 import com.beust.kobalt.TaskResult
 import com.beust.kobalt.api.*
-import com.beust.kobalt.kotlin.ParentLastClassLoader
 import com.beust.kobalt.internal.ICompilerAction
 import com.beust.kobalt.internal.JvmCompiler
+import com.beust.kobalt.kotlin.ParentLastClassLoader
 import com.beust.kobalt.maven.DepFactory
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.LocalRepo
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
index 93a51d3a..ac017f72 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
@@ -6,8 +6,6 @@ import com.beust.kobalt.api.annotation.Directive
 import com.beust.kobalt.api.annotation.Task
 import com.beust.kobalt.internal.JvmCompiler
 import com.beust.kobalt.internal.JvmCompilerPlugin
-import com.beust.kobalt.kotlin.KotlinCompiler
-import com.beust.kobalt.kotlin.kotlinCompilePrivate
 import com.beust.kobalt.maven.DepFactory
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.LocalRepo
diff --git a/src/main/resources/META-INF/kobalt-plugin.xml b/src/main/resources/META-INF/kobalt-plugin.xml
index d1e464ef..ca48fd11 100644
--- a/src/main/resources/META-INF/kobalt-plugin.xml
+++ b/src/main/resources/META-INF/kobalt-plugin.xml
@@ -14,8 +14,8 @@
         <class-name>com.beust.kobalt.plugin.apt.AptPlugin</class-name>
 
         <!-- These classes manage -init for Java and Kotlin -->
-        <class-name>com.beust.kobalt.plugin.java.JavaBuildGenerator</class-name>
-        <class-name>com.beust.kobalt.plugin.kotlin.KotlinBuildGenerator</class-name>
+        <class-name>com.beust.kobalt.app.java.JavaBuildGenerator</class-name>
+        <class-name>com.beust.kobalt.app.kotlin.KotlinBuildGenerator</class-name>
 
         <!-- These classes run TestNG or JUnit depending on which one the user picked -->
         <class-name>com.beust.kobalt.internal.JUnitRunner</class-name>