diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/ProjectTranslator.kt b/translator/src/main/kotlin/org/kotlinnative/translator/ProjectTranslator.kt
index 3b80f5a0cca..c9593f55403 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/ProjectTranslator.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/ProjectTranslator.kt
@@ -1,6 +1,10 @@
 package org.kotlinnative.translator
 
 import org.jetbrains.kotlin.psi.*
+import org.kotlinnative.translator.codegens.ClassCodegen
+import org.kotlinnative.translator.codegens.FunctionCodegen
+import org.kotlinnative.translator.codegens.ObjectCodegen
+import org.kotlinnative.translator.codegens.PropertyCodegen
 
 class ProjectTranslator(val files: List<KtFile>,
                         val state: TranslationState) {
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/TranslationState.kt b/translator/src/main/kotlin/org/kotlinnative/translator/TranslationState.kt
index ca42610b186..8b929412fdc 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/TranslationState.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/TranslationState.kt
@@ -20,6 +20,10 @@ import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.utils.PathUtil
+import org.kotlinnative.translator.codegens.ClassCodegen
+import org.kotlinnative.translator.codegens.FunctionCodegen
+import org.kotlinnative.translator.codegens.ObjectCodegen
+import org.kotlinnative.translator.codegens.PropertyCodegen
 import org.kotlinnative.translator.exceptions.TranslationException
 import org.kotlinnative.translator.llvm.LLVMBuilder
 import org.kotlinnative.translator.llvm.LLVMVariable
@@ -35,12 +39,12 @@ private constructor
 ) {
     var externalFunctions = HashMap<String, FunctionCodegen>()
     var functions = HashMap<String, FunctionCodegen>()
-    val globalVariableCollection = HashMap<String, LLVMVariable>()
     var classes = HashMap<String, ClassCodegen>()
     var objects = HashMap<String, ObjectCodegen>()
     var properties = HashMap<String, PropertyCodegen>()
     val codeBuilder = LLVMBuilder(arm)
     val extensionFunctions = HashMap<String, HashMap<String, FunctionCodegen>>()
+    val globalVariableCollection = HashMap<String, LLVMVariable>()
 
     init {
         POINTER_ALIGN = if (arm) 4 else 8
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/BlockCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/BlockCodegen.kt
index 70d924b3991..75c0b40d225 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/BlockCodegen.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/BlockCodegen.kt
@@ -1,4 +1,4 @@
-package org.kotlinnative.translator
+package org.kotlinnative.translator.codegens
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
@@ -17,6 +17,8 @@ import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCallIm
 import org.jetbrains.kotlin.resolve.constants.TypedCompileTimeConstant
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
+import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.VariableManager
 import org.kotlinnative.translator.llvm.*
 import org.kotlinnative.translator.llvm.types.*
 import java.rmi.UnexpectedException
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ClassCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ClassCodegen.kt
index d7ab4a694cd..b9f3619474a 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ClassCodegen.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ClassCodegen.kt
@@ -1,10 +1,12 @@
-package org.kotlinnative.translator
+package org.kotlinnative.translator.codegens
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.VariableManager
 import org.kotlinnative.translator.exceptions.TranslationException
 import org.kotlinnative.translator.llvm.LLVMBuilder
 import org.kotlinnative.translator.llvm.types.LLVMReferenceType
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/FunctionCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/FunctionCodegen.kt
index 2e99feac2dd..81191fc51f6 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/FunctionCodegen.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/FunctionCodegen.kt
@@ -1,4 +1,4 @@
-package org.kotlinnative.translator
+package org.kotlinnative.translator.codegens
 
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtFile
@@ -8,6 +8,8 @@ import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
+import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.VariableManager
 import org.kotlinnative.translator.llvm.*
 import org.kotlinnative.translator.llvm.types.LLVMFunctionType
 import org.kotlinnative.translator.llvm.types.LLVMReferenceType
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ObjectCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ObjectCodegen.kt
index 199129003c0..4f58ad3d000 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ObjectCodegen.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/ObjectCodegen.kt
@@ -1,7 +1,9 @@
-package org.kotlinnative.translator
+package org.kotlinnative.translator.codegens
 
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.VariableManager
 import org.kotlinnative.translator.llvm.LLVMBuilder
 import org.kotlinnative.translator.llvm.LLVMVariable
 import org.kotlinnative.translator.llvm.LLVMVariableScope
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/PropertyCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/PropertyCodegen.kt
index b54ee5a75c3..ca21816d604 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/PropertyCodegen.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/PropertyCodegen.kt
@@ -1,8 +1,10 @@
-package org.kotlinnative.translator
+package org.kotlinnative.translator.codegens
 
 import org.jetbrains.kotlin.js.descriptorUtils.nameIfStandardType
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.VariableManager
 import org.kotlinnative.translator.llvm.LLVMBuilder
 import org.kotlinnative.translator.llvm.LLVMInstanceOfStandardType
 import org.kotlinnative.translator.llvm.LLVMVariable
diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/StructCodegen.kt b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/StructCodegen.kt
index c0eba0c4635..e92d9467f76 100644
--- a/translator/src/main/kotlin/org/kotlinnative/translator/codegens/StructCodegen.kt
+++ b/translator/src/main/kotlin/org/kotlinnative/translator/codegens/StructCodegen.kt
@@ -1,10 +1,12 @@
-package org.kotlinnative.translator
+package org.kotlinnative.translator.codegens
 
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.types.KotlinType
+import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.VariableManager
 import org.kotlinnative.translator.llvm.*
 import org.kotlinnative.translator.llvm.types.LLVMCharType
 import org.kotlinnative.translator.llvm.types.LLVMReferenceType