diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
index 8738ee980..0eecf3240 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
@@ -16,7 +16,7 @@
 package org.teavm.classlib.java.lang;
 
 import org.teavm.classlib.java.io.TSerializable;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
index d58d1dbed..9a1313201 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
@@ -15,10 +15,10 @@
  */
 package org.teavm.classlib.java.lang;
 
-import org.teavm.javascript.spi.Async;
-import org.teavm.javascript.spi.Rename;
-import org.teavm.javascript.spi.Superclass;
-import org.teavm.javascript.spi.Sync;
+import org.teavm.interop.Async;
+import org.teavm.interop.Rename;
+import org.teavm.interop.Superclass;
+import org.teavm.interop.Sync;
 import org.teavm.jso.browser.TimerHandler;
 import org.teavm.platform.Platform;
 import org.teavm.platform.PlatformObject;
diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java
index 80a106bc9..02d3d6a69 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java
@@ -15,7 +15,7 @@
  */
 package org.teavm.classlib.java.lang;
 
-import org.teavm.javascript.spi.Superclass;
+import org.teavm.interop.Superclass;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java
index 39ef72d7e..c54e84436 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java
@@ -15,7 +15,7 @@
  */
 package org.teavm.classlib.java.lang;
 
-import org.teavm.javascript.spi.Async;
+import org.teavm.interop.Async;
 import org.teavm.platform.Platform;
 import org.teavm.platform.PlatformRunnable;
 import org.teavm.platform.async.AsyncCallback;
diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
index 70ab398d6..f947296b9 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
@@ -17,9 +17,9 @@ package org.teavm.classlib.java.lang;
 
 import org.teavm.classlib.java.io.TPrintStream;
 import org.teavm.classlib.java.util.TArrays;
-import org.teavm.javascript.spi.Remove;
-import org.teavm.javascript.spi.Rename;
-import org.teavm.javascript.spi.Superclass;
+import org.teavm.interop.Remove;
+import org.teavm.interop.Rename;
+import org.teavm.interop.Superclass;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TAnnotation.java b/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TAnnotation.java
index ad8c330b5..9c251edb5 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TAnnotation.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TAnnotation.java
@@ -15,7 +15,7 @@
  */
 package org.teavm.classlib.java.lang.annotation;
 
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java b/classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java
index 5150ff70b..50704fbd2 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java
@@ -19,7 +19,7 @@ import org.teavm.classlib.java.lang.TException;
 import org.teavm.classlib.java.lang.TIllegalArgumentException;
 import org.teavm.classlib.java.lang.TNullPointerException;
 import org.teavm.classlib.java.lang.TString;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  * A {@code URISyntaxException} will be thrown if some information could not be parsed
diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
index 9ab3c8a97..b31a3df7c 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
@@ -16,7 +16,7 @@
 package org.teavm.classlib.java.util;
 
 import org.teavm.classlib.java.lang.*;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
index 7c02f3a25..823a5f1ca 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
@@ -18,7 +18,7 @@ package org.teavm.classlib.java.util;
 import java.util.Arrays;
 import org.teavm.classlib.java.io.TSerializable;
 import org.teavm.classlib.java.lang.*;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java
index 4a799e068..f14c25270 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java
@@ -17,7 +17,7 @@ package org.teavm.classlib.java.util;
 
 import org.teavm.classlib.java.io.TSerializable;
 import org.teavm.classlib.java.lang.*;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  *
diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java
index 8ee052962..82dc1f7f6 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java
@@ -36,7 +36,7 @@ import java.util.Arrays;
 import java.util.ConcurrentModificationException;
 import org.teavm.classlib.java.io.TSerializable;
 import org.teavm.classlib.java.lang.*;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 public class THashMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TSerializable {
     transient int elementCount;
diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
index 54e7413d9..7cc9d28e6 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
@@ -20,7 +20,7 @@ import org.teavm.classlib.java.io.TSerializable;
 import org.teavm.classlib.java.lang.TCloneNotSupportedException;
 import org.teavm.classlib.java.lang.TCloneable;
 import org.teavm.classlib.java.lang.TObject;
-import org.teavm.javascript.spi.Rename;
+import org.teavm.interop.Rename;
 
 /**
  *
diff --git a/core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java b/core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
index 17578f62e..93340c43a 100644
--- a/core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
+++ b/core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
@@ -20,9 +20,9 @@ import org.teavm.callgraph.CallGraph;
 import org.teavm.callgraph.CallGraphNode;
 import org.teavm.callgraph.CallSite;
 import org.teavm.diagnostics.Diagnostics;
-import org.teavm.javascript.spi.Async;
+import org.teavm.interop.Async;
 import org.teavm.javascript.spi.InjectedBy;
-import org.teavm.javascript.spi.Sync;
+import org.teavm.interop.Sync;
 import org.teavm.model.*;
 import org.teavm.model.instructions.*;
 
diff --git a/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java b/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java
index 1d90dd700..af23849c1 100644
--- a/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java
+++ b/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java
@@ -18,9 +18,9 @@ package org.teavm.parsing;
 import java.util.Arrays;
 import java.util.Map;
 import org.teavm.common.Mapper;
-import org.teavm.javascript.spi.Remove;
-import org.teavm.javascript.spi.Rename;
-import org.teavm.javascript.spi.Superclass;
+import org.teavm.interop.Remove;
+import org.teavm.interop.Rename;
+import org.teavm.interop.Superclass;
 import org.teavm.model.*;
 import org.teavm.model.instructions.*;
 import org.teavm.model.util.ModelUtils;
diff --git a/core/src/main/java/org/teavm/javascript/spi/Async.java b/interop/core/src/main/java/org/teavm/interop/Async.java
similarity index 92%
rename from core/src/main/java/org/teavm/javascript/spi/Async.java
rename to interop/core/src/main/java/org/teavm/interop/Async.java
index f20ed7d25..fbfe77409 100644
--- a/core/src/main/java/org/teavm/javascript/spi/Async.java
+++ b/interop/core/src/main/java/org/teavm/interop/Async.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 Alexey Andreev.
+ *  Copyright 2016 Alexey Andreev.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.spi;
+package org.teavm.interop;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/org/teavm/javascript/spi/Remove.java b/interop/core/src/main/java/org/teavm/interop/Remove.java
similarity index 92%
rename from core/src/main/java/org/teavm/javascript/spi/Remove.java
rename to interop/core/src/main/java/org/teavm/interop/Remove.java
index 723732d88..eb832e5c5 100644
--- a/core/src/main/java/org/teavm/javascript/spi/Remove.java
+++ b/interop/core/src/main/java/org/teavm/interop/Remove.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2013 Alexey Andreev.
+ *  Copyright 2016 Alexey Andreev.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.spi;
+package org.teavm.interop;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/org/teavm/javascript/spi/Rename.java b/interop/core/src/main/java/org/teavm/interop/Rename.java
similarity index 91%
rename from core/src/main/java/org/teavm/javascript/spi/Rename.java
rename to interop/core/src/main/java/org/teavm/interop/Rename.java
index 416060524..7027fde15 100644
--- a/core/src/main/java/org/teavm/javascript/spi/Rename.java
+++ b/interop/core/src/main/java/org/teavm/interop/Rename.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2013 Alexey Andreev.
+ *  Copyright 2016 Alexey Andreev.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.spi;
+package org.teavm.interop;
 
 import java.lang.annotation.*;
 
diff --git a/core/src/main/java/org/teavm/javascript/spi/Superclass.java b/interop/core/src/main/java/org/teavm/interop/Superclass.java
similarity index 92%
rename from core/src/main/java/org/teavm/javascript/spi/Superclass.java
rename to interop/core/src/main/java/org/teavm/interop/Superclass.java
index 8c9b03305..882d0a056 100644
--- a/core/src/main/java/org/teavm/javascript/spi/Superclass.java
+++ b/interop/core/src/main/java/org/teavm/interop/Superclass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2013 Alexey Andreev.
+ *  Copyright 2016 Alexey Andreev.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.spi;
+package org.teavm.interop;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/org/teavm/javascript/spi/Sync.java b/interop/core/src/main/java/org/teavm/interop/Sync.java
similarity index 91%
rename from core/src/main/java/org/teavm/javascript/spi/Sync.java
rename to interop/core/src/main/java/org/teavm/interop/Sync.java
index 814a73311..0b2d89037 100644
--- a/core/src/main/java/org/teavm/javascript/spi/Sync.java
+++ b/interop/core/src/main/java/org/teavm/interop/Sync.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 Alexey Andreev.
+ *  Copyright 2016 Alexey Andreev.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.spi;
+package org.teavm.interop;
 
 import java.lang.annotation.*;
 
diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
index 14b5575de..9985360d0 100644
--- a/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
+++ b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
@@ -34,7 +34,7 @@ import org.teavm.cache.NoCache;
 import org.teavm.diagnostics.Diagnostics;
 import org.teavm.javascript.spi.GeneratedBy;
 import org.teavm.javascript.spi.InjectedBy;
-import org.teavm.javascript.spi.Sync;
+import org.teavm.interop.Sync;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSIndexer;
diff --git a/platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java b/platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java
index e0ab8290e..6be5350c8 100644
--- a/platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java
+++ b/platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java
@@ -17,9 +17,9 @@ package org.teavm.platform.plugin;
 
 import org.teavm.dependency.PluggableDependency;
 import org.teavm.diagnostics.Diagnostics;
-import org.teavm.javascript.spi.Async;
+import org.teavm.interop.Async;
 import org.teavm.javascript.spi.GeneratedBy;
-import org.teavm.javascript.spi.Sync;
+import org.teavm.interop.Sync;
 import org.teavm.model.*;
 import org.teavm.platform.async.AsyncCallback;