diff --git a/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/src/main/kotlin/com/beust/kobalt/BuildScript.kt
index 8e744ab3..88690a16 100644
--- a/src/main/kotlin/com/beust/kobalt/BuildScript.kt
+++ b/src/main/kotlin/com/beust/kobalt/BuildScript.kt
@@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive
 import com.beust.kobalt.maven.DepFactory
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KobaltExecutors
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import java.io.File
 
 @Directive
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt b/src/main/kotlin/com/beust/kobalt/JavaInfo.kt
similarity index 94%
rename from src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt
rename to src/main/kotlin/com/beust/kobalt/JavaInfo.kt
index 8c4dbb89..4221110a 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt
+++ b/src/main/kotlin/com/beust/kobalt/JavaInfo.kt
@@ -1,4 +1,6 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
+
+import com.beust.kobalt.OperatingSystem
 
 import java.io.File
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt b/src/main/kotlin/com/beust/kobalt/Jvm.kt
similarity index 97%
rename from src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt
rename to src/main/kotlin/com/beust/kobalt/Jvm.kt
index df94a5d0..1bc16a41 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt
+++ b/src/main/kotlin/com/beust/kobalt/Jvm.kt
@@ -1,13 +1,14 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
 
 import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.maven.KobaltException
+import com.beust.kobalt.OperatingSystem
 import java.io.File
 import java.io.IOException
 import java.util.HashMap
 
 public open class Jvm constructor(
-        val os: com.beust.kobalt.plugin.java.OperatingSystem,
+        val os: com.beust.kobalt.OperatingSystem,
         var javaBase: File? = null) : JavaInfo(), KobaltLogger {
 
     private var _javaHome: File? = null
diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index 6aa1e5d3..f6ba6707 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -8,7 +8,7 @@ import com.beust.kobalt.kotlin.BuildFile
 import com.beust.kobalt.kotlin.ScriptCompiler
 import com.beust.kobalt.maven.*
 import com.beust.kobalt.misc.*
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import com.beust.kobalt.plugin.publish.JCenterApi
 import com.beust.kobalt.plugin.publish.UnauthenticatedJCenterApi
 import com.beust.kobalt.wrapper.Wrapper
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt b/src/main/kotlin/com/beust/kobalt/OperatingSystem.kt
similarity index 99%
rename from src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt
rename to src/main/kotlin/com/beust/kobalt/OperatingSystem.kt
index 94228a07..d7647ba6 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt
+++ b/src/main/kotlin/com/beust/kobalt/OperatingSystem.kt
@@ -1,4 +1,4 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
 
 import java.io.File
 import java.util.*
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt b/src/main/kotlin/com/beust/kobalt/SystemProperties.kt
similarity index 93%
rename from src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt
rename to src/main/kotlin/com/beust/kobalt/SystemProperties.kt
index 549463f1..eb223589 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt
+++ b/src/main/kotlin/com/beust/kobalt/SystemProperties.kt
@@ -1,4 +1,4 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
 
 import java.util.concurrent.locks.ReentrantLock
 import javax.inject.Inject
diff --git a/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
index e753b389..badef0e8 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
@@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 
 abstract class GenericTestRunner(open val project: Project, open val classpath: List<IClasspathDependency>)
diff --git a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
index b357cffc..7f6dccd2 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
@@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 
 public class JUnitRunner(override val project: Project, override val classpath: List<IClasspathDependency>)
diff --git a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt
index 1dff75f4..42c038f9 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt
@@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.util.*
 
diff --git a/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt b/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
index 06f80177..e91048e6 100644
--- a/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
+++ b/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
@@ -3,7 +3,7 @@ package com.beust.kobalt.maven
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.misc.Versions
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.util.Collections
 import javax.inject.Inject
diff --git a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
index a6be2dbe..2d90cec9 100644
--- a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
@@ -2,7 +2,7 @@ package com.beust.kobalt.maven
 
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import com.google.common.base.Preconditions
 import com.google.inject.assistedinject.Assisted
 import org.apache.maven.model.Developer
diff --git a/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt b/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
index 56508247..839e4a40 100644
--- a/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
+++ b/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
@@ -4,7 +4,7 @@ import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.homeDir
 import com.beust.kobalt.kotlin.BuildFile
 import com.beust.kobalt.maven.KobaltException
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
index eba9a749..39ed8033 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
@@ -11,6 +11,9 @@ import com.beust.kobalt.maven.*
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.KobaltLogger
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.Jvm
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt b/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
index 5d0f2c8c..b1e5d14f 100644
--- a/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
+++ b/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
@@ -4,8 +4,8 @@ import com.beust.kobalt.maven.Http
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.misc.benchmark
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.io.FileReader
 import java.io.IOException