14 files changed, 24 insertions, 27 deletions
diff --git a/dokka.iml b/dokka.iml
index 6db7ee33..5bd910bb 100644
--- a/dokka.iml
+++ b/dokka.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.jetbrains.dokka" />
-      <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" packagePrefix="com.jetbrains.dokka.tests" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.dokka" />
+      <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" packagePrefix="org.jetbrains.dokka.tests" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/src/AnalysesEnvironment.kt b/src/Analysis/AnalysisEnvironment.kt
index 7cd95feb..346367ee 100644
--- a/src/AnalysesEnvironment.kt
+++ b/src/Analysis/AnalysisEnvironment.kt
@@ -1,18 +1,17 @@
 package org.jetbrains.dokka
 
-import com.intellij.openapi.*
 import org.jetbrains.jet.cli.common.messages.*
-import org.jetbrains.jet.cli.common.*
+import com.intellij.openapi.*
 import org.jetbrains.jet.cli.jvm.compiler.*
-import java.io.*
-import org.jetbrains.jet.cli.jvm.*
-import org.jetbrains.jet.config.*
-import com.intellij.openapi.util.*
 import org.jetbrains.jet.lang.resolve.*
 import org.jetbrains.jet.lang.psi.*
-import kotlin.platform.*
+import java.io.File
+import org.jetbrains.jet.config.*
+import org.jetbrains.jet.cli.common.*
+import org.jetbrains.jet.cli.jvm.*
+import com.intellij.openapi.util.*
 
-public class AnalysesEnvironment(val messageCollector: MessageCollector, body: AnalysesEnvironment.() -> Unit = {}) : Disposable {
+public class AnalysisEnvironment(val messageCollector: MessageCollector, body: AnalysisEnvironment.() -> Unit = {}) : Disposable {
     val configuration = CompilerConfiguration();
 
     {
diff --git a/src/CommentsAPI.kt b/src/Analysis/CommentsAPI.kt
index 2e574d23..a32ee734 100644
--- a/src/CommentsAPI.kt
+++ b/src/Analysis/CommentsAPI.kt
@@ -3,7 +3,7 @@ package org.jetbrains.dokka
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.*
 import org.jetbrains.jet.kdoc.psi.api.*
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.jet.lang.psi.*
 
 fun BindingContext.getDocumentation(descriptor: DeclarationDescriptor): KDoc? {
     val psiElement = DescriptorToSourceUtils.descriptorToDeclaration(descriptor)
diff --git a/src/CompilerAPI.kt b/src/Analysis/CompilerAPI.kt
index f3c801a7..bf77a7d4 100644
--- a/src/CompilerAPI.kt
+++ b/src/Analysis/CompilerAPI.kt
@@ -26,7 +26,7 @@ private fun getAnnotationsPath(paths: KotlinPaths, arguments: K2JVMCompilerArgum
     return annotationsPath
 }
 
-private fun JetCoreEnvironment.analyze(messageCollector: MessageCollector): BindingContext {
+fun JetCoreEnvironment.analyze(messageCollector: MessageCollector): BindingContext {
     val project = getProject()
     val sourceFiles = getSourceFiles()
 
diff --git a/src/PsiAPI.kt b/src/Analysis/PsiAPI.kt
index dc59b0f1..2282cd1d 100644
--- a/src/PsiAPI.kt
+++ b/src/Analysis/PsiAPI.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka
 
-import com.intellij.psi.PsiElement
-import kotlin.support.AbstractIterator
+import com.intellij.psi.*
+import kotlin.support.*
 
 fun PsiElement.previousSiblings(): Stream<PsiElement> {
     var element: PsiElement? = this
diff --git a/src/DocumentationBuilder.kt b/src/Documentation/DocumentationBuilder.kt
index 77f74eb2..77f74eb2 100644
--- a/src/DocumentationBuilder.kt
+++ b/src/Documentation/DocumentationBuilder.kt
diff --git a/src/DocumentationBuildingVisitor.kt b/src/Documentation/DocumentationBuildingVisitor.kt
index e7b3fc09..e7b3fc09 100644
--- a/src/DocumentationBuildingVisitor.kt
+++ b/src/Documentation/DocumentationBuildingVisitor.kt
diff --git a/src/DocumentationModel.kt b/src/Documentation/DocumentationModel.kt
index 0113eb18..0113eb18 100644
--- a/src/DocumentationModel.kt
+++ b/src/Documentation/DocumentationModel.kt
diff --git a/src/main.kt b/src/main.kt
index 67f37197..e385da3f 100644
--- a/src/main.kt
+++ b/src/main.kt
@@ -13,11 +13,11 @@ public fun main(args: Array<String>) {
     val compilerArguments = K2JVMCompilerArguments()
     val sources: List<String> = Args.parse(compilerArguments, args) ?: listOf()
 
-    val environment = AnalysesEnvironment(MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR) {
-/*
-        addClasspath(PathUtil.getJdkClassesRoots())
-        addClasspath(PathUtil.getKotlinPathsForCompiler().getRuntimePath())
-*/
+    val environment = AnalysisEnvironment(MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR) {
+        /*
+                addClasspath(PathUtil.getJdkClassesRoots())
+                addClasspath(PathUtil.getKotlinPathsForCompiler().getRuntimePath())
+        */
         addSources(sources)
     }
 
diff --git a/test/src/ClassTest.kt b/test/src/ClassTest.kt
index ae9de5a2..708a1798 100644
--- a/test/src/ClassTest.kt
+++ b/test/src/ClassTest.kt
@@ -2,7 +2,7 @@ package org.jetbrains.dokka.tests
 
 import org.junit.Test
 import kotlin.test.*
-import com.jetbrains.dokka.*
+import org.jetbrains.dokka.*
 
 public class ClassTest {
     Test fun emptyClass() {
diff --git a/test/src/FunctionTest.kt b/test/src/FunctionTest.kt
index 3eeb4174..90b937de 100644
--- a/test/src/FunctionTest.kt
+++ b/test/src/FunctionTest.kt
@@ -2,8 +2,7 @@ package org.jetbrains.dokka.tests
 
 import org.junit.Test
 import kotlin.test.*
-import com.jetbrains.dokka.*
-
+import org.jetbrains.dokka.*
 
 public class FunctionTest {
     Test fun function() {
diff --git a/test/src/PackageTest.kt b/test/src/PackageTest.kt
index 01e42949..7b376012 100644
--- a/test/src/PackageTest.kt
+++ b/test/src/PackageTest.kt
@@ -2,7 +2,7 @@ package org.jetbrains.dokka.tests
 
 import org.junit.Test
 import kotlin.test.*
-import com.jetbrains.dokka.*
+import org.jetbrains.dokka.*
 
 public class PackageTest {
     Test fun rootPackage() {
diff --git a/test/src/PropertyTest.kt b/test/src/PropertyTest.kt
index 6fa17168..1d30f2ce 100644
--- a/test/src/PropertyTest.kt
+++ b/test/src/PropertyTest.kt
@@ -2,8 +2,7 @@ package org.jetbrains.dokka.tests
 
 import org.junit.Test
 import kotlin.test.*
-import com.jetbrains.dokka.*
-
+import org.jetbrains.dokka.*
 
 public class PropertyTest {
     Test fun valueProperty() {
diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt
index d5466b88..65254bca 100644
--- a/test/src/TestAPI.kt
+++ b/test/src/TestAPI.kt
@@ -2,8 +2,8 @@ package org.jetbrains.dokka.tests
 
 import org.jetbrains.jet.cli.common.messages.*
 import com.intellij.openapi.util.*
-import com.jetbrains.dokka.*
 import kotlin.test.fail
+import org.jetbrains.dokka.*
 
 public fun verifyModel(vararg files: String, verifier: (DocumentationModel) -> Unit) {
     val messageCollector = object : MessageCollector {
@@ -23,7 +23,7 @@ public fun verifyModel(vararg files: String, verifier: (DocumentationModel) -> U
         }
     }
 
-    val environment = AnalysesEnvironment(messageCollector) {
+    val environment = AnalysisEnvironment(messageCollector) {
         addSources(files.toList())
     }