Cleaning package naming

30 files changed, 46 insertions, 51 deletions

diff --git a/core/src/main/kotlin/DokkaBootstrapImpl.kt b/core/src/main/kotlin/DokkaBootstrapImpl.kt
index 2e52d9c6..d11f1623 100644
--- a/core/src/main/kotlin/DokkaBootstrapImpl.kt
+++ b/core/src/main/kotlin/DokkaBootstrapImpl.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka
 
 import com.google.gson.Gson
 import org.jetbrains.dokka.DokkaConfiguration.PackageOptions
+import org.jetbrains.dokka.utilities.DokkaLogger
 
 import java.util.function.BiConsumer
 
diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt
index 2efcca5a..8661ec45 100644
--- a/core/src/main/kotlin/DokkaGenerator.kt
+++ b/core/src/main/kotlin/DokkaGenerator.kt
@@ -1,10 +1,13 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.dokka.Model.Module
+import org.jetbrains.dokka.analysis.AnalysisEnvironment
+import org.jetbrains.dokka.analysis.DokkaResolutionFacade
+import org.jetbrains.dokka.model.Module
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.single
 import org.jetbrains.dokka.renderers.FileWriter
+import org.jetbrains.dokka.utilities.DokkaLogger
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/analysis/AnalysisEnvironment.kt
index c816106e..30a51136 100644
--- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
+++ b/core/src/main/kotlin/analysis/AnalysisEnvironment.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.analysis
 
 import com.google.common.collect.ImmutableMap
 import com.intellij.core.CoreApplicationEnvironment
@@ -17,8 +17,7 @@ import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.io.URLUtil
-import org.jetbrains.dokka.Analysis.DokkaJsAnalyzerFacade
-import org.jetbrains.dokka.Analysis.DokkaNativeAnalyzerFacade
+import org.jetbrains.dokka.Platform
 import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.analyzer.common.CommonAnalysisParameters
 import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade
diff --git a/core/src/main/kotlin/Analysis/CoreKotlinCacheService.kt b/core/src/main/kotlin/analysis/CoreKotlinCacheService.kt
index 31b8ffc7..509c4e10 100644
--- a/core/src/main/kotlin/Analysis/CoreKotlinCacheService.kt
+++ b/core/src/main/kotlin/analysis/CoreKotlinCacheService.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.analysis
 
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.analyzer.ModuleInfo
diff --git a/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt b/core/src/main/kotlin/analysis/CoreProjectFileIndex.kt
index f5fbf991..6863a266 100644
--- a/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt
+++ b/core/src/main/kotlin/analysis/CoreProjectFileIndex.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.analysis
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.BaseComponent
diff --git a/core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt b/core/src/main/kotlin/analysis/DokkaAnalyzerFacades.kt
index 874341dd..c69ff645 100644
--- a/core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt
+++ b/core/src/main/kotlin/analysis/DokkaAnalyzerFacades.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka.Analysis
+package org.jetbrains.dokka.analysis
 
 import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.caches.project.LibraryModuleInfo
diff --git a/core/src/main/kotlin/Analysis/JavaResolveExtension.kt b/core/src/main/kotlin/analysis/JavaResolveExtension.kt
index 4dc6b366..2b60a639 100644
--- a/core/src/main/kotlin/Analysis/JavaResolveExtension.kt
+++ b/core/src/main/kotlin/analysis/JavaResolveExtension.kt
@@ -16,7 +16,7 @@
 
 @file:JvmName("JavaResolutionUtils")
 
-package org.jetbrains.dokka
+package org.jetbrains.dokka.analysis
 
 import com.intellij.psi.*
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
diff --git a/core/src/main/kotlin/Markdown/MarkdownProcessor.kt b/core/src/main/kotlin/markdown/MarkdownProcessor.kt
index 2c8f7a73..1304d58e 100644
--- a/core/src/main/kotlin/Markdown/MarkdownProcessor.kt
+++ b/core/src/main/kotlin/markdown/MarkdownProcessor.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.markdown
 
 import org.intellij.markdown.IElementType
 import org.intellij.markdown.MarkdownElementTypes
@@ -43,7 +43,7 @@ fun MarkdownNode.toTestString(): String {
 
 private fun MarkdownNode.presentTo(sb: StringBuilder) {
     sb.append(type.toString())
-    sb.append(":" + text.replace("\n", "\u23CE"))
+    sb.append(":" + text.replace("w\n", "\u23CE"))
 }
 
 fun parseMarkdown(markdown: String): MarkdownNode {
diff --git a/core/src/main/kotlin/Model/DocumentationNode.kt b/core/src/main/kotlin/model/DocumentationNode.kt
index b1d4be55..77225eca 100644
--- a/core/src/main/kotlin/Model/DocumentationNode.kt
+++ b/core/src/main/kotlin/model/DocumentationNode.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka.Model
+package org.jetbrains.dokka.model
 
 import org.jetbrains.dokka.transformers.descriptors.KotlinTypeWrapper
 import org.jetbrains.dokka.links.DRI
diff --git a/core/src/main/kotlin/pages/DefaultMarkdownToContentConverter.kt b/core/src/main/kotlin/pages/DefaultMarkdownToContentConverter.kt
index 72b5ead2..369c1edb 100644
--- a/core/src/main/kotlin/pages/DefaultMarkdownToContentConverter.kt
+++ b/core/src/main/kotlin/pages/DefaultMarkdownToContentConverter.kt
@@ -2,7 +2,7 @@ package org.jetbrains.dokka.pages
 
 import org.intellij.markdown.MarkdownElementTypes
 import org.intellij.markdown.MarkdownTokenTypes
-import org.jetbrains.dokka.MarkdownNode
+import org.jetbrains.dokka.markdown.MarkdownNode
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.plugability.DokkaContext
 
diff --git a/core/src/main/kotlin/pages/MarkdownToContentConverter.kt b/core/src/main/kotlin/pages/MarkdownToContentConverter.kt
index fe4736b7..cd96ff79 100644
--- a/core/src/main/kotlin/pages/MarkdownToContentConverter.kt
+++ b/core/src/main/kotlin/pages/MarkdownToContentConverter.kt
@@ -1,8 +1,7 @@
 package org.jetbrains.dokka.pages
 
-import org.jetbrains.dokka.MarkdownNode
+import org.jetbrains.dokka.markdown.MarkdownNode
 import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.plugability.DokkaContext
 
 interface MarkdownToContentConverter {
     fun buildContent(
diff --git a/core/src/main/kotlin/pages/PageBuilder.kt b/core/src/main/kotlin/pages/PageBuilder.kt
index d20635a4..92e2c5fe 100644
--- a/core/src/main/kotlin/pages/PageBuilder.kt
+++ b/core/src/main/kotlin/pages/PageBuilder.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka.pages
 
-import org.jetbrains.dokka.Model.*
-import org.jetbrains.dokka.Model.Function
+import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.Function
 
 class DefaultPageBuilder(
     override val rootContentGroup: RootContentBuilder
diff --git a/core/src/main/kotlin/pages/PageContentBuilder.kt b/core/src/main/kotlin/pages/PageContentBuilder.kt
index 2341a59d..3e852306 100644
--- a/core/src/main/kotlin/pages/PageContentBuilder.kt
+++ b/core/src/main/kotlin/pages/PageContentBuilder.kt
@@ -1,12 +1,12 @@
 package org.jetbrains.dokka.pages
 
-import org.jetbrains.dokka.DokkaLogger
-import org.jetbrains.dokka.Model.DocumentationNode
-import org.jetbrains.dokka.Model.Function
-import org.jetbrains.dokka.Model.Parameter
-import org.jetbrains.dokka.Model.TypeWrapper
+import org.jetbrains.dokka.utilities.DokkaLogger
+import org.jetbrains.dokka.model.DocumentationNode
+import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.Parameter
+import org.jetbrains.dokka.model.TypeWrapper
 import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.parseMarkdown
+import org.jetbrains.dokka.markdown.parseMarkdown
 
 class DefaultPageContentBuilder(
     private val dri: DRI,
diff --git a/core/src/main/kotlin/pages/PageNodes.kt b/core/src/main/kotlin/pages/PageNodes.kt
index cf5bf453..e8b66f4a 100644
--- a/core/src/main/kotlin/pages/PageNodes.kt
+++ b/core/src/main/kotlin/pages/PageNodes.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka.pages
 
-import org.jetbrains.dokka.Model.DocumentationNode
+import org.jetbrains.dokka.model.DocumentationNode
 import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.links.DRI
 
diff --git a/core/src/main/kotlin/plugability/DokkaContext.kt b/core/src/main/kotlin/plugability/DokkaContext.kt
index 31c56728..7b1c1306 100644
--- a/core/src/main/kotlin/plugability/DokkaContext.kt
+++ b/core/src/main/kotlin/plugability/DokkaContext.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka.plugability
 
-import org.jetbrains.dokka.DokkaLogger
+import org.jetbrains.dokka.utilities.DokkaLogger
 import org.jetbrains.dokka.EnvironmentAndFacade
 import org.jetbrains.dokka.pages.PlatformData
 import java.io.File
diff --git a/core/src/main/kotlin/renderers/HtmlRenderer.kt b/core/src/main/kotlin/renderers/HtmlRenderer.kt
index 46548699..c04a18b4 100644
--- a/core/src/main/kotlin/renderers/HtmlRenderer.kt
+++ b/core/src/main/kotlin/renderers/HtmlRenderer.kt
@@ -1,13 +1,11 @@
 package org.jetbrains.dokka.renderers
 
-import org.jetbrains.dokka.htmlEscape
+import org.jetbrains.dokka.utilities.htmlEscape
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.resolvers.LocationProvider
 import java.io.File
 import java.net.URL
-import java.nio.file.Path
-import java.nio.file.Paths
 
 open class HtmlRenderer(
     fileWriter: FileWriter,
diff --git a/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt b/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt
index ec5aa29a..5139b3c1 100644
--- a/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt
+++ b/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt
@@ -2,7 +2,7 @@ package org.jetbrains.dokka.resolvers
 
 import org.jetbrains.dokka.CoreExtensions
 import org.jetbrains.dokka.DokkaConfiguration
-import org.jetbrains.dokka.htmlEscape
+import org.jetbrains.dokka.utilities.htmlEscape
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
diff --git a/core/src/main/kotlin/transformers/descriptors/DefaultDescriptorToDocumentationTranslator.kt b/core/src/main/kotlin/transformers/descriptors/DefaultDescriptorToDocumentationTranslator.kt
index 19aeef92..4ffa4295 100644
--- a/core/src/main/kotlin/transformers/descriptors/DefaultDescriptorToDocumentationTranslator.kt
+++ b/core/src/main/kotlin/transformers/descriptors/DefaultDescriptorToDocumentationTranslator.kt
@@ -1,9 +1,9 @@
 package org.jetbrains.dokka.transformers.descriptors
 
-import org.jetbrains.dokka.DokkaResolutionFacade
-import org.jetbrains.dokka.Model.*
-import org.jetbrains.dokka.Model.ClassKind
-import org.jetbrains.dokka.Model.Function
+import org.jetbrains.dokka.analysis.DokkaResolutionFacade
+import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.ClassKind
+import org.jetbrains.dokka.model.Function
 import org.jetbrains.dokka.links.Callable
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.withClass
diff --git a/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentationTranslator.kt b/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentationTranslator.kt
index d08aba21..bd9359ee 100644
--- a/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentationTranslator.kt
+++ b/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentationTranslator.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.dokka.transformers.descriptors
 
-import org.jetbrains.dokka.Model.Module
-import org.jetbrains.dokka.Model.Package
+import org.jetbrains.dokka.model.Module
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
diff --git a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt
index 46ba2816..2b00c582 100644
--- a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.Model.*
-import org.jetbrains.dokka.Model.Function
+import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.Function
 import org.jetbrains.dokka.plugability.DokkaContext
 
 internal object DefaultDocumentationNodeMerger : DocumentationNodeMerger {
diff --git a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationToPageTranslator.kt b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationToPageTranslator.kt
index 236d0864..c6813ef8 100644
--- a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationToPageTranslator.kt
+++ b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationToPageTranslator.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka.transformers.documentation
 
 import org.jetbrains.dokka.CoreExtensions
-import org.jetbrains.dokka.Model.Module
+import org.jetbrains.dokka.model.Module
 import org.jetbrains.dokka.pages.DefaultPageBuilder
 import org.jetbrains.dokka.pages.DefaultPageContentBuilder
 import org.jetbrains.dokka.pages.ModulePageNode
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentationNodeMerger.kt b/core/src/main/kotlin/transformers/documentation/DocumentationNodeMerger.kt
index 0423f47c..25be625e 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentationNodeMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentationNodeMerger.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.Model.Module
+import org.jetbrains.dokka.model.Module
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentationNodeMerger {
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentationNodeTransformer.kt b/core/src/main/kotlin/transformers/documentation/DocumentationNodeTransformer.kt
index 8ac4a7c2..d6358f07 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentationNodeTransformer.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentationNodeTransformer.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.Model.Module
+import org.jetbrains.dokka.model.Module
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentationNodeTransformer {
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentationToPageTranslator.kt b/core/src/main/kotlin/transformers/documentation/DocumentationToPageTranslator.kt
index ffe34226..08c26b19 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentationToPageTranslator.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentationToPageTranslator.kt
@@ -1,10 +1,7 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.DokkaConfiguration
-import org.jetbrains.dokka.Model.DocumentationNode
-import org.jetbrains.dokka.Model.Module
+import org.jetbrains.dokka.model.Module
 import org.jetbrains.dokka.pages.ModulePageNode
-import org.jetbrains.dokka.pages.PageNode
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentationToPageTranslator {
diff --git a/core/src/main/kotlin/Utilities/DokkaLogging.kt b/core/src/main/kotlin/utilities/DokkaLogging.kt
index d0d1bff6..6eb7867b 100644
--- a/core/src/main/kotlin/Utilities/DokkaLogging.kt
+++ b/core/src/main/kotlin/utilities/DokkaLogging.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.utilities
 
 interface DokkaLogger {
     fun debug(message: String)
diff --git a/core/src/main/kotlin/Utilities/Html.kt b/core/src/main/kotlin/utilities/Html.kt
index de1ce1a5..9dc032f6 100644
--- a/core/src/main/kotlin/Utilities/Html.kt
+++ b/core/src/main/kotlin/utilities/Html.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.utilities
 
 import java.net.URLEncoder
 
diff --git a/core/src/main/kotlin/Utilities/Path.kt b/core/src/main/kotlin/utilities/Path.kt
index 05838499..00e2aa60 100644
--- a/core/src/main/kotlin/Utilities/Path.kt
+++ b/core/src/main/kotlin/utilities/Path.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.utilities
 
 import java.io.File
 
diff --git a/core/src/main/kotlin/Utilities/ServiceLocator.kt b/core/src/main/kotlin/utilities/ServiceLocator.kt
index eda83422..00c9ae9f 100644
--- a/core/src/main/kotlin/Utilities/ServiceLocator.kt
+++ b/core/src/main/kotlin/utilities/ServiceLocator.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka.Utilities
+package org.jetbrains.dokka.utilities
 
 import java.io.File
 import java.net.URISyntaxException
diff --git a/core/src/main/kotlin/Utilities/Uri.kt b/core/src/main/kotlin/utilities/Uri.kt
index 9827c624..089b3cff 100644
--- a/core/src/main/kotlin/Utilities/Uri.kt
+++ b/core/src/main/kotlin/utilities/Uri.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.dokka
+package org.jetbrains.dokka.utilities
 
 import java.net.URI
 
diff --git a/core/src/main/kotlin/Utilities/nodeDebug.kt b/core/src/main/kotlin/utilities/nodeDebug.kt
index e89f88ec..3290202e 100644
--- a/core/src/main/kotlin/Utilities/nodeDebug.kt
+++ b/core/src/main/kotlin/utilities/nodeDebug.kt
@@ -1,8 +1,7 @@
-package org.jetbrains.dokka.Utilities
+package org.jetbrains.dokka.utilities
 
-import org.jetbrains.dokka.Model.DocumentationNode
+import org.jetbrains.dokka.model.DocumentationNode
 import org.jetbrains.dokka.pages.*
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 
 const val DOWN = '\u2503'
 const val BRANCH = '\u2523'