diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index 5414ebc3538..57e16136990 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -39,6 +39,7 @@ import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSign
 import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
 import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
 import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags;
+import org.jetbrains.jet.lang.resolve.java.resolver.JavaDescriptorPropertiesResolver;
 import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope;
 import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope;
 import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper;
@@ -1027,7 +1028,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         return r;
     }
 
-    static void getResolverScopeData(@NotNull ResolverScopeData scopeData) {
+    public static void getResolverScopeData(@NotNull ResolverScopeData scopeData) {
         if (scopeData.getNamedMembersMap() == null) {
             scopeData.setNamedMembersMap(JavaDescriptorResolverHelper.getNamedMembers(scopeData));
         }
@@ -1186,7 +1187,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         return r;
     }
 
-    List<AnnotationDescriptor> resolveAnnotations(PsiModifierListOwner owner) {
+    public List<AnnotationDescriptor> resolveAnnotations(PsiModifierListOwner owner) {
         List<Runnable> tasks = Lists.newArrayList();
         List<AnnotationDescriptor> annotations = resolveAnnotations(owner, tasks);
         for (Runnable task : tasks) {
@@ -1414,7 +1415,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         return functions;
     }
 
-    static Collection<JetType> getSupertypes(ResolverScopeData scope) {
+    public static Collection<JetType> getSupertypes(ResolverScopeData scope) {
         if (scope instanceof ResolverClassData) {
             return ((ResolverClassData) scope).getClassDescriptor().getSupertypes();
         }
@@ -1448,7 +1449,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         }
     }
 
-    static Modality resolveModality(PsiMemberWrapper memberWrapper, boolean isFinal) {
+    public static Modality resolveModality(PsiMemberWrapper memberWrapper, boolean isFinal) {
         if (memberWrapper instanceof PsiMethodWrapper) {
             PsiMethodWrapper method = (PsiMethodWrapper) memberWrapper;
             if (method.getJetMethod().hasForceOpenFlag()) {
@@ -1462,8 +1463,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         return Modality.convertFromFlags(memberWrapper.isAbstract(), !isFinal);
     }
 
-    static Visibility resolveVisibility(PsiModifierListOwner modifierListOwner,
-            @Nullable PsiAnnotationWithFlags annotation) {
+    public static Visibility resolveVisibility(
+            PsiModifierListOwner modifierListOwner,
+            @Nullable PsiAnnotationWithFlags annotation
+    ) {
         if (annotation != null) {
             if (annotation.hasPrivateFlag()) {
                 return Visibilities.PRIVATE;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
index 0d73c4d0c4b..55259d217ab 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
@@ -326,9 +326,10 @@ public class JavaDescriptorSignatureResolver {
     }
 
 
-    List<TypeParameterDescriptor> resolveMethodTypeParameters(
+    public List<TypeParameterDescriptor> resolveMethodTypeParameters(
             @NotNull PsiMethodWrapper method,
-            @NotNull DeclarationDescriptor functionDescriptor) {
+            @NotNull DeclarationDescriptor functionDescriptor
+    ) {
 
         List<TypeParameterDescriptorInitialization> typeParametersIntialization;
         final PsiMethod psiMethod = method.getPsiMethod();
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PropertyAccessorData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PropertyAccessorData.java
index 549f8c015df..bde567f5d0e 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PropertyAccessorData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PropertyAccessorData.java
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
 /**
  * @author Stepan Koltsov
  */
-class PropertyAccessorData {
+public class PropertyAccessorData {
 
     @NotNull
     private final PsiMemberWrapper member;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java
index c33522c78f5..08fb69227bf 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author Stepan Koltsov
  */
-class TypeSource {
+public class TypeSource {
 
     @NotNull
     private final String typeString;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java
similarity index 97%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java
index 8943b9cb600..945cf504dc3 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.java;
+package org.jetbrains.jet.lang.resolve.java.resolver;
 
 import com.google.common.collect.Sets;
 import com.intellij.openapi.util.Pair;
@@ -27,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.OverrideResolver;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolveData.ResolverScopeData;
+import org.jetbrains.jet.lang.resolve.java.*;
 import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeFieldSignatureData;
 import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
 import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
@@ -54,19 +55,23 @@ public final class JavaDescriptorPropertiesResolver {
     private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
     private BindingTrace trace;
 
-    /* internal */ JavaDescriptorPropertiesResolver(JavaDescriptorResolver resolver) {
+    /* internal */
+    public JavaDescriptorPropertiesResolver(JavaDescriptorResolver resolver) {
         this.javaDescriptorResolver = resolver;
     }
 
-    /* internal */ void setSemanticServices(JavaSemanticServices semanticServices) {
+    /* internal */
+    public void setSemanticServices(JavaSemanticServices semanticServices) {
         this.semanticServices = semanticServices;
     }
 
-    /* internal */ void setTrace(BindingTrace trace) {
+    /* internal */
+    public void setTrace(BindingTrace trace) {
         this.trace = trace;
     }
 
-    /* internal */ void setJavaDescriptorSignatureResolver(JavaDescriptorSignatureResolver javaDescriptorSignatureResolver) {
+    /* internal */
+    public void setJavaDescriptorSignatureResolver(JavaDescriptorSignatureResolver javaDescriptorSignatureResolver) {
         this.javaDescriptorSignatureResolver = javaDescriptorSignatureResolver;
     }