refactor: improved packaging (#858)

BFergerson · web-flow · commit 39e78e01bac7 · 2022-09-30T19:25:08.000Z
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt
@@ -17,6 +17,7 @@
 package spp.jetbrains.marker.js
 
 import spp.jetbrains.marker.impl.*
+import spp.jetbrains.marker.js.service.*
 
 /**
  * Provides JavaScript support for the Marker API.
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptEndpointDetector.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptEndpointDetector.kt
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.detect
 
 import com.intellij.openapi.project.Project
-import spp.jetbrains.marker.js.psi.endpoint.ExpressEndpoint
+import spp.jetbrains.marker.js.detect.endpoint.ExpressEndpoint
 import spp.jetbrains.marker.source.info.EndpointDetector
 import spp.jetbrains.marker.source.info.EndpointDetector.EndpointNameDeterminer
 
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptLoggerDetector.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptLoggerDetector.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.detect
 
 import com.intellij.openapi.project.Project
 import spp.jetbrains.marker.source.info.LoggerDetector
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/endpoint/ExpressEndpoint.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/endpoint/ExpressEndpoint.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js.psi.endpoint
+package spp.jetbrains.marker.js.detect.endpoint
 
 import com.intellij.lang.javascript.psi.*
 import com.intellij.openapi.application.ApplicationManager
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableRootNode.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableRootNode.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.presentation
 
 import com.intellij.ide.projectView.PresentationData
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableSimpleNode.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableSimpleNode.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.presentation
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.projectView.PresentationData
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactConditionService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactConditionService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.service
 
 import com.intellij.psi.PsiElement
 import spp.jetbrains.marker.IArtifactConditionService
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactCreationService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactCreationService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.service
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNameIdentifierOwner
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.service
 
 import com.intellij.lang.javascript.psi.*
 import com.intellij.lang.javascript.psi.ecmal4.JSClass
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactScopeService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactScopeService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.service
 
 import com.intellij.lang.javascript.psi.JSFunction
 import com.intellij.lang.javascript.psi.JSVariable
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactTypeService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactTypeService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.js
+package spp.jetbrains.marker.js.service
 
 import com.intellij.lang.javascript.psi.JSExpression
 import com.intellij.lang.javascript.psi.JSFunction
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLineMarkerProvider.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLineMarkerProvider.kt
@@ -33,7 +33,7 @@ import org.jetbrains.uast.toUElementOfType
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.impl.ArtifactCreationService
 import spp.jetbrains.marker.plugin.SourceLineMarkerProvider
-import spp.jetbrains.marker.source.JVMMarkerUtils
+import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils
 import spp.jetbrains.marker.source.SourceFileMarker.Companion.SUPPORTED_FILE_TYPES
 import spp.jetbrains.marker.source.mark.api.SourceMark
 import spp.jetbrains.marker.source.mark.api.key.SourceKey
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt
@@ -18,6 +18,7 @@ package spp.jetbrains.marker.jvm
 
 import spp.jetbrains.marker.SourceMarkerUtils
 import spp.jetbrains.marker.impl.*
+import spp.jetbrains.marker.jvm.service.*
 
 /**
  * todo: description.
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt
@@ -27,7 +27,7 @@ import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.toUElement
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.plugin.SourceInlayHintProvider
-import spp.jetbrains.marker.source.JVMMarkerUtils
+import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils
 import spp.jetbrains.marker.source.mark.inlay.InlayMark
 import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
 
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMEndpointDetector.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMEndpointDetector.kt
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.detect
 
 import com.intellij.openapi.project.Project
 import io.vertx.core.CompositeFuture
 import io.vertx.core.Future
 import io.vertx.core.Promise
 import org.jetbrains.uast.UMethod
-import spp.jetbrains.marker.jvm.JVMEndpointDetector.JVMEndpointNameDeterminer
-import spp.jetbrains.marker.jvm.psi.endpoint.SkywalkingTraceEndpoint
-import spp.jetbrains.marker.jvm.psi.endpoint.SpringMVCEndpoint
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector.JVMEndpointNameDeterminer
+import spp.jetbrains.marker.jvm.detect.endpoint.SkywalkingTraceEndpoint
+import spp.jetbrains.marker.jvm.detect.endpoint.SpringMVCEndpoint
 import spp.jetbrains.marker.source.info.EndpointDetector
 import java.util.*
 
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetector.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetector.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi
+package spp.jetbrains.marker.jvm.detect
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.logger
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SkywalkingTraceEndpoint.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SkywalkingTraceEndpoint.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.util.Computable
@@ -23,7 +23,7 @@ import io.vertx.core.Promise
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.expressions.UInjectionHost
 import org.jetbrains.uast.toUElementOfType
-import spp.jetbrains.marker.jvm.JVMEndpointDetector.JVMEndpointNameDeterminer
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector.JVMEndpointNameDeterminer
 import spp.jetbrains.marker.source.info.EndpointDetector.DetectedEndpoint
 import spp.jetbrains.marker.source.mark.guide.GuideMark
 import java.util.*
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SpringMVCEndpoint.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SpringMVCEndpoint.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.lang.Language
 import com.intellij.openapi.application.ApplicationManager
@@ -29,10 +29,9 @@ import org.jetbrains.uast.kotlin.KotlinStringULiteralExpression
 import org.jetbrains.uast.kotlin.KotlinUQualifiedReferenceExpression
 import org.jetbrains.uast.kotlin.KotlinUSimpleReferenceExpression
 import org.joor.Reflect
-import spp.jetbrains.marker.jvm.JVMEndpointDetector.JVMEndpointNameDeterminer
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector.JVMEndpointNameDeterminer
 import spp.jetbrains.marker.source.info.EndpointDetector.DetectedEndpoint
 import spp.jetbrains.marker.source.mark.guide.GuideMark
-import spp.jetbrains.marker.source.mark.guide.MethodGuideMark
 import java.util.*
 
 /**
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/presentation/JVMVariableSimpleNode.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/presentation/JVMVariableSimpleNode.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.presentation
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.projectView.PresentationData
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactConditionService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactConditionService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.service
 
 import com.intellij.debugger.engine.evaluation.TextWithImportsImpl
 import com.intellij.debugger.impl.DebuggerUtilsEx
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactCreationService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactCreationService.kt
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.service
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNameIdentifierOwner
 import com.intellij.psi.PsiStatement
 import spp.jetbrains.marker.IArtifactCreationService
 import spp.jetbrains.marker.SourceMarkerUtils
-import spp.jetbrains.marker.source.JVMMarkerUtils
+import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils
 import spp.jetbrains.marker.source.SourceFileMarker
 import spp.jetbrains.marker.source.mark.api.SourceMark
 import spp.jetbrains.marker.source.mark.api.key.SourceKey
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.service
 
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
@@ -23,7 +23,7 @@ import com.intellij.psi.util.ClassUtil
 import org.jetbrains.uast.*
 import spp.jetbrains.marker.IArtifactNamingService
 import spp.jetbrains.marker.SourceMarker
-import spp.jetbrains.marker.source.JVMMarkerUtils
+import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils
 import spp.jetbrains.marker.source.mark.api.SourceMark
 import spp.protocol.artifact.ArtifactLanguage
 import spp.protocol.artifact.ArtifactNameUtils
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.service
 
 import com.intellij.psi.*
 import com.intellij.psi.scope.processor.VariablesProcessor
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactTypeService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactTypeService.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm
+package spp.jetbrains.marker.jvm.service
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.source
+package spp.jetbrains.marker.jvm.service.utils
 
 import com.intellij.lang.jvm.util.JvmClassUtil
 import com.intellij.openapi.diagnostic.logger
@@ -23,6 +23,7 @@ import com.intellij.psi.util.PsiUtil
 import org.jetbrains.uast.*
 import org.joor.Reflect
 import spp.jetbrains.marker.SourceMarkerUtils
+import spp.jetbrains.marker.source.SourceFileMarker
 import spp.jetbrains.marker.source.mark.api.SourceMark
 import spp.jetbrains.marker.source.mark.api.key.SourceKey
 import spp.jetbrains.marker.source.mark.gutter.ClassGutterMark
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
 import spp.jetbrains.marker.SourceMarker
+import spp.jetbrains.marker.jvm.service.JVMArtifactNamingService
 import spp.jetbrains.marker.source.SourceFileMarker
 import spp.protocol.artifact.ArtifactType
 
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMConditionParserTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMConditionParserTest.kt
@@ -28,6 +28,7 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl
 import org.intellij.lang.annotations.Language
 import spp.jetbrains.marker.impl.ArtifactConditionService
+import spp.jetbrains.marker.jvm.service.JVMArtifactConditionService
 
 class JVMConditionParserTest : LightJavaCodeInsightFixtureTestCase() {
 
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetectorTest.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi
+package spp.jetbrains.marker.jvm.detect
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.module.Module
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/AbstractEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/AbstractEndpointDetectorTest.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.testFramework.TestApplicationManager
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/GroovyEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/GroovyEndpointDetectorTest.kt
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.openapi.application.ApplicationManager
 import io.vertx.kotlin.coroutines.await
 import org.intellij.lang.annotations.Language
 import org.jetbrains.uast.UFile
 import org.jetbrains.uast.toUElement
 import spp.jetbrains.ScopeExtensions.safeRunBlocking
-import spp.jetbrains.marker.jvm.JVMEndpointDetector
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector
 
 class GroovyEndpointDetectorTest : AbstractEndpointDetectorTest() {
 
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/JavaEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/JavaEndpointDetectorTest.kt
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.openapi.application.ApplicationManager
 import io.vertx.kotlin.coroutines.await
 import org.intellij.lang.annotations.Language
 import org.jetbrains.uast.UFile
 import org.jetbrains.uast.toUElement
 import spp.jetbrains.ScopeExtensions.safeRunBlocking
-import spp.jetbrains.marker.jvm.JVMEndpointDetector
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector
 
 class JavaEndpointDetectorTest : AbstractEndpointDetectorTest() {
 
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/KotlinEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/KotlinEndpointDetectorTest.kt
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.openapi.application.ApplicationManager
 import io.vertx.kotlin.coroutines.await
 import org.intellij.lang.annotations.Language
 import org.jetbrains.uast.UFile
 import org.jetbrains.uast.toUElement
 import spp.jetbrains.ScopeExtensions.safeRunBlocking
-import spp.jetbrains.marker.jvm.JVMEndpointDetector
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector
 
 class KotlinEndpointDetectorTest : AbstractEndpointDetectorTest() {
 
diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/ScalaEndpointNameDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/ScalaEndpointNameDetectorTest.kt
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spp.jetbrains.marker.jvm.psi.endpoint
+package spp.jetbrains.marker.jvm.detect.endpoint
 
 import com.intellij.openapi.application.ApplicationManager
 import io.vertx.kotlin.coroutines.await
 import org.intellij.lang.annotations.Language
 import org.jetbrains.uast.UFile
 import org.jetbrains.uast.toUElement
 import spp.jetbrains.ScopeExtensions.safeRunBlocking
-import spp.jetbrains.marker.jvm.JVMEndpointDetector
+import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector
 
 class ScalaEndpointNameDetectorTest : AbstractEndpointDetectorTest() {
 
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonMarker.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonMarker.kt
@@ -17,6 +17,7 @@
 package spp.jetbrains.marker.py
 
 import spp.jetbrains.marker.impl.*
+import spp.jetbrains.marker.py.service.*
 
 /**
  * todo: description.
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonEndpointDetector.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonEndpointDetector.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonLoggerDetector.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonLoggerDetector.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/endpoint/FlaskEndpoint.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/endpoint/FlaskEndpoint.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableRootNode.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableRootNode.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableSimpleNode.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableSimpleNode.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactConditionService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactConditionService.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactCreationService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactCreationService.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactScopeService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactScopeService.kt
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactTypeService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactTypeService.kt
diff --git a/marker/py-marker/src/test/kotlin/spp/jetbrains/marker/py/PythonGuideProviderTest.kt b/marker/py-marker/src/test/kotlin/spp/jetbrains/marker/py/PythonGuideProviderTest.kt
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt b/marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt
diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/PluginSourceMarkEventListener.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/PluginSourceMarkEventListener.kt
diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/tree/VariableRootSimpleNode.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/tree/VariableRootSimpleNode.kt
