diff --git a/build/groovy/org/jetbrains/intellij/build/impl/JvmArchitecture.groovy b/build/groovy/org/jetbrains/intellij/build/JvmArchitecture.groovy
similarity index 90%
rename from build/groovy/org/jetbrains/intellij/build/impl/JvmArchitecture.groovy
rename to build/groovy/org/jetbrains/intellij/build/JvmArchitecture.groovy
index 6b5543501f96..015a8b4e868b 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/JvmArchitecture.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/JvmArchitecture.groovy
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.intellij.build.impl
+package org.jetbrains.intellij.build
 
 /**
  * @author nik
  */
-//tode[nik] rename and move out of 'impl'?
 enum JvmArchitecture {
   x32(""), x64("64")
 
diff --git a/build/groovy/org/jetbrains/intellij/build/WindowsDistributionCustomizer.groovy b/build/groovy/org/jetbrains/intellij/build/WindowsDistributionCustomizer.groovy
index 13a8f818e251..c814d2d2601d 100644
--- a/build/groovy/org/jetbrains/intellij/build/WindowsDistributionCustomizer.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/WindowsDistributionCustomizer.groovy
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 package org.jetbrains.intellij.build
-
-import org.jetbrains.intellij.build.impl.JvmArchitecture
-
 /**
  * @author nik
  */
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
index a4494eded28e..5d32942e55b0 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
@@ -17,6 +17,8 @@ package org.jetbrains.intellij.build.impl
 
 import com.intellij.openapi.util.SystemInfo
 import org.jetbrains.intellij.build.BuildContext
+import org.jetbrains.intellij.build.JvmArchitecture
+
 /**
  * @author nik
  */
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
index 9c7be4dd50dc..59ed23170953 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
@@ -16,6 +16,7 @@
 package org.jetbrains.intellij.build.impl
 
 import org.jetbrains.intellij.build.BuildContext
+import org.jetbrains.intellij.build.JvmArchitecture
 import org.jetbrains.intellij.build.LinuxDistributionCustomizer
 
 /**
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
index 40319533e592..7b0650a1a9ad 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
@@ -17,6 +17,7 @@ package org.jetbrains.intellij.build.impl
 
 import org.jetbrains.intellij.build.BuildContext
 import org.jetbrains.intellij.build.BuildOptions
+import org.jetbrains.intellij.build.JvmArchitecture
 import org.jetbrains.intellij.build.MacDistributionCustomizer
 
 import java.time.LocalDate
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/VmOptionsGenerator.groovy b/build/groovy/org/jetbrains/intellij/build/impl/VmOptionsGenerator.groovy
index cfff43a2285f..f09c091339de 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/VmOptionsGenerator.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/VmOptionsGenerator.groovy
@@ -15,6 +15,8 @@
  */
 package org.jetbrains.intellij.build.impl
 
+import org.jetbrains.intellij.build.JvmArchitecture
+
 /**
  * @author nik
  */
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
index e67eae518aea..fe3cb5adb8e5 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
@@ -17,6 +17,7 @@ package org.jetbrains.intellij.build.impl
 
 import org.jetbrains.intellij.build.BuildContext
 import org.jetbrains.intellij.build.BuildOptions
+import org.jetbrains.intellij.build.JvmArchitecture
 import org.jetbrains.intellij.build.WindowsDistributionCustomizer
 import org.jetbrains.jps.model.module.JpsModuleSourceRoot
 /**