diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
similarity index 96%
rename from plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
rename to plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
index d0c6d4cf5377..a7d719959fcf 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/SdkHomeBean.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/SdkHomeBean.java
new file mode 100644
index 000000000000..0d4f6015da84
--- /dev/null
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/SdkHomeBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.util;
+
+public class SdkHomeBean {
+  public String SDK_HOME;
+}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
similarity index 77%
rename from plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
rename to plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
index 4449ab57789f..704a5a49cc4a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
@@ -19,8 +19,7 @@ package org.jetbrains.plugins.groovy.util;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.JarFileSystem;
-import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.StandardFileSystems;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.PsiModificationTrackerImpl;
@@ -34,22 +33,22 @@ import java.util.List;
 /**
  * @author peter
  */
-public abstract class SdkHomeSettings implements PersistentStateComponent<SdkHomeConfigurable.SdkHomeBean> {
+public abstract class SdkHomeSettings implements PersistentStateComponent<SdkHomeBean> {
   private final PsiModificationTrackerImpl myTracker;
-  private SdkHomeConfigurable.SdkHomeBean mySdkHome;
+  private SdkHomeBean mySdkHome;
 
   protected SdkHomeSettings(Project project) {
     myTracker = (PsiModificationTrackerImpl)PsiManager.getInstance(project).getModificationTracker();
   }
 
   @Override
-  public SdkHomeConfigurable.SdkHomeBean getState() {
+  public SdkHomeBean getState() {
     return mySdkHome;
   }
 
   @Override
-  public void loadState(SdkHomeConfigurable.SdkHomeBean state) {
-    SdkHomeConfigurable.SdkHomeBean oldState = mySdkHome;
+  public void loadState(SdkHomeBean state) {
+    SdkHomeBean oldState = mySdkHome;
     mySdkHome = state;
     if (oldState != null) {
       myTracker.incCounter();
@@ -57,7 +56,7 @@ public abstract class SdkHomeSettings implements PersistentStateComponent<SdkHom
   }
 
   @Nullable
-  private static VirtualFile calcHome(final SdkHomeConfigurable.SdkHomeBean state) {
+  private static VirtualFile calcHome(final SdkHomeBean state) {
     if (state == null) {
       return null;
     }
@@ -67,7 +66,7 @@ public abstract class SdkHomeSettings implements PersistentStateComponent<SdkHom
       return null;
     }
 
-    return LocalFileSystem.getInstance().findFileByPath(sdk_home);
+    return StandardFileSystems.local().findFileByPath(sdk_home);
   }
 
   @Nullable
@@ -89,10 +88,10 @@ public abstract class SdkHomeSettings implements PersistentStateComponent<SdkHom
       return Collections.emptyList();
     }
 
-    final ArrayList<VirtualFile> result = new ArrayList<VirtualFile>();
+    List<VirtualFile> result = new ArrayList<VirtualFile>();
     for (VirtualFile file : lib.getChildren()) {
       if ("jar".equals(file.getExtension())) {
-        ContainerUtil.addIfNotNull(JarFileSystem.getInstance().getJarRootForLocalFile(file), result);
+        ContainerUtil.addIfNotNull(StandardFileSystems.getJarRootForLocalFile(file), result);
       }
     }
     return result;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
index ec050842a918..1e909569918a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
@@ -100,10 +100,6 @@ public abstract class SdkHomeConfigurable implements SearchableConfigurable {
     myPanel = null;
   }
 
-  public static class SdkHomeBean {
-    public String SDK_HOME;
-  }
-
   @Override
   public Runnable enableSearch(String option) {
     return null;
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/StandaloneGantTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/StandaloneGantTest.groovy
index c8fbb8f79b19..344e2c70b382 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/StandaloneGantTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/StandaloneGantTest.groovy
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetbrains.plugins.groovy.gant
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ContentEntry
@@ -11,7 +26,7 @@ import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.annotations.NotNull
-import org.jetbrains.plugins.groovy.util.SdkHomeConfigurable.SdkHomeBean
+import org.jetbrains.plugins.groovy.util.SdkHomeBean
 import org.jetbrains.plugins.groovy.util.TestUtils
 /**
  * @author peter