diff --git a/.gitignore b/.gitignore
index f365ef0c8..e319a93d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
-/.directory
-/.project
-/.settings
-/target
+.directory
+.project
+.settings
+.classpath
+.factorypath
 .checkstyle
+.cache-main
+target
diff --git a/teavm-classlib/pom.xml b/classlib/pom.xml
similarity index 100%
rename from teavm-classlib/pom.xml
rename to classlib/pom.xml
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/Base46.java b/classlib/src/main/java/org/teavm/classlib/impl/Base46.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/Base46.java
rename to classlib/src/main/java/org/teavm/classlib/impl/Base46.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/CharFlow.java b/classlib/src/main/java/org/teavm/classlib/impl/CharFlow.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/CharFlow.java
rename to classlib/src/main/java/org/teavm/classlib/impl/CharFlow.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/DeclaringClassMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/DeclaringClassMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/DeclaringClassMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/DeclaringClassMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/FirstDayOfWeekMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/FirstDayOfWeekMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/FirstDayOfWeekMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/FirstDayOfWeekMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/JCLPlugin.java b/classlib/src/main/java/org/teavm/classlib/impl/JCLPlugin.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/JCLPlugin.java
rename to classlib/src/main/java/org/teavm/classlib/impl/JCLPlugin.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/JavacSupport.java b/classlib/src/main/java/org/teavm/classlib/impl/JavacSupport.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/JavacSupport.java
rename to classlib/src/main/java/org/teavm/classlib/impl/JavacSupport.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/MinimalDaysInFirstWeekMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/MinimalDaysInFirstWeekMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/MinimalDaysInFirstWeekMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/MinimalDaysInFirstWeekMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java b/classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java
rename to classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/WeekMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/WeekMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/WeekMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/WeekMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CountriesGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/currency/CountriesGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CountriesGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/currency/CountriesGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CurrenciesGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/currency/CurrenciesGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CurrenciesGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/currency/CurrenciesGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyHelper.java b/classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyHelper.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyHelper.java
rename to classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyHelper.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyResource.java b/classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyResource.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyResource.java
rename to classlib/src/main/java/org/teavm/classlib/impl/currency/CurrencyResource.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/lambda/LambdaMetafactorySubstitutor.java b/classlib/src/main/java/org/teavm/classlib/impl/lambda/LambdaMetafactorySubstitutor.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/lambda/LambdaMetafactorySubstitutor.java
rename to classlib/src/main/java/org/teavm/classlib/impl/lambda/LambdaMetafactorySubstitutor.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLClass.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLClass.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLClass.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLClass.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLClassType.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLClassType.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLClassType.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLClassType.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonVisitor.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonVisitor.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonVisitor.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonVisitor.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLItem.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLItem.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLItem.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLItem.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLItemType.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLItemType.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLItemType.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLItemType.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLPackage.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLPackage.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLPackage.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLPackage.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLStatus.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLStatus.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLStatus.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLStatus.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLVisibility.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLVisibility.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/report/JCLVisibility.java
rename to classlib/src/main/java/org/teavm/classlib/impl/report/JCLVisibility.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/AliasDateTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/AliasDateTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/AliasDateTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/AliasDateTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/CachedDateTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/CachedDateTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/CachedDateTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/CachedDateTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneProvider.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneProvider.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneProvider.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneProvider.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/FixedDateTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/FixedDateTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/FixedDateTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/FixedDateTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/StorableDateTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/StorableDateTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/StorableDateTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/StorableDateTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneCache.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneCache.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneCache.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneCache.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneResource.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneResource.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneResource.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/TimeZoneResource.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java
rename to classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/AvailableLocalesMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/AvailableLocalesMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/AvailableLocalesMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/AvailableLocalesMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRCurrency.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRCurrency.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRCurrency.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRCurrency.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDateFormats.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDateFormats.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDateFormats.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDateFormats.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDecimalData.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDecimalData.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDecimalData.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRDecimalData.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRHelper.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRHelper.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRHelper.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRHelper.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRLocale.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRLocale.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRLocale.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRLocale.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRReader.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRReader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRReader.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRReader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CLDRTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CountryMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CountryMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CountryMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CountryMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalization.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalization.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalization.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalization.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalizationMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalizationMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalizationMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/CurrencyLocalizationMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatCollection.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatCollection.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatCollection.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatCollection.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DateSymbolsMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateSymbolsMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DateSymbolsMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/DateSymbolsMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalData.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalData.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalData.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalData.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/DecimalMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DefaultLocaleMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DefaultLocaleMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/DefaultLocaleMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/DefaultLocaleMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/LanguageMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/LanguageMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/LanguageMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/LanguageMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/LikelySubtagsMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/LikelySubtagsMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/LikelySubtagsMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/LikelySubtagsMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/LocaleMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/LocaleMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/LocaleMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/LocaleMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalization.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalization.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalization.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalization.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalizationGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalizationGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalizationGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/TimeZoneLocalizationGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeHelper.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeHelper.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeHelper.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeHelper.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java
rename to classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TBufferedInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TBufferedInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TBufferedInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TBufferedInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TBufferedReader.java b/classlib/src/main/java/org/teavm/classlib/java/io/TBufferedReader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TBufferedReader.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TBufferedReader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayOutputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayOutputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayOutputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TByteArrayOutputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TCloseable.java b/classlib/src/main/java/org/teavm/classlib/java/io/TCloseable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TCloseable.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TCloseable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TConsole.java b/classlib/src/main/java/org/teavm/classlib/java/io/TConsole.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TConsole.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TConsole.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataInput.java b/classlib/src/main/java/org/teavm/classlib/java/io/TDataInput.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataInput.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TDataInput.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TDataInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TDataInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataOutput.java b/classlib/src/main/java/org/teavm/classlib/java/io/TDataOutput.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataOutput.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TDataOutput.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataOutputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TDataOutputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TDataOutputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TDataOutputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TEOFException.java b/classlib/src/main/java/org/teavm/classlib/java/io/TEOFException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TEOFException.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TEOFException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TExternalizable.java b/classlib/src/main/java/org/teavm/classlib/java/io/TExternalizable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TExternalizable.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TExternalizable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TFilterInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TFilterInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TFilterInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TFilterInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TFilterOutputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TFilterOutputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TFilterOutputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TFilterOutputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TFlushable.java b/classlib/src/main/java/org/teavm/classlib/java/io/TFlushable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TFlushable.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TFlushable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TIOException.java b/classlib/src/main/java/org/teavm/classlib/java/io/TIOException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TIOException.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TIOException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TInputStreamReader.java b/classlib/src/main/java/org/teavm/classlib/java/io/TInputStreamReader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TInputStreamReader.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TInputStreamReader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TOutputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TOutputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TOutputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TOutputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TOutputStreamWriter.java b/classlib/src/main/java/org/teavm/classlib/java/io/TOutputStreamWriter.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TOutputStreamWriter.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TOutputStreamWriter.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TPrintStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TPrintStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TPrintStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TPrintStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TPushbackInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/io/TPushbackInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TPushbackInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TPushbackInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TReader.java b/classlib/src/main/java/org/teavm/classlib/java/io/TReader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TReader.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TReader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TSerializable.java b/classlib/src/main/java/org/teavm/classlib/java/io/TSerializable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TSerializable.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TSerializable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TStringReader.java b/classlib/src/main/java/org/teavm/classlib/java/io/TStringReader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TStringReader.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TStringReader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TUTFDataFormatException.java b/classlib/src/main/java/org/teavm/classlib/java/io/TUTFDataFormatException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TUTFDataFormatException.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TUTFDataFormatException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TUnsupportedEncodingException.java b/classlib/src/main/java/org/teavm/classlib/java/io/TUnsupportedEncodingException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TUnsupportedEncodingException.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TUnsupportedEncodingException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java b/classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java
rename to classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/CharacterMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/java/lang/CharacterMetadataGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/CharacterMetadataGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/CharacterMetadataGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/LongNativeGenerator.java b/classlib/src/main/java/org/teavm/classlib/java/lang/LongNativeGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/LongNativeGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/LongNativeGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/MathNativeGenerator.java b/classlib/src/main/java/org/teavm/classlib/java/lang/MathNativeGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/MathNativeGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/MathNativeGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/SystemNativeGenerator.java b/classlib/src/main/java/org/teavm/classlib/java/lang/SystemNativeGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/SystemNativeGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/SystemNativeGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAppendable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TAppendable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAppendable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TAppendable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TArithmeticException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TArithmeticException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TArithmeticException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TArithmeticException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TArrayIndexOutOfBoundsException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TArrayIndexOutOfBoundsException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TArrayIndexOutOfBoundsException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TArrayIndexOutOfBoundsException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TArrayStoreException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TArrayStoreException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TArrayStoreException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TArrayStoreException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAssertionError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TAssertionError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAssertionError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TAssertionError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAutoCloseable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TAutoCloseable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAutoCloseable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TAutoCloseable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TByte.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TByte.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TByte.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TByte.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCharSequence.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TCharSequence.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCharSequence.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TCharSequence.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCharacter.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TCharacter.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCharacter.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TCharacter.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClassCastException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TClassCastException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClassCastException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TClassCastException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClassLoader.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TClassLoader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClassLoader.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TClassLoader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClassNotFoundException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TClassNotFoundException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClassNotFoundException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TClassNotFoundException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCloneNotSupportedException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TCloneNotSupportedException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCloneNotSupportedException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TCloneNotSupportedException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCloneable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TCloneable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TCloneable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TCloneable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStderr.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStderr.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStderr.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStderr.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStdout.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStdout.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStdout.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TConsoleOutputStreamStdout.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TDouble.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TDouble.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TDouble.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TDouble.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TFloat.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TFloat.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TFloat.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TFloat.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TFunctionalInterface.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TFunctionalInterface.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TFunctionalInterface.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TFunctionalInterface.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalAccessException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalAccessException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalAccessException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalAccessException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalArgumentException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalArgumentException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalArgumentException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalArgumentException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalMonitorStateException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalMonitorStateException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalMonitorStateException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalMonitorStateException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalStateException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalStateException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalStateException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIllegalStateException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIncompatibleClassChangeError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIncompatibleClassChangeError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIncompatibleClassChangeError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIncompatibleClassChangeError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIndexOutOfBoundsException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIndexOutOfBoundsException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIndexOutOfBoundsException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIndexOutOfBoundsException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInheritableThreadLocal.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TInheritableThreadLocal.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInheritableThreadLocal.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TInheritableThreadLocal.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInstantiationException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TInstantiationException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInstantiationException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TInstantiationException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInteger.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TInteger.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInteger.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TInteger.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInterruptedException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TInterruptedException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TInterruptedException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TInterruptedException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TLinkageError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TLinkageError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TLinkageError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TLinkageError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TLong.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TLong.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TLong.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TLong.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TMath.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TMath.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TMath.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TMath.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNegativeArraySizeException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNegativeArraySizeException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNegativeArraySizeException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNegativeArraySizeException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNoClassDefFoundError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNoClassDefFoundError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNoClassDefFoundError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNoClassDefFoundError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchFieldError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchFieldError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchFieldError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchFieldError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchMethodError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchMethodError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchMethodError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNoSuchMethodError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNullPointerException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNullPointerException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNullPointerException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNullPointerException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNumber.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNumber.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNumber.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNumber.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNumberFormatException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TNumberFormatException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TNumberFormatException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TNumberFormatException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TOutOfMemoryError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TOutOfMemoryError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TOutOfMemoryError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TOutOfMemoryError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TReadable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TReadable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TReadable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TReadable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TReflectiveOperationException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TReflectiveOperationException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TReflectiveOperationException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TReflectiveOperationException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TRunnable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TRunnable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TRunnable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TRunnable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TRuntime.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TRuntime.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TRuntime.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TRuntime.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TRuntimeException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TSecurityException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TSecurityException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TSecurityException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TSecurityException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TShort.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TShort.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TShort.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TShort.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStackTraceElement.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TStackTraceElement.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStackTraceElement.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TStackTraceElement.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStrictMath.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TStrictMath.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStrictMath.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TStrictMath.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TString.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TString.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TString.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TString.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuilder.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuilder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuilder.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TStringBuilder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStringIndexOutOfBoundsException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TStringIndexOutOfBoundsException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TStringIndexOutOfBoundsException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TStringIndexOutOfBoundsException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TSystem.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TSystem.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TSystem.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TSystem.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TSystemClassLoader.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TSystemClassLoader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TSystemClassLoader.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TSystemClassLoader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadInterruptHandler.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThreadInterruptHandler.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadInterruptHandler.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TThreadInterruptHandler.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TUnsupportedOperationException.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TUnsupportedOperationException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TUnsupportedOperationException.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TUnsupportedOperationException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TVirtualMachineError.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TVirtualMachineError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TVirtualMachineError.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TVirtualMachineError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TVoid.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TVoid.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TVoid.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/TVoid.java
diff --git a/teavm-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
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TAnnotation.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TAnnotation.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TElementType.java b/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TElementType.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TElementType.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TElementType.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetention.java b/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetention.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetention.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetention.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetentionPolicy.java b/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetentionPolicy.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetentionPolicy.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TRetentionPolicy.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TTarget.java b/classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TTarget.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TTarget.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/annotation/TTarget.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java b/classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java b/classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java b/classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/AnnotationDependencyListener.java b/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/AnnotationDependencyListener.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/AnnotationDependencyListener.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/reflect/AnnotationDependencyListener.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java b/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TAnnotatedElement.java b/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TAnnotatedElement.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TAnnotatedElement.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TAnnotatedElement.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TArray.java b/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/lang/reflect/TArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java b/classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java b/classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java b/classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TConversion.java b/classlib/src/main/java/org/teavm/classlib/java/math/TConversion.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TConversion.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TConversion.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java b/classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TElementary.java b/classlib/src/main/java/org/teavm/classlib/java/math/TElementary.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TElementary.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TElementary.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TLogical.java b/classlib/src/main/java/org/teavm/classlib/java/math/TLogical.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TLogical.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TLogical.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java b/classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java b/classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java b/classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/math/TRoundingMode.java b/classlib/src/main/java/org/teavm/classlib/java/math/TRoundingMode.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/math/TRoundingMode.java
rename to classlib/src/main/java/org/teavm/classlib/java/math/TRoundingMode.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/net/TURI.java b/classlib/src/main/java/org/teavm/classlib/java/net/TURI.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/net/TURI.java
rename to classlib/src/main/java/org/teavm/classlib/java/net/TURI.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/net/TURIEncoderDecoder.java b/classlib/src/main/java/org/teavm/classlib/java/net/TURIEncoderDecoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/net/TURIEncoderDecoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/net/TURIEncoderDecoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java b/classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java
rename to classlib/src/main/java/org/teavm/classlib/java/net/TURISyntaxException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TBufferOverflowException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TBufferOverflowException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TBufferOverflowException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TBufferOverflowException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TBufferUnderflowException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TBufferUnderflowException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TBufferUnderflowException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TBufferUnderflowException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TByteBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TByteBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TByteBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TByteBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TByteOrder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TByteOrder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TByteOrder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TByteOrder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TCharBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TCharBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverArray.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferBigEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferBigEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferBigEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferBigEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferLittleEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferLittleEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferLittleEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TCharBufferOverByteBufferLittleEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverArray.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TDoubleBufferOverByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverArray.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferBigEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferBigEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferBigEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferBigEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferLittleEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferLittleEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferLittleEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TFloatBufferOverByteBufferLittleEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TIntBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TIntBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverArray.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferBigEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferBigEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferBigEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferBigEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferLittleEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferLittleEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferLittleEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TIntBufferOverByteBufferLittleEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TInvalidMarkException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TInvalidMarkException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TInvalidMarkException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TInvalidMarkException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TLongBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TLongBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverArray.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferBigEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferBigEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferBigEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferBigEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferLittleEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferLittleEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferLittleEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TLongBufferOverByteBufferLittleEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TReadOnlyBufferException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TReadOnlyBufferException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TReadOnlyBufferException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TReadOnlyBufferException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TShortBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TShortBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferImpl.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverArray.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverArray.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverArray.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverArray.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBuffer.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBuffer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBuffer.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBuffer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferBigEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferBigEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferBigEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferBigEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferLittleEndian.java b/classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferLittleEndian.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferLittleEndian.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/TShortBufferOverByteBufferLittleEndian.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferOverflowException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferOverflowException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferOverflowException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferOverflowException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferUnderflowException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferUnderflowException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferUnderflowException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TBufferUnderflowException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharacterCodingException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharacterCodingException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharacterCodingException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharacterCodingException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharset.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharset.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharset.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharset.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetDecoder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetDecoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetDecoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetDecoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetEncoder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetEncoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetEncoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCharsetEncoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderMalfunctionError.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderMalfunctionError.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderMalfunctionError.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderMalfunctionError.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderResult.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderResult.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderResult.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCoderResult.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCodingErrorAction.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCodingErrorAction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCodingErrorAction.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TCodingErrorAction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TIllegalCharsetNameException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TIllegalCharsetNameException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TIllegalCharsetNameException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TIllegalCharsetNameException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TMalformedInputException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TMalformedInputException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TMalformedInputException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TMalformedInputException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnmappableCharacterException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnmappableCharacterException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnmappableCharacterException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnmappableCharacterException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnsupportedCharsetException.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnsupportedCharsetException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnsupportedCharsetException.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/TUnsupportedCharsetException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedDecoder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedDecoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedDecoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedDecoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedEncoder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedEncoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedEncoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TBufferedEncoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Charset.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Charset.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Charset.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Charset.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Decoder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Decoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Decoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Decoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Encoder.java b/classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Encoder.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Encoder.java
rename to classlib/src/main/java/org/teavm/classlib/java/nio/charset/impl/TUTF8Encoder.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/security/TAccessControlException.java b/classlib/src/main/java/org/teavm/classlib/java/security/TAccessControlException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/security/TAccessControlException.java
rename to classlib/src/main/java/org/teavm/classlib/java/security/TAccessControlException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/security/TGuard.java b/classlib/src/main/java/org/teavm/classlib/java/security/TGuard.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/security/TGuard.java
rename to classlib/src/main/java/org/teavm/classlib/java/security/TGuard.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/security/TPermission.java b/classlib/src/main/java/org/teavm/classlib/java/security/TPermission.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/security/TPermission.java
rename to classlib/src/main/java/org/teavm/classlib/java/security/TPermission.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TAnnotation.java b/classlib/src/main/java/org/teavm/classlib/java/text/TAnnotation.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TAnnotation.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TAnnotation.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java b/classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TAttributedString.java b/classlib/src/main/java/org/teavm/classlib/java/text/TAttributedString.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TAttributedString.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TAttributedString.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TCharacterIterator.java b/classlib/src/main/java/org/teavm/classlib/java/text/TCharacterIterator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TCharacterIterator.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TCharacterIterator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormat.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormat.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormat.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TDateFormat.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatSymbols.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatSymbols.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatSymbols.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatSymbols.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatParser.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatParser.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatParser.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatParser.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatSymbols.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatSymbols.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatSymbols.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormatSymbols.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TFieldPosition.java b/classlib/src/main/java/org/teavm/classlib/java/text/TFieldPosition.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TFieldPosition.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TFieldPosition.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TFormat.java b/classlib/src/main/java/org/teavm/classlib/java/text/TFormat.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TFormat.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TFormat.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TNumberFormat.java b/classlib/src/main/java/org/teavm/classlib/java/text/TNumberFormat.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TNumberFormat.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TNumberFormat.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TParseException.java b/classlib/src/main/java/org/teavm/classlib/java/text/TParseException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TParseException.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TParseException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TParsePosition.java b/classlib/src/main/java/org/teavm/classlib/java/text/TParsePosition.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TParsePosition.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TParsePosition.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDateFormat.java b/classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDateFormat.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDateFormat.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDateFormat.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDatePatternParser.java b/classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDatePatternParser.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDatePatternParser.java
rename to classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDatePatternParser.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java b/classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrays.java b/classlib/src/main/java/org/teavm/classlib/java/util/TArrays.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrays.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TArrays.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TBitSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedCollection.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCheckedCollection.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedCollection.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCheckedCollection.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCheckedList.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedList.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCheckedList.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedListIterator.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCheckedListIterator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedListIterator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCheckedListIterator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCheckedMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCheckedMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCheckedSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCheckedSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCheckedSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java b/classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TConcurrentModificationException.java b/classlib/src/main/java/org/teavm/classlib/java/util/TConcurrentModificationException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TConcurrentModificationException.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TConcurrentModificationException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCurrency.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCurrency.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCurrency.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TCurrency.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDate.java b/classlib/src/main/java/org/teavm/classlib/java/util/TDate.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDate.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TDate.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java b/classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDictionary.java b/classlib/src/main/java/org/teavm/classlib/java/util/TDictionary.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDictionary.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TDictionary.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java b/classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TGregorianCalendar.java b/classlib/src/main/java/org/teavm/classlib/java/util/TGregorianCalendar.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TGregorianCalendar.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TGregorianCalendar.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/THashMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java b/classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIANATimeZone.java b/classlib/src/main/java/org/teavm/classlib/java/util/TIANATimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIANATimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TIANATimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java b/classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TLinkedHashSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TList.java b/classlib/src/main/java/org/teavm/classlib/java/util/TList.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TList.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TList.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java b/classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLocale.java b/classlib/src/main/java/org/teavm/classlib/java/util/TLocale.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLocale.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TLocale.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMapEntry.java b/classlib/src/main/java/org/teavm/classlib/java/util/TMapEntry.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMapEntry.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TMapEntry.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMissingResourceException.java b/classlib/src/main/java/org/teavm/classlib/java/util/TMissingResourceException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMissingResourceException.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TMissingResourceException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNoSuchElementException.java b/classlib/src/main/java/org/teavm/classlib/java/util/TNoSuchElementException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNoSuchElementException.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TNoSuchElementException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TObjects.java b/classlib/src/main/java/org/teavm/classlib/java/util/TObjects.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TObjects.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TObjects.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TObservable.java b/classlib/src/main/java/org/teavm/classlib/java/util/TObservable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TObservable.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TObservable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java b/classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java b/classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java b/classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TRandom.java b/classlib/src/main/java/org/teavm/classlib/java/util/TRandom.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TRandom.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TRandom.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TRandomAccess.java b/classlib/src/main/java/org/teavm/classlib/java/util/TRandomAccess.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TRandomAccess.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TRandomAccess.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java b/classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TStringTokenizer.java b/classlib/src/main/java/org/teavm/classlib/java/util/TStringTokenizer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TStringTokenizer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TStringTokenizer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimer.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTimer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TTimer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimerTask.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTimerTask.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimerTask.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TTimerTask.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TVector.java b/classlib/src/main/java/org/teavm/classlib/java/util/TVector.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/TVector.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/TVector.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java b/classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TExecutor.java b/classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TExecutor.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TExecutor.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TExecutor.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TLinkedBlockingDeque.java b/classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TLinkedBlockingDeque.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TLinkedBlockingDeque.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TLinkedBlockingDeque.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBiConsumer.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TBiConsumer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBiConsumer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TBiConsumer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBiFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TBiFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBiFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TBiFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBiPredicate.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TBiPredicate.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBiPredicate.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TBiPredicate.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBinaryOperator.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TBinaryOperator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBinaryOperator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TBinaryOperator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBooleanSupplier.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TBooleanSupplier.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TBooleanSupplier.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TBooleanSupplier.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TConsumer.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TConsumer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TConsumer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TConsumer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleBinaryOperator.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleBinaryOperator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleBinaryOperator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleBinaryOperator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleConsumer.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleConsumer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleConsumer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleConsumer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoublePredicate.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoublePredicate.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoublePredicate.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoublePredicate.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleSupplier.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleSupplier.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleSupplier.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleSupplier.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToIntFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToIntFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToIntFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToIntFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToLongFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToLongFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToLongFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleToLongFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleUnaryOperator.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleUnaryOperator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleUnaryOperator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TDoubleUnaryOperator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntBinaryOperator.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntBinaryOperator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntBinaryOperator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntBinaryOperator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntConsumer.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntConsumer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntConsumer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntConsumer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntPredicate.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntPredicate.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntPredicate.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntPredicate.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntSupplier.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntSupplier.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntSupplier.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntSupplier.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToDoubleFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToDoubleFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToDoubleFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToDoubleFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToLongFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToLongFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToLongFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntToLongFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntUnaryOperator.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TIntUnaryOperator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TIntUnaryOperator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TIntUnaryOperator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TPredicate.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TPredicate.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TPredicate.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TPredicate.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TSupplier.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TSupplier.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TSupplier.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TSupplier.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TToDoubleFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TToDoubleFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TToDoubleFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TToDoubleFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TToIntFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TToIntFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TToIntFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TToIntFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TToLongFunction.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TToLongFunction.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TToLongFunction.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TToLongFunction.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TUnaryOperator.java b/classlib/src/main/java/org/teavm/classlib/java/util/function/TUnaryOperator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/function/TUnaryOperator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/function/TUnaryOperator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/logging/TLevel.java b/classlib/src/main/java/org/teavm/classlib/java/util/logging/TLevel.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/logging/TLevel.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/logging/TLevel.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogRecord.java b/classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogRecord.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogRecord.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogRecord.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogger.java b/classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogger.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogger.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/logging/TLogger.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractLineTerminator.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractLineTerminator.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractLineTerminator.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractLineTerminator.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAheadFSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAheadFSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAheadFSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAheadFSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAltQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicFSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicFSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicFSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicFSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicJointSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicJointSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicJointSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TAtomicJointSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferenceSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferenceSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferenceSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferenceSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferencedSingleSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferencedSingleSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferencedSingleSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TBackReferencedSingleSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TBehindFSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TBehindFSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TBehindFSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TBehindFSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIBackReferenceSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIBackReferenceSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIBackReferenceSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIBackReferenceSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCICharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCICharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCICharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCICharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIDecomposedCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIDecomposedCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIDecomposedCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCIDecomposedCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCISequenceSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCISequenceSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCISequenceSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCISequenceSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeRangeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeRangeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeRangeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeRangeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDecomposedCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TDecomposedCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDecomposedCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TDecomposedCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotAllSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TDotSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOISet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOISet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOISet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOISet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOLSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOLSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOLSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TEOLSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TEmptySet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TEmptySet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TEmptySet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TEmptySet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TFSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TFSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TFSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TFSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TFinalSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TFinalSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TFinalSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TFinalSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/THangulDecomposedCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/THangulDecomposedCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/THangulDecomposedCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/THangulDecomposedCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/THighSurrogateCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/THighSurrogateCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/THighSurrogateCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/THighSurrogateCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntArrHash.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntArrHash.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntArrHash.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntArrHash.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntHash.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntHash.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntHash.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TIntHash.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TJointSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TJointSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TJointSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TJointSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowHighSurrogateRangeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowHighSurrogateRangeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowHighSurrogateRangeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowHighSurrogateRangeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowSurrogateCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowSurrogateCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowSurrogateCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TLowSurrogateCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResult.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResult.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResult.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResult.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResultImpl.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResultImpl.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResultImpl.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatchResultImpl.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineEOLSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineEOLSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineEOLSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineEOLSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineSOLSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineSOLSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineSOLSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TMultiLineSOLSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookAhead.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookAhead.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookAhead.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookAhead.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookBehind.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookBehind.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookBehind.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TNegativeLookBehind.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapFSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapFSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapFSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapFSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapJointSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapJointSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapJointSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TNonCapJointSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPatternSyntaxException.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPatternSyntaxException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPatternSyntaxException.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPatternSyntaxException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosCompositeGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosCompositeGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosCompositeGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosCompositeGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookAhead.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookAhead.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookAhead.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookAhead.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookBehind.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookBehind.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookBehind.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPositiveLookBehind.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveAltQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveAltQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveAltQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveAltQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveCompositeQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveCompositeQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveCompositeQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveCompositeQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPossessiveQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPreviousMatch.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPreviousMatch.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TPreviousMatch.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TPreviousMatch.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifier.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifier.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifier.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifier.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TRangeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TRangeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TRangeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TRangeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelAltGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelAltGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelAltGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelAltGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelCompositeGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelCompositeGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelCompositeGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TRelCompositeGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantAltQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantAltQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantAltQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantAltQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantCompositeQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantCompositeQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantCompositeQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantCompositeQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantGroupQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantGroupQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantGroupQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSOLSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSOLSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSOLSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TSOLSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSequenceSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSequenceSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSequenceSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TSequenceSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSingleSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSingleSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSingleSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TSingleSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplRangeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplRangeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplRangeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TSupplRangeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIBackReferenceSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIBackReferenceSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIBackReferenceSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIBackReferenceSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCICharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCICharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCICharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCICharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIDecomposedCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIDecomposedCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIDecomposedCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIDecomposedCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIRangeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIRangeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIRangeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCIRangeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISequenceSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISequenceSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISequenceSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISequenceSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplCharSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplCharSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplCharSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplCharSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplRangeSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplRangeSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplRangeSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUCISupplRangeSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUEOLSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUEOLSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUEOLSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUEOLSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUMultiLineEOLSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUMultiLineEOLSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUMultiLineEOLSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUMultiLineEOLSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategory.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategory.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategory.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategory.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategoryScope.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategoryScope.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategoryScope.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnicodeCategoryScope.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnifiedQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnifiedQuantifierSet.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnifiedQuantifierSet.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TUnifiedQuantifierSet.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TWordBoundary.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TWordBoundary.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TWordBoundary.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/regex/TWordBoundary.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TDataFormatException.java b/classlib/src/main/java/org/teavm/classlib/java/util/zip/TDataFormatException.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TDataFormatException.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/zip/TDataFormatException.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TDeflaterOutputStream.java b/classlib/src/main/java/org/teavm/classlib/java/util/zip/TDeflaterOutputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TDeflaterOutputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/zip/TDeflaterOutputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPInputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPOutputStream.java b/classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPOutputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPOutputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/zip/TGZIPOutputStream.java
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TInflaterInputStream.java b/classlib/src/main/java/org/teavm/classlib/java/util/zip/TInflaterInputStream.java
similarity index 100%
rename from teavm-classlib/src/main/java/org/teavm/classlib/java/util/zip/TInflaterInputStream.java
rename to classlib/src/main/java/org/teavm/classlib/java/util/zip/TInflaterInputStream.java
diff --git a/teavm-classlib/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/classlib/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
similarity index 100%
rename from teavm-classlib/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
rename to classlib/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
diff --git a/teavm-classlib/src/main/resources/META-INF/teavm.properties b/classlib/src/main/resources/META-INF/teavm.properties
similarity index 100%
rename from teavm-classlib/src/main/resources/META-INF/teavm.properties
rename to classlib/src/main/resources/META-INF/teavm.properties
diff --git a/teavm-classlib/src/main/resources/html/annotation_obj.png b/classlib/src/main/resources/html/annotation_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/annotation_obj.png
rename to classlib/src/main/resources/html/annotation_obj.png
diff --git a/teavm-classlib/src/main/resources/html/class_obj.png b/classlib/src/main/resources/html/class_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/class_obj.png
rename to classlib/src/main/resources/html/class_obj.png
diff --git a/teavm-classlib/src/main/resources/html/enum_obj.png b/classlib/src/main/resources/html/enum_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/enum_obj.png
rename to classlib/src/main/resources/html/enum_obj.png
diff --git a/teavm-classlib/src/main/resources/html/field_protected_obj.png b/classlib/src/main/resources/html/field_protected_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/field_protected_obj.png
rename to classlib/src/main/resources/html/field_protected_obj.png
diff --git a/teavm-classlib/src/main/resources/html/field_public_obj.png b/classlib/src/main/resources/html/field_public_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/field_public_obj.png
rename to classlib/src/main/resources/html/field_public_obj.png
diff --git a/teavm-classlib/src/main/resources/html/int_obj.png b/classlib/src/main/resources/html/int_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/int_obj.png
rename to classlib/src/main/resources/html/int_obj.png
diff --git a/teavm-classlib/src/main/resources/html/jcl-class.html b/classlib/src/main/resources/html/jcl-class.html
similarity index 100%
rename from teavm-classlib/src/main/resources/html/jcl-class.html
rename to classlib/src/main/resources/html/jcl-class.html
diff --git a/teavm-classlib/src/main/resources/html/jcl.css b/classlib/src/main/resources/html/jcl.css
similarity index 100%
rename from teavm-classlib/src/main/resources/html/jcl.css
rename to classlib/src/main/resources/html/jcl.css
diff --git a/teavm-classlib/src/main/resources/html/jcl.html b/classlib/src/main/resources/html/jcl.html
similarity index 100%
rename from teavm-classlib/src/main/resources/html/jcl.html
rename to classlib/src/main/resources/html/jcl.html
diff --git a/teavm-classlib/src/main/resources/html/methpro_obj.png b/classlib/src/main/resources/html/methpro_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/methpro_obj.png
rename to classlib/src/main/resources/html/methpro_obj.png
diff --git a/teavm-classlib/src/main/resources/html/methpub_obj.png b/classlib/src/main/resources/html/methpub_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/methpub_obj.png
rename to classlib/src/main/resources/html/methpub_obj.png
diff --git a/teavm-classlib/src/main/resources/html/package_obj.png b/classlib/src/main/resources/html/package_obj.png
similarity index 100%
rename from teavm-classlib/src/main/resources/html/package_obj.png
rename to classlib/src/main/resources/html/package_obj.png
diff --git a/teavm-classlib/src/main/resources/org/teavm/classlib/impl/currency/iso3166.csv b/classlib/src/main/resources/org/teavm/classlib/impl/currency/iso3166.csv
similarity index 100%
rename from teavm-classlib/src/main/resources/org/teavm/classlib/impl/currency/iso3166.csv
rename to classlib/src/main/resources/org/teavm/classlib/impl/currency/iso3166.csv
diff --git a/teavm-classlib/src/main/resources/org/teavm/classlib/impl/currency/iso4217.xml b/classlib/src/main/resources/org/teavm/classlib/impl/currency/iso4217.xml
similarity index 100%
rename from teavm-classlib/src/main/resources/org/teavm/classlib/impl/currency/iso4217.xml
rename to classlib/src/main/resources/org/teavm/classlib/impl/currency/iso4217.xml
diff --git a/teavm-classlib/src/main/resources/org/teavm/classlib/impl/tz/tzdata2015d.zip b/classlib/src/main/resources/org/teavm/classlib/impl/tz/tzdata2015d.zip
similarity index 100%
rename from teavm-classlib/src/main/resources/org/teavm/classlib/impl/tz/tzdata2015d.zip
rename to classlib/src/main/resources/org/teavm/classlib/impl/tz/tzdata2015d.zip
diff --git a/teavm-classlib/src/main/resources/org/teavm/classlib/impl/unicode/UnicodeData.txt b/classlib/src/main/resources/org/teavm/classlib/impl/unicode/UnicodeData.txt
similarity index 100%
rename from teavm-classlib/src/main/resources/org/teavm/classlib/impl/unicode/UnicodeData.txt
rename to classlib/src/main/resources/org/teavm/classlib/impl/unicode/UnicodeData.txt
diff --git a/teavm-classlib/src/main/resources/org/teavm/classlib/impl/unicode/cldr-json.zip b/classlib/src/main/resources/org/teavm/classlib/impl/unicode/cldr-json.zip
similarity index 100%
rename from teavm-classlib/src/main/resources/org/teavm/classlib/impl/unicode/cldr-json.zip
rename to classlib/src/main/resources/org/teavm/classlib/impl/unicode/cldr-json.zip
diff --git a/teavm-classlib/src/test/java/org/teavm/classlib/impl/Base46Test.java b/classlib/src/test/java/org/teavm/classlib/impl/Base46Test.java
similarity index 100%
rename from teavm-classlib/src/test/java/org/teavm/classlib/impl/Base46Test.java
rename to classlib/src/test/java/org/teavm/classlib/impl/Base46Test.java
diff --git a/teavm-classlib/src/test/java/org/teavm/classlib/impl/unicode/UnicodeSupportTest.java b/classlib/src/test/java/org/teavm/classlib/impl/unicode/UnicodeSupportTest.java
similarity index 100%
rename from teavm-classlib/src/test/java/org/teavm/classlib/impl/unicode/UnicodeSupportTest.java
rename to classlib/src/test/java/org/teavm/classlib/impl/unicode/UnicodeSupportTest.java
diff --git a/teavm-core/pom.xml b/core/pom.xml
similarity index 100%
rename from teavm-core/pom.xml
rename to core/pom.xml
diff --git a/teavm-core/src/main/java/org/teavm/cache/AstIO.java b/core/src/main/java/org/teavm/cache/AstIO.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/AstIO.java
rename to core/src/main/java/org/teavm/cache/AstIO.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/AsyncMethodExtractor.java b/core/src/main/java/org/teavm/cache/AsyncMethodExtractor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/AsyncMethodExtractor.java
rename to core/src/main/java/org/teavm/cache/AsyncMethodExtractor.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/DiskCachedClassHolderSource.java b/core/src/main/java/org/teavm/cache/DiskCachedClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/DiskCachedClassHolderSource.java
rename to core/src/main/java/org/teavm/cache/DiskCachedClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/DiskProgramCache.java b/core/src/main/java/org/teavm/cache/DiskProgramCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/DiskProgramCache.java
rename to core/src/main/java/org/teavm/cache/DiskProgramCache.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/DiskRegularMethodNodeCache.java b/core/src/main/java/org/teavm/cache/DiskRegularMethodNodeCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/DiskRegularMethodNodeCache.java
rename to core/src/main/java/org/teavm/cache/DiskRegularMethodNodeCache.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/FileNameEncoder.java b/core/src/main/java/org/teavm/cache/FileNameEncoder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/FileNameEncoder.java
rename to core/src/main/java/org/teavm/cache/FileNameEncoder.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/FileSymbolTable.java b/core/src/main/java/org/teavm/cache/FileSymbolTable.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/FileSymbolTable.java
rename to core/src/main/java/org/teavm/cache/FileSymbolTable.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/NoCache.java b/core/src/main/java/org/teavm/cache/NoCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/NoCache.java
rename to core/src/main/java/org/teavm/cache/NoCache.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/ProgramIO.java b/core/src/main/java/org/teavm/cache/ProgramIO.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/ProgramIO.java
rename to core/src/main/java/org/teavm/cache/ProgramIO.java
diff --git a/teavm-core/src/main/java/org/teavm/cache/SymbolTable.java b/core/src/main/java/org/teavm/cache/SymbolTable.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/cache/SymbolTable.java
rename to core/src/main/java/org/teavm/cache/SymbolTable.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/CallGraph.java b/core/src/main/java/org/teavm/callgraph/CallGraph.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/CallGraph.java
rename to core/src/main/java/org/teavm/callgraph/CallGraph.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/CallGraphNode.java b/core/src/main/java/org/teavm/callgraph/CallGraphNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/CallGraphNode.java
rename to core/src/main/java/org/teavm/callgraph/CallGraphNode.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/CallSite.java b/core/src/main/java/org/teavm/callgraph/CallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/CallSite.java
rename to core/src/main/java/org/teavm/callgraph/CallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/ClassAccessSite.java b/core/src/main/java/org/teavm/callgraph/ClassAccessSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/ClassAccessSite.java
rename to core/src/main/java/org/teavm/callgraph/ClassAccessSite.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/DefaultCallGraph.java b/core/src/main/java/org/teavm/callgraph/DefaultCallGraph.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/DefaultCallGraph.java
rename to core/src/main/java/org/teavm/callgraph/DefaultCallGraph.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/DefaultCallGraphNode.java b/core/src/main/java/org/teavm/callgraph/DefaultCallGraphNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/DefaultCallGraphNode.java
rename to core/src/main/java/org/teavm/callgraph/DefaultCallGraphNode.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/DefaultCallSite.java b/core/src/main/java/org/teavm/callgraph/DefaultCallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/DefaultCallSite.java
rename to core/src/main/java/org/teavm/callgraph/DefaultCallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/DefaultClassAccessSite.java b/core/src/main/java/org/teavm/callgraph/DefaultClassAccessSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/DefaultClassAccessSite.java
rename to core/src/main/java/org/teavm/callgraph/DefaultClassAccessSite.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/DefaultFieldAccessSite.java b/core/src/main/java/org/teavm/callgraph/DefaultFieldAccessSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/DefaultFieldAccessSite.java
rename to core/src/main/java/org/teavm/callgraph/DefaultFieldAccessSite.java
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/FieldAccessSite.java b/core/src/main/java/org/teavm/callgraph/FieldAccessSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/callgraph/FieldAccessSite.java
rename to core/src/main/java/org/teavm/callgraph/FieldAccessSite.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/AliasProvider.java b/core/src/main/java/org/teavm/codegen/AliasProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/AliasProvider.java
rename to core/src/main/java/org/teavm/codegen/AliasProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/DefaultAliasProvider.java b/core/src/main/java/org/teavm/codegen/DefaultAliasProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/DefaultAliasProvider.java
rename to core/src/main/java/org/teavm/codegen/DefaultAliasProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/DefaultNamingStrategy.java b/core/src/main/java/org/teavm/codegen/DefaultNamingStrategy.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/DefaultNamingStrategy.java
rename to core/src/main/java/org/teavm/codegen/DefaultNamingStrategy.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/LocationProvider.java b/core/src/main/java/org/teavm/codegen/LocationProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/LocationProvider.java
rename to core/src/main/java/org/teavm/codegen/LocationProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/MinifyingAliasProvider.java b/core/src/main/java/org/teavm/codegen/MinifyingAliasProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/MinifyingAliasProvider.java
rename to core/src/main/java/org/teavm/codegen/MinifyingAliasProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/NameFrequencyConsumer.java b/core/src/main/java/org/teavm/codegen/NameFrequencyConsumer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/NameFrequencyConsumer.java
rename to core/src/main/java/org/teavm/codegen/NameFrequencyConsumer.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/NamingException.java b/core/src/main/java/org/teavm/codegen/NamingException.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/NamingException.java
rename to core/src/main/java/org/teavm/codegen/NamingException.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/NamingOrderer.java b/core/src/main/java/org/teavm/codegen/NamingOrderer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/NamingOrderer.java
rename to core/src/main/java/org/teavm/codegen/NamingOrderer.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/NamingStrategy.java b/core/src/main/java/org/teavm/codegen/NamingStrategy.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/NamingStrategy.java
rename to core/src/main/java/org/teavm/codegen/NamingStrategy.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java b/core/src/main/java/org/teavm/codegen/SourceWriter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java
rename to core/src/main/java/org/teavm/codegen/SourceWriter.java
diff --git a/teavm-core/src/main/java/org/teavm/codegen/SourceWriterBuilder.java b/core/src/main/java/org/teavm/codegen/SourceWriterBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/codegen/SourceWriterBuilder.java
rename to core/src/main/java/org/teavm/codegen/SourceWriterBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/common/CachedMapper.java b/core/src/main/java/org/teavm/common/CachedMapper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/CachedMapper.java
rename to core/src/main/java/org/teavm/common/CachedMapper.java
diff --git a/teavm-core/src/main/java/org/teavm/common/CommutatedWriter.java b/core/src/main/java/org/teavm/common/CommutatedWriter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/CommutatedWriter.java
rename to core/src/main/java/org/teavm/common/CommutatedWriter.java
diff --git a/teavm-core/src/main/java/org/teavm/common/DJGraph.java b/core/src/main/java/org/teavm/common/DJGraph.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/DJGraph.java
rename to core/src/main/java/org/teavm/common/DJGraph.java
diff --git a/teavm-core/src/main/java/org/teavm/common/DefaultDominatorTree.java b/core/src/main/java/org/teavm/common/DefaultDominatorTree.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/DefaultDominatorTree.java
rename to core/src/main/java/org/teavm/common/DefaultDominatorTree.java
diff --git a/teavm-core/src/main/java/org/teavm/common/DefaultGraphSplittingBackend.java b/core/src/main/java/org/teavm/common/DefaultGraphSplittingBackend.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/DefaultGraphSplittingBackend.java
rename to core/src/main/java/org/teavm/common/DefaultGraphSplittingBackend.java
diff --git a/teavm-core/src/main/java/org/teavm/common/DisjointSet.java b/core/src/main/java/org/teavm/common/DisjointSet.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/DisjointSet.java
rename to core/src/main/java/org/teavm/common/DisjointSet.java
diff --git a/teavm-core/src/main/java/org/teavm/common/DominatorTree.java b/core/src/main/java/org/teavm/common/DominatorTree.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/DominatorTree.java
rename to core/src/main/java/org/teavm/common/DominatorTree.java
diff --git a/teavm-core/src/main/java/org/teavm/common/DominatorTreeBuilder.java b/core/src/main/java/org/teavm/common/DominatorTreeBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/DominatorTreeBuilder.java
rename to core/src/main/java/org/teavm/common/DominatorTreeBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/common/FiniteExecutor.java b/core/src/main/java/org/teavm/common/FiniteExecutor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/FiniteExecutor.java
rename to core/src/main/java/org/teavm/common/FiniteExecutor.java
diff --git a/teavm-core/src/main/java/org/teavm/common/Graph.java b/core/src/main/java/org/teavm/common/Graph.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/Graph.java
rename to core/src/main/java/org/teavm/common/Graph.java
diff --git a/teavm-core/src/main/java/org/teavm/common/GraphBuilder.java b/core/src/main/java/org/teavm/common/GraphBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/GraphBuilder.java
rename to core/src/main/java/org/teavm/common/GraphBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/common/GraphIndexer.java b/core/src/main/java/org/teavm/common/GraphIndexer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/GraphIndexer.java
rename to core/src/main/java/org/teavm/common/GraphIndexer.java
diff --git a/teavm-core/src/main/java/org/teavm/common/GraphNodeFilter.java b/core/src/main/java/org/teavm/common/GraphNodeFilter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/GraphNodeFilter.java
rename to core/src/main/java/org/teavm/common/GraphNodeFilter.java
diff --git a/teavm-core/src/main/java/org/teavm/common/GraphSplittingBackend.java b/core/src/main/java/org/teavm/common/GraphSplittingBackend.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/GraphSplittingBackend.java
rename to core/src/main/java/org/teavm/common/GraphSplittingBackend.java
diff --git a/teavm-core/src/main/java/org/teavm/common/GraphUtils.java b/core/src/main/java/org/teavm/common/GraphUtils.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/GraphUtils.java
rename to core/src/main/java/org/teavm/common/GraphUtils.java
diff --git a/teavm-core/src/main/java/org/teavm/common/IntegerArray.java b/core/src/main/java/org/teavm/common/IntegerArray.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/IntegerArray.java
rename to core/src/main/java/org/teavm/common/IntegerArray.java
diff --git a/teavm-core/src/main/java/org/teavm/common/IntegerStack.java b/core/src/main/java/org/teavm/common/IntegerStack.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/IntegerStack.java
rename to core/src/main/java/org/teavm/common/IntegerStack.java
diff --git a/teavm-core/src/main/java/org/teavm/common/IrreducibleGraphConverter.java b/core/src/main/java/org/teavm/common/IrreducibleGraphConverter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/IrreducibleGraphConverter.java
rename to core/src/main/java/org/teavm/common/IrreducibleGraphConverter.java
diff --git a/teavm-core/src/main/java/org/teavm/common/LCATree.java b/core/src/main/java/org/teavm/common/LCATree.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/LCATree.java
rename to core/src/main/java/org/teavm/common/LCATree.java
diff --git a/teavm-core/src/main/java/org/teavm/common/Loop.java b/core/src/main/java/org/teavm/common/Loop.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/Loop.java
rename to core/src/main/java/org/teavm/common/Loop.java
diff --git a/teavm-core/src/main/java/org/teavm/common/LoopGraph.java b/core/src/main/java/org/teavm/common/LoopGraph.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/LoopGraph.java
rename to core/src/main/java/org/teavm/common/LoopGraph.java
diff --git a/teavm-core/src/main/java/org/teavm/common/Mapper.java b/core/src/main/java/org/teavm/common/Mapper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/Mapper.java
rename to core/src/main/java/org/teavm/common/Mapper.java
diff --git a/teavm-core/src/main/java/org/teavm/common/MutableDirectedGraph.java b/core/src/main/java/org/teavm/common/MutableDirectedGraph.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/MutableDirectedGraph.java
rename to core/src/main/java/org/teavm/common/MutableDirectedGraph.java
diff --git a/teavm-core/src/main/java/org/teavm/common/MutableGraphEdge.java b/core/src/main/java/org/teavm/common/MutableGraphEdge.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/MutableGraphEdge.java
rename to core/src/main/java/org/teavm/common/MutableGraphEdge.java
diff --git a/teavm-core/src/main/java/org/teavm/common/MutableGraphNode.java b/core/src/main/java/org/teavm/common/MutableGraphNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/MutableGraphNode.java
rename to core/src/main/java/org/teavm/common/MutableGraphNode.java
diff --git a/teavm-core/src/main/java/org/teavm/common/RangeTree.java b/core/src/main/java/org/teavm/common/RangeTree.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/RangeTree.java
rename to core/src/main/java/org/teavm/common/RangeTree.java
diff --git a/teavm-core/src/main/java/org/teavm/common/RecordArray.java b/core/src/main/java/org/teavm/common/RecordArray.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/RecordArray.java
rename to core/src/main/java/org/teavm/common/RecordArray.java
diff --git a/teavm-core/src/main/java/org/teavm/common/RecordArrayBuilder.java b/core/src/main/java/org/teavm/common/RecordArrayBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/RecordArrayBuilder.java
rename to core/src/main/java/org/teavm/common/RecordArrayBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/common/ServiceRepository.java b/core/src/main/java/org/teavm/common/ServiceRepository.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/ServiceRepository.java
rename to core/src/main/java/org/teavm/common/ServiceRepository.java
diff --git a/teavm-core/src/main/java/org/teavm/common/SimpleFiniteExecutor.java b/core/src/main/java/org/teavm/common/SimpleFiniteExecutor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/SimpleFiniteExecutor.java
rename to core/src/main/java/org/teavm/common/SimpleFiniteExecutor.java
diff --git a/teavm-core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java b/core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java
rename to core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/Breakpoint.java b/core/src/main/java/org/teavm/debugging/Breakpoint.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/Breakpoint.java
rename to core/src/main/java/org/teavm/debugging/Breakpoint.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/CallFrame.java b/core/src/main/java/org/teavm/debugging/CallFrame.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/CallFrame.java
rename to core/src/main/java/org/teavm/debugging/CallFrame.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/Debugger.java b/core/src/main/java/org/teavm/debugging/Debugger.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/Debugger.java
rename to core/src/main/java/org/teavm/debugging/Debugger.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/DebuggerListener.java b/core/src/main/java/org/teavm/debugging/DebuggerListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/DebuggerListener.java
rename to core/src/main/java/org/teavm/debugging/DebuggerListener.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/PropertyMap.java b/core/src/main/java/org/teavm/debugging/PropertyMap.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/PropertyMap.java
rename to core/src/main/java/org/teavm/debugging/PropertyMap.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/Value.java b/core/src/main/java/org/teavm/debugging/Value.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/Value.java
rename to core/src/main/java/org/teavm/debugging/Value.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/Variable.java b/core/src/main/java/org/teavm/debugging/Variable.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/Variable.java
rename to core/src/main/java/org/teavm/debugging/Variable.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/VariableMap.java b/core/src/main/java/org/teavm/debugging/VariableMap.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/VariableMap.java
rename to core/src/main/java/org/teavm/debugging/VariableMap.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/ClassNameIterator.java b/core/src/main/java/org/teavm/debugging/information/ClassNameIterator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/ClassNameIterator.java
rename to core/src/main/java/org/teavm/debugging/information/ClassNameIterator.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebugInformation.java b/core/src/main/java/org/teavm/debugging/information/DebugInformation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebugInformation.java
rename to core/src/main/java/org/teavm/debugging/information/DebugInformation.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationBuilder.java b/core/src/main/java/org/teavm/debugging/information/DebugInformationBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationBuilder.java
rename to core/src/main/java/org/teavm/debugging/information/DebugInformationBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationEmitter.java b/core/src/main/java/org/teavm/debugging/information/DebugInformationEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationEmitter.java
rename to core/src/main/java/org/teavm/debugging/information/DebugInformationEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationProvider.java b/core/src/main/java/org/teavm/debugging/information/DebugInformationProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationProvider.java
rename to core/src/main/java/org/teavm/debugging/information/DebugInformationProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationReader.java b/core/src/main/java/org/teavm/debugging/information/DebugInformationReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationReader.java
rename to core/src/main/java/org/teavm/debugging/information/DebugInformationReader.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationWriter.java b/core/src/main/java/org/teavm/debugging/information/DebugInformationWriter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebugInformationWriter.java
rename to core/src/main/java/org/teavm/debugging/information/DebugInformationWriter.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebuggerCallSite.java b/core/src/main/java/org/teavm/debugging/information/DebuggerCallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebuggerCallSite.java
rename to core/src/main/java/org/teavm/debugging/information/DebuggerCallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebuggerCallSiteVisitor.java b/core/src/main/java/org/teavm/debugging/information/DebuggerCallSiteVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebuggerCallSiteVisitor.java
rename to core/src/main/java/org/teavm/debugging/information/DebuggerCallSiteVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebuggerStaticCallSite.java b/core/src/main/java/org/teavm/debugging/information/DebuggerStaticCallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebuggerStaticCallSite.java
rename to core/src/main/java/org/teavm/debugging/information/DebuggerStaticCallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DebuggerVirtualCallSite.java b/core/src/main/java/org/teavm/debugging/information/DebuggerVirtualCallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DebuggerVirtualCallSite.java
rename to core/src/main/java/org/teavm/debugging/information/DebuggerVirtualCallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DeferredCallSite.java b/core/src/main/java/org/teavm/debugging/information/DeferredCallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DeferredCallSite.java
rename to core/src/main/java/org/teavm/debugging/information/DeferredCallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/DummyDebugInformationEmitter.java b/core/src/main/java/org/teavm/debugging/information/DummyDebugInformationEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/DummyDebugInformationEmitter.java
rename to core/src/main/java/org/teavm/debugging/information/DummyDebugInformationEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/ExactMethodIterator.java b/core/src/main/java/org/teavm/debugging/information/ExactMethodIterator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/ExactMethodIterator.java
rename to core/src/main/java/org/teavm/debugging/information/ExactMethodIterator.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/FileNameIterator.java b/core/src/main/java/org/teavm/debugging/information/FileNameIterator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/FileNameIterator.java
rename to core/src/main/java/org/teavm/debugging/information/FileNameIterator.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java b/core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java
rename to core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/LineNumberIterator.java b/core/src/main/java/org/teavm/debugging/information/LineNumberIterator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/LineNumberIterator.java
rename to core/src/main/java/org/teavm/debugging/information/LineNumberIterator.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/MethodIterator.java b/core/src/main/java/org/teavm/debugging/information/MethodIterator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/MethodIterator.java
rename to core/src/main/java/org/teavm/debugging/information/MethodIterator.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/SourceLocation.java b/core/src/main/java/org/teavm/debugging/information/SourceLocation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/SourceLocation.java
rename to core/src/main/java/org/teavm/debugging/information/SourceLocation.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/SourceLocationIterator.java b/core/src/main/java/org/teavm/debugging/information/SourceLocationIterator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/SourceLocationIterator.java
rename to core/src/main/java/org/teavm/debugging/information/SourceLocationIterator.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/SourceMapsWriter.java b/core/src/main/java/org/teavm/debugging/information/SourceMapsWriter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/SourceMapsWriter.java
rename to core/src/main/java/org/teavm/debugging/information/SourceMapsWriter.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/information/URLDebugInformationProvider.java b/core/src/main/java/org/teavm/debugging/information/URLDebugInformationProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/information/URLDebugInformationProvider.java
rename to core/src/main/java/org/teavm/debugging/information/URLDebugInformationProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptBreakpoint.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptBreakpoint.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptBreakpoint.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptBreakpoint.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptCallFrame.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptCallFrame.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptCallFrame.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptCallFrame.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebugger.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebugger.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebugger.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebugger.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebuggerListener.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebuggerListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebuggerListener.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptDebuggerListener.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptLocation.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptLocation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptLocation.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptLocation.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptValue.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptValue.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptValue.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptValue.java
diff --git a/teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptVariable.java b/core/src/main/java/org/teavm/debugging/javascript/JavaScriptVariable.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/debugging/javascript/JavaScriptVariable.java
rename to core/src/main/java/org/teavm/debugging/javascript/JavaScriptVariable.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/AbstractDependencyListener.java b/core/src/main/java/org/teavm/dependency/AbstractDependencyListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/AbstractDependencyListener.java
rename to core/src/main/java/org/teavm/dependency/AbstractDependencyListener.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/BootstrapMethodSubstitutor.java b/core/src/main/java/org/teavm/dependency/BootstrapMethodSubstitutor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/BootstrapMethodSubstitutor.java
rename to core/src/main/java/org/teavm/dependency/BootstrapMethodSubstitutor.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/ClassDependency.java b/core/src/main/java/org/teavm/dependency/ClassDependency.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/ClassDependency.java
rename to core/src/main/java/org/teavm/dependency/ClassDependency.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/ClassDependencyInfo.java b/core/src/main/java/org/teavm/dependency/ClassDependencyInfo.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/ClassDependencyInfo.java
rename to core/src/main/java/org/teavm/dependency/ClassDependencyInfo.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DataFlowGraphBuilder.java b/core/src/main/java/org/teavm/dependency/DataFlowGraphBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DataFlowGraphBuilder.java
rename to core/src/main/java/org/teavm/dependency/DataFlowGraphBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyAgent.java b/core/src/main/java/org/teavm/dependency/DependencyAgent.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyAgent.java
rename to core/src/main/java/org/teavm/dependency/DependencyAgent.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyChecker.java b/core/src/main/java/org/teavm/dependency/DependencyChecker.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyChecker.java
rename to core/src/main/java/org/teavm/dependency/DependencyChecker.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyCheckerInterruptor.java b/core/src/main/java/org/teavm/dependency/DependencyCheckerInterruptor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyCheckerInterruptor.java
rename to core/src/main/java/org/teavm/dependency/DependencyCheckerInterruptor.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyClassSource.java b/core/src/main/java/org/teavm/dependency/DependencyClassSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyClassSource.java
rename to core/src/main/java/org/teavm/dependency/DependencyClassSource.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyConsumer.java b/core/src/main/java/org/teavm/dependency/DependencyConsumer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyConsumer.java
rename to core/src/main/java/org/teavm/dependency/DependencyConsumer.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java b/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java
rename to core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyGraphCreator.java b/core/src/main/java/org/teavm/dependency/DependencyGraphCreator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyGraphCreator.java
rename to core/src/main/java/org/teavm/dependency/DependencyGraphCreator.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProduct.java b/core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProduct.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProduct.java
rename to core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProduct.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProvider.java b/core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProvider.java
rename to core/src/main/java/org/teavm/dependency/DependencyGraphCreatorProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyInfo.java b/core/src/main/java/org/teavm/dependency/DependencyInfo.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyInfo.java
rename to core/src/main/java/org/teavm/dependency/DependencyInfo.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyListener.java b/core/src/main/java/org/teavm/dependency/DependencyListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyListener.java
rename to core/src/main/java/org/teavm/dependency/DependencyListener.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyNode.java b/core/src/main/java/org/teavm/dependency/DependencyNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyNode.java
rename to core/src/main/java/org/teavm/dependency/DependencyNode.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyNodeToNodeTransition.java b/core/src/main/java/org/teavm/dependency/DependencyNodeToNodeTransition.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyNodeToNodeTransition.java
rename to core/src/main/java/org/teavm/dependency/DependencyNodeToNodeTransition.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyPlugin.java b/core/src/main/java/org/teavm/dependency/DependencyPlugin.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyPlugin.java
rename to core/src/main/java/org/teavm/dependency/DependencyPlugin.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyType.java b/core/src/main/java/org/teavm/dependency/DependencyType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyType.java
rename to core/src/main/java/org/teavm/dependency/DependencyType.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DependencyTypeFilter.java b/core/src/main/java/org/teavm/dependency/DependencyTypeFilter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DependencyTypeFilter.java
rename to core/src/main/java/org/teavm/dependency/DependencyTypeFilter.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/DynamicCallSite.java b/core/src/main/java/org/teavm/dependency/DynamicCallSite.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/DynamicCallSite.java
rename to core/src/main/java/org/teavm/dependency/DynamicCallSite.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/FieldDependency.java b/core/src/main/java/org/teavm/dependency/FieldDependency.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/FieldDependency.java
rename to core/src/main/java/org/teavm/dependency/FieldDependency.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/FieldDependencyInfo.java b/core/src/main/java/org/teavm/dependency/FieldDependencyInfo.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/FieldDependencyInfo.java
rename to core/src/main/java/org/teavm/dependency/FieldDependencyInfo.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/Linker.java b/core/src/main/java/org/teavm/dependency/Linker.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/Linker.java
rename to core/src/main/java/org/teavm/dependency/Linker.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/MethodDependency.java b/core/src/main/java/org/teavm/dependency/MethodDependency.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/MethodDependency.java
rename to core/src/main/java/org/teavm/dependency/MethodDependency.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/MethodDependencyInfo.java b/core/src/main/java/org/teavm/dependency/MethodDependencyInfo.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/MethodDependencyInfo.java
rename to core/src/main/java/org/teavm/dependency/MethodDependencyInfo.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/PluggableDependency.java b/core/src/main/java/org/teavm/dependency/PluggableDependency.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/PluggableDependency.java
rename to core/src/main/java/org/teavm/dependency/PluggableDependency.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/TypePropagationListener.java b/core/src/main/java/org/teavm/dependency/TypePropagationListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/TypePropagationListener.java
rename to core/src/main/java/org/teavm/dependency/TypePropagationListener.java
diff --git a/teavm-core/src/main/java/org/teavm/dependency/ValueDependencyInfo.java b/core/src/main/java/org/teavm/dependency/ValueDependencyInfo.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/dependency/ValueDependencyInfo.java
rename to core/src/main/java/org/teavm/dependency/ValueDependencyInfo.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/AccumulationDiagnostics.java b/core/src/main/java/org/teavm/diagnostics/AccumulationDiagnostics.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/AccumulationDiagnostics.java
rename to core/src/main/java/org/teavm/diagnostics/AccumulationDiagnostics.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/DefaultProblemTextConsumer.java b/core/src/main/java/org/teavm/diagnostics/DefaultProblemTextConsumer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/DefaultProblemTextConsumer.java
rename to core/src/main/java/org/teavm/diagnostics/DefaultProblemTextConsumer.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/Diagnostics.java b/core/src/main/java/org/teavm/diagnostics/Diagnostics.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/Diagnostics.java
rename to core/src/main/java/org/teavm/diagnostics/Diagnostics.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/Problem.java b/core/src/main/java/org/teavm/diagnostics/Problem.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/Problem.java
rename to core/src/main/java/org/teavm/diagnostics/Problem.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/ProblemProvider.java b/core/src/main/java/org/teavm/diagnostics/ProblemProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/ProblemProvider.java
rename to core/src/main/java/org/teavm/diagnostics/ProblemProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/ProblemSeverity.java b/core/src/main/java/org/teavm/diagnostics/ProblemSeverity.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/ProblemSeverity.java
rename to core/src/main/java/org/teavm/diagnostics/ProblemSeverity.java
diff --git a/teavm-core/src/main/java/org/teavm/diagnostics/ProblemTextConsumer.java b/core/src/main/java/org/teavm/diagnostics/ProblemTextConsumer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/diagnostics/ProblemTextConsumer.java
rename to core/src/main/java/org/teavm/diagnostics/ProblemTextConsumer.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/AllBlocksCountVisitor.java b/core/src/main/java/org/teavm/javascript/AllBlocksCountVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/AllBlocksCountVisitor.java
rename to core/src/main/java/org/teavm/javascript/AllBlocksCountVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/Associativity.java b/core/src/main/java/org/teavm/javascript/Associativity.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/Associativity.java
rename to core/src/main/java/org/teavm/javascript/Associativity.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/AsyncCallsFinder.java b/core/src/main/java/org/teavm/javascript/AsyncCallsFinder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/AsyncCallsFinder.java
rename to core/src/main/java/org/teavm/javascript/AsyncCallsFinder.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/AsyncInvocationType.java b/core/src/main/java/org/teavm/javascript/AsyncInvocationType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/AsyncInvocationType.java
rename to core/src/main/java/org/teavm/javascript/AsyncInvocationType.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/BlockCountVisitor.java b/core/src/main/java/org/teavm/javascript/BlockCountVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/BlockCountVisitor.java
rename to core/src/main/java/org/teavm/javascript/BlockCountVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/BreakEliminator.java b/core/src/main/java/org/teavm/javascript/BreakEliminator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/BreakEliminator.java
rename to core/src/main/java/org/teavm/javascript/BreakEliminator.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/BreakToContinueReplacer.java b/core/src/main/java/org/teavm/javascript/BreakToContinueReplacer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/BreakToContinueReplacer.java
rename to core/src/main/java/org/teavm/javascript/BreakToContinueReplacer.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/DecompilationException.java b/core/src/main/java/org/teavm/javascript/DecompilationException.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/DecompilationException.java
rename to core/src/main/java/org/teavm/javascript/DecompilationException.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/Decompiler.java b/core/src/main/java/org/teavm/javascript/Decompiler.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/Decompiler.java
rename to core/src/main/java/org/teavm/javascript/Decompiler.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/EmptyRegularMethodNodeCache.java b/core/src/main/java/org/teavm/javascript/EmptyRegularMethodNodeCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/EmptyRegularMethodNodeCache.java
rename to core/src/main/java/org/teavm/javascript/EmptyRegularMethodNodeCache.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/EscapingStatementFinder.java b/core/src/main/java/org/teavm/javascript/EscapingStatementFinder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/EscapingStatementFinder.java
rename to core/src/main/java/org/teavm/javascript/EscapingStatementFinder.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ExprOptimizer.java b/core/src/main/java/org/teavm/javascript/ExprOptimizer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ExprOptimizer.java
rename to core/src/main/java/org/teavm/javascript/ExprOptimizer.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java b/core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java
rename to core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/MethodNodeCache.java b/core/src/main/java/org/teavm/javascript/MethodNodeCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/MethodNodeCache.java
rename to core/src/main/java/org/teavm/javascript/MethodNodeCache.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/NameFrequencyEstimator.java b/core/src/main/java/org/teavm/javascript/NameFrequencyEstimator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/NameFrequencyEstimator.java
rename to core/src/main/java/org/teavm/javascript/NameFrequencyEstimator.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/NullPointerExceptionTransformer.java b/core/src/main/java/org/teavm/javascript/NullPointerExceptionTransformer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/NullPointerExceptionTransformer.java
rename to core/src/main/java/org/teavm/javascript/NullPointerExceptionTransformer.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/Optimizer.java b/core/src/main/java/org/teavm/javascript/Optimizer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/Optimizer.java
rename to core/src/main/java/org/teavm/javascript/Optimizer.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/OptimizingVisitor.java b/core/src/main/java/org/teavm/javascript/OptimizingVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/OptimizingVisitor.java
rename to core/src/main/java/org/teavm/javascript/OptimizingVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/Priority.java b/core/src/main/java/org/teavm/javascript/Priority.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/Priority.java
rename to core/src/main/java/org/teavm/javascript/Priority.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ReadWriteStatsBuilder.java b/core/src/main/java/org/teavm/javascript/ReadWriteStatsBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ReadWriteStatsBuilder.java
rename to core/src/main/java/org/teavm/javascript/ReadWriteStatsBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/RedundantLabelEliminator.java b/core/src/main/java/org/teavm/javascript/RedundantLabelEliminator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/RedundantLabelEliminator.java
rename to core/src/main/java/org/teavm/javascript/RedundantLabelEliminator.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ReferenceCountingVisitor.java b/core/src/main/java/org/teavm/javascript/ReferenceCountingVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ReferenceCountingVisitor.java
rename to core/src/main/java/org/teavm/javascript/ReferenceCountingVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/Renderer.java b/core/src/main/java/org/teavm/javascript/Renderer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/Renderer.java
rename to core/src/main/java/org/teavm/javascript/Renderer.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/RenderingContext.java b/core/src/main/java/org/teavm/javascript/RenderingContext.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/RenderingContext.java
rename to core/src/main/java/org/teavm/javascript/RenderingContext.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/RenderingException.java b/core/src/main/java/org/teavm/javascript/RenderingException.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/RenderingException.java
rename to core/src/main/java/org/teavm/javascript/RenderingException.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/RuntimeSupport.java b/core/src/main/java/org/teavm/javascript/RuntimeSupport.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/RuntimeSupport.java
rename to core/src/main/java/org/teavm/javascript/RuntimeSupport.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/StatementGenerator.java b/core/src/main/java/org/teavm/javascript/StatementGenerator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/StatementGenerator.java
rename to core/src/main/java/org/teavm/javascript/StatementGenerator.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/TryCatchFinder.java b/core/src/main/java/org/teavm/javascript/TryCatchFinder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/TryCatchFinder.java
rename to core/src/main/java/org/teavm/javascript/TryCatchFinder.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/UnusedVariableEliminator.java b/core/src/main/java/org/teavm/javascript/UnusedVariableEliminator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/UnusedVariableEliminator.java
rename to core/src/main/java/org/teavm/javascript/UnusedVariableEliminator.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/AssignmentStatement.java b/core/src/main/java/org/teavm/javascript/ast/AssignmentStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/AssignmentStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/AssignmentStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/AsyncMethodNode.java b/core/src/main/java/org/teavm/javascript/ast/AsyncMethodNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/AsyncMethodNode.java
rename to core/src/main/java/org/teavm/javascript/ast/AsyncMethodNode.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/AsyncMethodPart.java b/core/src/main/java/org/teavm/javascript/ast/AsyncMethodPart.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/AsyncMethodPart.java
rename to core/src/main/java/org/teavm/javascript/ast/AsyncMethodPart.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/BinaryExpr.java b/core/src/main/java/org/teavm/javascript/ast/BinaryExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/BinaryExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/BinaryExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/BinaryOperation.java b/core/src/main/java/org/teavm/javascript/ast/BinaryOperation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/BinaryOperation.java
rename to core/src/main/java/org/teavm/javascript/ast/BinaryOperation.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/BlockStatement.java b/core/src/main/java/org/teavm/javascript/ast/BlockStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/BlockStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/BlockStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/BreakStatement.java b/core/src/main/java/org/teavm/javascript/ast/BreakStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/BreakStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/BreakStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ClassNode.java b/core/src/main/java/org/teavm/javascript/ast/ClassNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ClassNode.java
rename to core/src/main/java/org/teavm/javascript/ast/ClassNode.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ConditionalExpr.java b/core/src/main/java/org/teavm/javascript/ast/ConditionalExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ConditionalExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/ConditionalExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ConditionalStatement.java b/core/src/main/java/org/teavm/javascript/ast/ConditionalStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ConditionalStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/ConditionalStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ConstantExpr.java b/core/src/main/java/org/teavm/javascript/ast/ConstantExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ConstantExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/ConstantExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ContinueStatement.java b/core/src/main/java/org/teavm/javascript/ast/ContinueStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ContinueStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/ContinueStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/Expr.java b/core/src/main/java/org/teavm/javascript/ast/Expr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/Expr.java
rename to core/src/main/java/org/teavm/javascript/ast/Expr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ExprVisitor.java b/core/src/main/java/org/teavm/javascript/ast/ExprVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ExprVisitor.java
rename to core/src/main/java/org/teavm/javascript/ast/ExprVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/FieldNode.java b/core/src/main/java/org/teavm/javascript/ast/FieldNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/FieldNode.java
rename to core/src/main/java/org/teavm/javascript/ast/FieldNode.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/GotoPartStatement.java b/core/src/main/java/org/teavm/javascript/ast/GotoPartStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/GotoPartStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/GotoPartStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/IdentifiedStatement.java b/core/src/main/java/org/teavm/javascript/ast/IdentifiedStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/IdentifiedStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/IdentifiedStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/InitClassStatement.java b/core/src/main/java/org/teavm/javascript/ast/InitClassStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/InitClassStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/InitClassStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/InstanceOfExpr.java b/core/src/main/java/org/teavm/javascript/ast/InstanceOfExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/InstanceOfExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/InstanceOfExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/InvocationExpr.java b/core/src/main/java/org/teavm/javascript/ast/InvocationExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/InvocationExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/InvocationExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/InvocationType.java b/core/src/main/java/org/teavm/javascript/ast/InvocationType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/InvocationType.java
rename to core/src/main/java/org/teavm/javascript/ast/InvocationType.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/MethodNode.java b/core/src/main/java/org/teavm/javascript/ast/MethodNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/MethodNode.java
rename to core/src/main/java/org/teavm/javascript/ast/MethodNode.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/MethodNodeVisitor.java b/core/src/main/java/org/teavm/javascript/ast/MethodNodeVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/MethodNodeVisitor.java
rename to core/src/main/java/org/teavm/javascript/ast/MethodNodeVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/MonitorEnterStatement.java b/core/src/main/java/org/teavm/javascript/ast/MonitorEnterStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/MonitorEnterStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/MonitorEnterStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/MonitorExitStatement.java b/core/src/main/java/org/teavm/javascript/ast/MonitorExitStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/MonitorExitStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/MonitorExitStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/NativeMethodNode.java b/core/src/main/java/org/teavm/javascript/ast/NativeMethodNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/NativeMethodNode.java
rename to core/src/main/java/org/teavm/javascript/ast/NativeMethodNode.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/NewArrayExpr.java b/core/src/main/java/org/teavm/javascript/ast/NewArrayExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/NewArrayExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/NewArrayExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/NewExpr.java b/core/src/main/java/org/teavm/javascript/ast/NewExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/NewExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/NewExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/NewMultiArrayExpr.java b/core/src/main/java/org/teavm/javascript/ast/NewMultiArrayExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/NewMultiArrayExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/NewMultiArrayExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/NodeLocation.java b/core/src/main/java/org/teavm/javascript/ast/NodeLocation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/NodeLocation.java
rename to core/src/main/java/org/teavm/javascript/ast/NodeLocation.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/NodeModifier.java b/core/src/main/java/org/teavm/javascript/ast/NodeModifier.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/NodeModifier.java
rename to core/src/main/java/org/teavm/javascript/ast/NodeModifier.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/PrimitiveExpr.java b/core/src/main/java/org/teavm/javascript/ast/PrimitiveExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/PrimitiveExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/PrimitiveExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/QualificationExpr.java b/core/src/main/java/org/teavm/javascript/ast/QualificationExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/QualificationExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/QualificationExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/RegularMethodNode.java b/core/src/main/java/org/teavm/javascript/ast/RegularMethodNode.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/RegularMethodNode.java
rename to core/src/main/java/org/teavm/javascript/ast/RegularMethodNode.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/RenamingVisitor.java b/core/src/main/java/org/teavm/javascript/ast/RenamingVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/RenamingVisitor.java
rename to core/src/main/java/org/teavm/javascript/ast/RenamingVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ReturnStatement.java b/core/src/main/java/org/teavm/javascript/ast/ReturnStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ReturnStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/ReturnStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/SequentialStatement.java b/core/src/main/java/org/teavm/javascript/ast/SequentialStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/SequentialStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/SequentialStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/Statement.java b/core/src/main/java/org/teavm/javascript/ast/Statement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/Statement.java
rename to core/src/main/java/org/teavm/javascript/ast/Statement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/StatementVisitor.java b/core/src/main/java/org/teavm/javascript/ast/StatementVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/StatementVisitor.java
rename to core/src/main/java/org/teavm/javascript/ast/StatementVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/StaticClassExpr.java b/core/src/main/java/org/teavm/javascript/ast/StaticClassExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/StaticClassExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/StaticClassExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/SubscriptExpr.java b/core/src/main/java/org/teavm/javascript/ast/SubscriptExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/SubscriptExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/SubscriptExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/SwitchClause.java b/core/src/main/java/org/teavm/javascript/ast/SwitchClause.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/SwitchClause.java
rename to core/src/main/java/org/teavm/javascript/ast/SwitchClause.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/SwitchStatement.java b/core/src/main/java/org/teavm/javascript/ast/SwitchStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/SwitchStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/SwitchStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/ThrowStatement.java b/core/src/main/java/org/teavm/javascript/ast/ThrowStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/ThrowStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/ThrowStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/TryCatchStatement.java b/core/src/main/java/org/teavm/javascript/ast/TryCatchStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/TryCatchStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/TryCatchStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/UnaryExpr.java b/core/src/main/java/org/teavm/javascript/ast/UnaryExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/UnaryExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/UnaryExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/UnaryOperation.java b/core/src/main/java/org/teavm/javascript/ast/UnaryOperation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/UnaryOperation.java
rename to core/src/main/java/org/teavm/javascript/ast/UnaryOperation.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/UnwrapArrayExpr.java b/core/src/main/java/org/teavm/javascript/ast/UnwrapArrayExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/UnwrapArrayExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/UnwrapArrayExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/VariableExpr.java b/core/src/main/java/org/teavm/javascript/ast/VariableExpr.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/VariableExpr.java
rename to core/src/main/java/org/teavm/javascript/ast/VariableExpr.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/ast/WhileStatement.java b/core/src/main/java/org/teavm/javascript/ast/WhileStatement.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/ast/WhileStatement.java
rename to core/src/main/java/org/teavm/javascript/ast/WhileStatement.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Async.java b/core/src/main/java/org/teavm/javascript/spi/Async.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Async.java
rename to core/src/main/java/org/teavm/javascript/spi/Async.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/GeneratedBy.java b/core/src/main/java/org/teavm/javascript/spi/GeneratedBy.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/GeneratedBy.java
rename to core/src/main/java/org/teavm/javascript/spi/GeneratedBy.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Generator.java b/core/src/main/java/org/teavm/javascript/spi/Generator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Generator.java
rename to core/src/main/java/org/teavm/javascript/spi/Generator.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/GeneratorContext.java b/core/src/main/java/org/teavm/javascript/spi/GeneratorContext.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/GeneratorContext.java
rename to core/src/main/java/org/teavm/javascript/spi/GeneratorContext.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/InjectedBy.java b/core/src/main/java/org/teavm/javascript/spi/InjectedBy.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/InjectedBy.java
rename to core/src/main/java/org/teavm/javascript/spi/InjectedBy.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Injector.java b/core/src/main/java/org/teavm/javascript/spi/Injector.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Injector.java
rename to core/src/main/java/org/teavm/javascript/spi/Injector.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/InjectorContext.java b/core/src/main/java/org/teavm/javascript/spi/InjectorContext.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/InjectorContext.java
rename to core/src/main/java/org/teavm/javascript/spi/InjectorContext.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Remove.java b/core/src/main/java/org/teavm/javascript/spi/Remove.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Remove.java
rename to core/src/main/java/org/teavm/javascript/spi/Remove.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Rename.java b/core/src/main/java/org/teavm/javascript/spi/Rename.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Rename.java
rename to core/src/main/java/org/teavm/javascript/spi/Rename.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Superclass.java b/core/src/main/java/org/teavm/javascript/spi/Superclass.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Superclass.java
rename to core/src/main/java/org/teavm/javascript/spi/Superclass.java
diff --git a/teavm-core/src/main/java/org/teavm/javascript/spi/Sync.java b/core/src/main/java/org/teavm/javascript/spi/Sync.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/javascript/spi/Sync.java
rename to core/src/main/java/org/teavm/javascript/spi/Sync.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AccessLevel.java b/core/src/main/java/org/teavm/model/AccessLevel.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AccessLevel.java
rename to core/src/main/java/org/teavm/model/AccessLevel.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AnnotationContainer.java b/core/src/main/java/org/teavm/model/AnnotationContainer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AnnotationContainer.java
rename to core/src/main/java/org/teavm/model/AnnotationContainer.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AnnotationContainerReader.java b/core/src/main/java/org/teavm/model/AnnotationContainerReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AnnotationContainerReader.java
rename to core/src/main/java/org/teavm/model/AnnotationContainerReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AnnotationHolder.java b/core/src/main/java/org/teavm/model/AnnotationHolder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AnnotationHolder.java
rename to core/src/main/java/org/teavm/model/AnnotationHolder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AnnotationReader.java b/core/src/main/java/org/teavm/model/AnnotationReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AnnotationReader.java
rename to core/src/main/java/org/teavm/model/AnnotationReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AnnotationValue.java b/core/src/main/java/org/teavm/model/AnnotationValue.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AnnotationValue.java
rename to core/src/main/java/org/teavm/model/AnnotationValue.java
diff --git a/teavm-core/src/main/java/org/teavm/model/AsyncInformation.java b/core/src/main/java/org/teavm/model/AsyncInformation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/AsyncInformation.java
rename to core/src/main/java/org/teavm/model/AsyncInformation.java
diff --git a/teavm-core/src/main/java/org/teavm/model/BasicBlock.java b/core/src/main/java/org/teavm/model/BasicBlock.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/BasicBlock.java
rename to core/src/main/java/org/teavm/model/BasicBlock.java
diff --git a/teavm-core/src/main/java/org/teavm/model/BasicBlockReader.java b/core/src/main/java/org/teavm/model/BasicBlockReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/BasicBlockReader.java
rename to core/src/main/java/org/teavm/model/BasicBlockReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/CallLocation.java b/core/src/main/java/org/teavm/model/CallLocation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/CallLocation.java
rename to core/src/main/java/org/teavm/model/CallLocation.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ClassHolder.java b/core/src/main/java/org/teavm/model/ClassHolder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ClassHolder.java
rename to core/src/main/java/org/teavm/model/ClassHolder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ClassHolderSource.java b/core/src/main/java/org/teavm/model/ClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ClassHolderSource.java
rename to core/src/main/java/org/teavm/model/ClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ClassHolderTransformer.java b/core/src/main/java/org/teavm/model/ClassHolderTransformer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ClassHolderTransformer.java
rename to core/src/main/java/org/teavm/model/ClassHolderTransformer.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ClassReader.java b/core/src/main/java/org/teavm/model/ClassReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ClassReader.java
rename to core/src/main/java/org/teavm/model/ClassReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ClassReaderSource.java b/core/src/main/java/org/teavm/model/ClassReaderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ClassReaderSource.java
rename to core/src/main/java/org/teavm/model/ClassReaderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/CopyClassHolderSource.java b/core/src/main/java/org/teavm/model/CopyClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/CopyClassHolderSource.java
rename to core/src/main/java/org/teavm/model/CopyClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ElementHolder.java b/core/src/main/java/org/teavm/model/ElementHolder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ElementHolder.java
rename to core/src/main/java/org/teavm/model/ElementHolder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ElementModifier.java b/core/src/main/java/org/teavm/model/ElementModifier.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ElementModifier.java
rename to core/src/main/java/org/teavm/model/ElementModifier.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ElementReader.java b/core/src/main/java/org/teavm/model/ElementReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ElementReader.java
rename to core/src/main/java/org/teavm/model/ElementReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/FieldHolder.java b/core/src/main/java/org/teavm/model/FieldHolder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/FieldHolder.java
rename to core/src/main/java/org/teavm/model/FieldHolder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/FieldReader.java b/core/src/main/java/org/teavm/model/FieldReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/FieldReader.java
rename to core/src/main/java/org/teavm/model/FieldReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/FieldReference.java b/core/src/main/java/org/teavm/model/FieldReference.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/FieldReference.java
rename to core/src/main/java/org/teavm/model/FieldReference.java
diff --git a/teavm-core/src/main/java/org/teavm/model/InMemoryProgramCache.java b/core/src/main/java/org/teavm/model/InMemoryProgramCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/InMemoryProgramCache.java
rename to core/src/main/java/org/teavm/model/InMemoryProgramCache.java
diff --git a/teavm-core/src/main/java/org/teavm/model/Incoming.java b/core/src/main/java/org/teavm/model/Incoming.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/Incoming.java
rename to core/src/main/java/org/teavm/model/Incoming.java
diff --git a/teavm-core/src/main/java/org/teavm/model/IncomingReader.java b/core/src/main/java/org/teavm/model/IncomingReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/IncomingReader.java
rename to core/src/main/java/org/teavm/model/IncomingReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/Instruction.java b/core/src/main/java/org/teavm/model/Instruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/Instruction.java
rename to core/src/main/java/org/teavm/model/Instruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/InstructionLocation.java b/core/src/main/java/org/teavm/model/InstructionLocation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/InstructionLocation.java
rename to core/src/main/java/org/teavm/model/InstructionLocation.java
diff --git a/teavm-core/src/main/java/org/teavm/model/InstructionReadVisitor.java b/core/src/main/java/org/teavm/model/InstructionReadVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/InstructionReadVisitor.java
rename to core/src/main/java/org/teavm/model/InstructionReadVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/InvokeDynamicInstruction.java b/core/src/main/java/org/teavm/model/InvokeDynamicInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/InvokeDynamicInstruction.java
rename to core/src/main/java/org/teavm/model/InvokeDynamicInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ListableClassHolderSource.java b/core/src/main/java/org/teavm/model/ListableClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ListableClassHolderSource.java
rename to core/src/main/java/org/teavm/model/ListableClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ListableClassReaderSource.java b/core/src/main/java/org/teavm/model/ListableClassReaderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ListableClassReaderSource.java
rename to core/src/main/java/org/teavm/model/ListableClassReaderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MemberHolder.java b/core/src/main/java/org/teavm/model/MemberHolder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MemberHolder.java
rename to core/src/main/java/org/teavm/model/MemberHolder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MemberReader.java b/core/src/main/java/org/teavm/model/MemberReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MemberReader.java
rename to core/src/main/java/org/teavm/model/MemberReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MethodDescriptor.java b/core/src/main/java/org/teavm/model/MethodDescriptor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MethodDescriptor.java
rename to core/src/main/java/org/teavm/model/MethodDescriptor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MethodHandle.java b/core/src/main/java/org/teavm/model/MethodHandle.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MethodHandle.java
rename to core/src/main/java/org/teavm/model/MethodHandle.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MethodHandleType.java b/core/src/main/java/org/teavm/model/MethodHandleType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MethodHandleType.java
rename to core/src/main/java/org/teavm/model/MethodHandleType.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MethodHolder.java b/core/src/main/java/org/teavm/model/MethodHolder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MethodHolder.java
rename to core/src/main/java/org/teavm/model/MethodHolder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MethodReader.java b/core/src/main/java/org/teavm/model/MethodReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MethodReader.java
rename to core/src/main/java/org/teavm/model/MethodReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MethodReference.java b/core/src/main/java/org/teavm/model/MethodReference.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MethodReference.java
rename to core/src/main/java/org/teavm/model/MethodReference.java
diff --git a/teavm-core/src/main/java/org/teavm/model/MutableClassHolderSource.java b/core/src/main/java/org/teavm/model/MutableClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/MutableClassHolderSource.java
rename to core/src/main/java/org/teavm/model/MutableClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/Phi.java b/core/src/main/java/org/teavm/model/Phi.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/Phi.java
rename to core/src/main/java/org/teavm/model/Phi.java
diff --git a/teavm-core/src/main/java/org/teavm/model/PhiReader.java b/core/src/main/java/org/teavm/model/PhiReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/PhiReader.java
rename to core/src/main/java/org/teavm/model/PhiReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/PreOptimizingClassHolderSource.java b/core/src/main/java/org/teavm/model/PreOptimizingClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/PreOptimizingClassHolderSource.java
rename to core/src/main/java/org/teavm/model/PreOptimizingClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/model/PrimitiveType.java b/core/src/main/java/org/teavm/model/PrimitiveType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/PrimitiveType.java
rename to core/src/main/java/org/teavm/model/PrimitiveType.java
diff --git a/teavm-core/src/main/java/org/teavm/model/Program.java b/core/src/main/java/org/teavm/model/Program.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/Program.java
rename to core/src/main/java/org/teavm/model/Program.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ProgramCache.java b/core/src/main/java/org/teavm/model/ProgramCache.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ProgramCache.java
rename to core/src/main/java/org/teavm/model/ProgramCache.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ProgramReader.java b/core/src/main/java/org/teavm/model/ProgramReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ProgramReader.java
rename to core/src/main/java/org/teavm/model/ProgramReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/RuntimeConstant.java b/core/src/main/java/org/teavm/model/RuntimeConstant.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/RuntimeConstant.java
rename to core/src/main/java/org/teavm/model/RuntimeConstant.java
diff --git a/teavm-core/src/main/java/org/teavm/model/TryCatchBlock.java b/core/src/main/java/org/teavm/model/TryCatchBlock.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/TryCatchBlock.java
rename to core/src/main/java/org/teavm/model/TryCatchBlock.java
diff --git a/teavm-core/src/main/java/org/teavm/model/TryCatchBlockReader.java b/core/src/main/java/org/teavm/model/TryCatchBlockReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/TryCatchBlockReader.java
rename to core/src/main/java/org/teavm/model/TryCatchBlockReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/ValueType.java b/core/src/main/java/org/teavm/model/ValueType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/ValueType.java
rename to core/src/main/java/org/teavm/model/ValueType.java
diff --git a/teavm-core/src/main/java/org/teavm/model/Variable.java b/core/src/main/java/org/teavm/model/Variable.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/Variable.java
rename to core/src/main/java/org/teavm/model/Variable.java
diff --git a/teavm-core/src/main/java/org/teavm/model/VariableReader.java b/core/src/main/java/org/teavm/model/VariableReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/VariableReader.java
rename to core/src/main/java/org/teavm/model/VariableReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ChooseEmitter.java b/core/src/main/java/org/teavm/model/emit/ChooseEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ChooseEmitter.java
rename to core/src/main/java/org/teavm/model/emit/ChooseEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ComputationEmitter.java b/core/src/main/java/org/teavm/model/emit/ComputationEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ComputationEmitter.java
rename to core/src/main/java/org/teavm/model/emit/ComputationEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ConditionEmitter.java b/core/src/main/java/org/teavm/model/emit/ConditionEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ConditionEmitter.java
rename to core/src/main/java/org/teavm/model/emit/ConditionEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ConditionProducer.java b/core/src/main/java/org/teavm/model/emit/ConditionProducer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ConditionProducer.java
rename to core/src/main/java/org/teavm/model/emit/ConditionProducer.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/EmitException.java b/core/src/main/java/org/teavm/model/emit/EmitException.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/EmitException.java
rename to core/src/main/java/org/teavm/model/emit/EmitException.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ForkEmitter.java b/core/src/main/java/org/teavm/model/emit/ForkEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ForkEmitter.java
rename to core/src/main/java/org/teavm/model/emit/ForkEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/FragmentEmitter.java b/core/src/main/java/org/teavm/model/emit/FragmentEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/FragmentEmitter.java
rename to core/src/main/java/org/teavm/model/emit/FragmentEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/IfEmitter.java b/core/src/main/java/org/teavm/model/emit/IfEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/IfEmitter.java
rename to core/src/main/java/org/teavm/model/emit/IfEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/PhiEmitter.java b/core/src/main/java/org/teavm/model/emit/PhiEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/PhiEmitter.java
rename to core/src/main/java/org/teavm/model/emit/PhiEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ProgramEmitter.java b/core/src/main/java/org/teavm/model/emit/ProgramEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ProgramEmitter.java
rename to core/src/main/java/org/teavm/model/emit/ProgramEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/StringBuilderEmitter.java b/core/src/main/java/org/teavm/model/emit/StringBuilderEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/StringBuilderEmitter.java
rename to core/src/main/java/org/teavm/model/emit/StringBuilderEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/StringChooseEmitter.java b/core/src/main/java/org/teavm/model/emit/StringChooseEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/StringChooseEmitter.java
rename to core/src/main/java/org/teavm/model/emit/StringChooseEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/emit/ValueEmitter.java b/core/src/main/java/org/teavm/model/emit/ValueEmitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/emit/ValueEmitter.java
rename to core/src/main/java/org/teavm/model/emit/ValueEmitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ArrayElementType.java b/core/src/main/java/org/teavm/model/instructions/ArrayElementType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ArrayElementType.java
rename to core/src/main/java/org/teavm/model/instructions/ArrayElementType.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ArrayLengthInstruction.java b/core/src/main/java/org/teavm/model/instructions/ArrayLengthInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ArrayLengthInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/ArrayLengthInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/AssignInstruction.java b/core/src/main/java/org/teavm/model/instructions/AssignInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/AssignInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/AssignInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/BinaryBranchingCondition.java b/core/src/main/java/org/teavm/model/instructions/BinaryBranchingCondition.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/BinaryBranchingCondition.java
rename to core/src/main/java/org/teavm/model/instructions/BinaryBranchingCondition.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/BinaryBranchingInstruction.java b/core/src/main/java/org/teavm/model/instructions/BinaryBranchingInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/BinaryBranchingInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/BinaryBranchingInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/BinaryInstruction.java b/core/src/main/java/org/teavm/model/instructions/BinaryInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/BinaryInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/BinaryInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/BinaryOperation.java b/core/src/main/java/org/teavm/model/instructions/BinaryOperation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/BinaryOperation.java
rename to core/src/main/java/org/teavm/model/instructions/BinaryOperation.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/BranchingCondition.java b/core/src/main/java/org/teavm/model/instructions/BranchingCondition.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/BranchingCondition.java
rename to core/src/main/java/org/teavm/model/instructions/BranchingCondition.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/BranchingInstruction.java b/core/src/main/java/org/teavm/model/instructions/BranchingInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/BranchingInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/BranchingInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/CastInstruction.java b/core/src/main/java/org/teavm/model/instructions/CastInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/CastInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/CastInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/CastIntegerDirection.java b/core/src/main/java/org/teavm/model/instructions/CastIntegerDirection.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/CastIntegerDirection.java
rename to core/src/main/java/org/teavm/model/instructions/CastIntegerDirection.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/CastIntegerInstruction.java b/core/src/main/java/org/teavm/model/instructions/CastIntegerInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/CastIntegerInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/CastIntegerInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/CastNumberInstruction.java b/core/src/main/java/org/teavm/model/instructions/CastNumberInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/CastNumberInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/CastNumberInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ClassConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/ClassConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ClassConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/ClassConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/CloneArrayInstruction.java b/core/src/main/java/org/teavm/model/instructions/CloneArrayInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/CloneArrayInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/CloneArrayInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ConstructArrayInstruction.java b/core/src/main/java/org/teavm/model/instructions/ConstructArrayInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ConstructArrayInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/ConstructArrayInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ConstructInstruction.java b/core/src/main/java/org/teavm/model/instructions/ConstructInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ConstructInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/ConstructInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ConstructMultiArrayInstruction.java b/core/src/main/java/org/teavm/model/instructions/ConstructMultiArrayInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ConstructMultiArrayInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/ConstructMultiArrayInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/DoubleConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/DoubleConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/DoubleConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/DoubleConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/EmptyInstruction.java b/core/src/main/java/org/teavm/model/instructions/EmptyInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/EmptyInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/EmptyInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/ExitInstruction.java b/core/src/main/java/org/teavm/model/instructions/ExitInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/ExitInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/ExitInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/FloatConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/FloatConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/FloatConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/FloatConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/GetElementInstruction.java b/core/src/main/java/org/teavm/model/instructions/GetElementInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/GetElementInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/GetElementInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/GetFieldInstruction.java b/core/src/main/java/org/teavm/model/instructions/GetFieldInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/GetFieldInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/GetFieldInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/InitClassInstruction.java b/core/src/main/java/org/teavm/model/instructions/InitClassInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/InitClassInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/InitClassInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/InstructionReader.java b/core/src/main/java/org/teavm/model/instructions/InstructionReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/InstructionReader.java
rename to core/src/main/java/org/teavm/model/instructions/InstructionReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/InstructionVisitor.java b/core/src/main/java/org/teavm/model/instructions/InstructionVisitor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/InstructionVisitor.java
rename to core/src/main/java/org/teavm/model/instructions/InstructionVisitor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/IntegerConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/IntegerConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/IntegerConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/IntegerConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/IntegerSubtype.java b/core/src/main/java/org/teavm/model/instructions/IntegerSubtype.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/IntegerSubtype.java
rename to core/src/main/java/org/teavm/model/instructions/IntegerSubtype.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/InvocationType.java b/core/src/main/java/org/teavm/model/instructions/InvocationType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/InvocationType.java
rename to core/src/main/java/org/teavm/model/instructions/InvocationType.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/InvokeInstruction.java b/core/src/main/java/org/teavm/model/instructions/InvokeInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/InvokeInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/InvokeInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/IsInstanceInstruction.java b/core/src/main/java/org/teavm/model/instructions/IsInstanceInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/IsInstanceInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/IsInstanceInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/JumpInstruction.java b/core/src/main/java/org/teavm/model/instructions/JumpInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/JumpInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/JumpInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/LongConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/LongConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/LongConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/LongConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/MonitorEnterInstruction.java b/core/src/main/java/org/teavm/model/instructions/MonitorEnterInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/MonitorEnterInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/MonitorEnterInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/MonitorExitInstruction.java b/core/src/main/java/org/teavm/model/instructions/MonitorExitInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/MonitorExitInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/MonitorExitInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/NegateInstruction.java b/core/src/main/java/org/teavm/model/instructions/NegateInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/NegateInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/NegateInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/NullCheckInstruction.java b/core/src/main/java/org/teavm/model/instructions/NullCheckInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/NullCheckInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/NullCheckInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/NullConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/NullConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/NullConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/NullConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/NumericOperandType.java b/core/src/main/java/org/teavm/model/instructions/NumericOperandType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/NumericOperandType.java
rename to core/src/main/java/org/teavm/model/instructions/NumericOperandType.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/PutElementInstruction.java b/core/src/main/java/org/teavm/model/instructions/PutElementInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/PutElementInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/PutElementInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/PutFieldInstruction.java b/core/src/main/java/org/teavm/model/instructions/PutFieldInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/PutFieldInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/PutFieldInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/RaiseInstruction.java b/core/src/main/java/org/teavm/model/instructions/RaiseInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/RaiseInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/RaiseInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/StringConstantInstruction.java b/core/src/main/java/org/teavm/model/instructions/StringConstantInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/StringConstantInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/StringConstantInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/SwitchInstruction.java b/core/src/main/java/org/teavm/model/instructions/SwitchInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/SwitchInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/SwitchInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/SwitchTableEntry.java b/core/src/main/java/org/teavm/model/instructions/SwitchTableEntry.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/SwitchTableEntry.java
rename to core/src/main/java/org/teavm/model/instructions/SwitchTableEntry.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/SwitchTableEntryReader.java b/core/src/main/java/org/teavm/model/instructions/SwitchTableEntryReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/SwitchTableEntryReader.java
rename to core/src/main/java/org/teavm/model/instructions/SwitchTableEntryReader.java
diff --git a/teavm-core/src/main/java/org/teavm/model/instructions/UnwrapArrayInstruction.java b/core/src/main/java/org/teavm/model/instructions/UnwrapArrayInstruction.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/instructions/UnwrapArrayInstruction.java
rename to core/src/main/java/org/teavm/model/instructions/UnwrapArrayInstruction.java
diff --git a/teavm-core/src/main/java/org/teavm/model/package-info.java b/core/src/main/java/org/teavm/model/package-info.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/package-info.java
rename to core/src/main/java/org/teavm/model/package-info.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java b/core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
rename to core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/AsyncProgramSplitter.java b/core/src/main/java/org/teavm/model/util/AsyncProgramSplitter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/AsyncProgramSplitter.java
rename to core/src/main/java/org/teavm/model/util/AsyncProgramSplitter.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/BasicBlockMapper.java b/core/src/main/java/org/teavm/model/util/BasicBlockMapper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/BasicBlockMapper.java
rename to core/src/main/java/org/teavm/model/util/BasicBlockMapper.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/DefinitionExtractor.java b/core/src/main/java/org/teavm/model/util/DefinitionExtractor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/DefinitionExtractor.java
rename to core/src/main/java/org/teavm/model/util/DefinitionExtractor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/GraphColorer.java b/core/src/main/java/org/teavm/model/util/GraphColorer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/GraphColorer.java
rename to core/src/main/java/org/teavm/model/util/GraphColorer.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/InstructionStringifier.java b/core/src/main/java/org/teavm/model/util/InstructionStringifier.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/InstructionStringifier.java
rename to core/src/main/java/org/teavm/model/util/InstructionStringifier.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/InstructionTransitionExtractor.java b/core/src/main/java/org/teavm/model/util/InstructionTransitionExtractor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/InstructionTransitionExtractor.java
rename to core/src/main/java/org/teavm/model/util/InstructionTransitionExtractor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/InstructionVariableMapper.java b/core/src/main/java/org/teavm/model/util/InstructionVariableMapper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/InstructionVariableMapper.java
rename to core/src/main/java/org/teavm/model/util/InstructionVariableMapper.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/InterferenceGraphBuilder.java b/core/src/main/java/org/teavm/model/util/InterferenceGraphBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/InterferenceGraphBuilder.java
rename to core/src/main/java/org/teavm/model/util/InterferenceGraphBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/ListingBuilder.java b/core/src/main/java/org/teavm/model/util/ListingBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/ListingBuilder.java
rename to core/src/main/java/org/teavm/model/util/ListingBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/LivenessAnalyzer.java b/core/src/main/java/org/teavm/model/util/LivenessAnalyzer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/LivenessAnalyzer.java
rename to core/src/main/java/org/teavm/model/util/LivenessAnalyzer.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/LocationGraphBuilder.java b/core/src/main/java/org/teavm/model/util/LocationGraphBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/LocationGraphBuilder.java
rename to core/src/main/java/org/teavm/model/util/LocationGraphBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java b/core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java
rename to core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/ModelUtils.java b/core/src/main/java/org/teavm/model/util/ModelUtils.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/ModelUtils.java
rename to core/src/main/java/org/teavm/model/util/ModelUtils.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/ProgramNodeSplittingBackend.java b/core/src/main/java/org/teavm/model/util/ProgramNodeSplittingBackend.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/ProgramNodeSplittingBackend.java
rename to core/src/main/java/org/teavm/model/util/ProgramNodeSplittingBackend.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/ProgramUtils.java b/core/src/main/java/org/teavm/model/util/ProgramUtils.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/ProgramUtils.java
rename to core/src/main/java/org/teavm/model/util/ProgramUtils.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/RegisterAllocator.java b/core/src/main/java/org/teavm/model/util/RegisterAllocator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/RegisterAllocator.java
rename to core/src/main/java/org/teavm/model/util/RegisterAllocator.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/TypeInferer.java b/core/src/main/java/org/teavm/model/util/TypeInferer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/TypeInferer.java
rename to core/src/main/java/org/teavm/model/util/TypeInferer.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/UsageExtractor.java b/core/src/main/java/org/teavm/model/util/UsageExtractor.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/UsageExtractor.java
rename to core/src/main/java/org/teavm/model/util/UsageExtractor.java
diff --git a/teavm-core/src/main/java/org/teavm/model/util/VariableType.java b/core/src/main/java/org/teavm/model/util/VariableType.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/model/util/VariableType.java
rename to core/src/main/java/org/teavm/model/util/VariableType.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/ArrayUnwrapMotion.java b/core/src/main/java/org/teavm/optimization/ArrayUnwrapMotion.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/ArrayUnwrapMotion.java
rename to core/src/main/java/org/teavm/optimization/ArrayUnwrapMotion.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java b/core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java
rename to core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/Devirtualization.java b/core/src/main/java/org/teavm/optimization/Devirtualization.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/Devirtualization.java
rename to core/src/main/java/org/teavm/optimization/Devirtualization.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/EmptyBlockElimination.java b/core/src/main/java/org/teavm/optimization/EmptyBlockElimination.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/EmptyBlockElimination.java
rename to core/src/main/java/org/teavm/optimization/EmptyBlockElimination.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java b/core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java
rename to core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/LoopInvariantMotion.java b/core/src/main/java/org/teavm/optimization/LoopInvariantMotion.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/LoopInvariantMotion.java
rename to core/src/main/java/org/teavm/optimization/LoopInvariantMotion.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/MethodOptimization.java b/core/src/main/java/org/teavm/optimization/MethodOptimization.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/MethodOptimization.java
rename to core/src/main/java/org/teavm/optimization/MethodOptimization.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/UnreachableBasicBlockEliminator.java b/core/src/main/java/org/teavm/optimization/UnreachableBasicBlockEliminator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/UnreachableBasicBlockEliminator.java
rename to core/src/main/java/org/teavm/optimization/UnreachableBasicBlockEliminator.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/UnusedVariableElimination.java b/core/src/main/java/org/teavm/optimization/UnusedVariableElimination.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/UnusedVariableElimination.java
rename to core/src/main/java/org/teavm/optimization/UnusedVariableElimination.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/VariableEscapeAnalyzer.java b/core/src/main/java/org/teavm/optimization/VariableEscapeAnalyzer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/VariableEscapeAnalyzer.java
rename to core/src/main/java/org/teavm/optimization/VariableEscapeAnalyzer.java
diff --git a/teavm-core/src/main/java/org/teavm/optimization/VariableUsageGraphBuilder.java b/core/src/main/java/org/teavm/optimization/VariableUsageGraphBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/optimization/VariableUsageGraphBuilder.java
rename to core/src/main/java/org/teavm/optimization/VariableUsageGraphBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ClassDateProvider.java b/core/src/main/java/org/teavm/parsing/ClassDateProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ClassDateProvider.java
rename to core/src/main/java/org/teavm/parsing/ClassDateProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java b/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java
rename to core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java b/core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java
rename to core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java b/core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java
rename to core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceProvider.java b/core/src/main/java/org/teavm/parsing/ClasspathResourceProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceProvider.java
rename to core/src/main/java/org/teavm/parsing/ClasspathResourceProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/JarFileResourceProvider.java b/core/src/main/java/org/teavm/parsing/JarFileResourceProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/JarFileResourceProvider.java
rename to core/src/main/java/org/teavm/parsing/JarFileResourceProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/Parser.java b/core/src/main/java/org/teavm/parsing/Parser.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/Parser.java
rename to core/src/main/java/org/teavm/parsing/Parser.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ProgramParser.java b/core/src/main/java/org/teavm/parsing/ProgramParser.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ProgramParser.java
rename to core/src/main/java/org/teavm/parsing/ProgramParser.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/ResourceProvider.java b/core/src/main/java/org/teavm/parsing/ResourceProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/ResourceProvider.java
rename to core/src/main/java/org/teavm/parsing/ResourceProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/SSATransformer.java b/core/src/main/java/org/teavm/parsing/SSATransformer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/SSATransformer.java
rename to core/src/main/java/org/teavm/parsing/SSATransformer.java
diff --git a/teavm-core/src/main/java/org/teavm/parsing/VariableDebugInformation.java b/core/src/main/java/org/teavm/parsing/VariableDebugInformation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/parsing/VariableDebugInformation.java
rename to core/src/main/java/org/teavm/parsing/VariableDebugInformation.java
diff --git a/teavm-core/src/main/java/org/teavm/resource/ClasspathResourceReader.java b/core/src/main/java/org/teavm/resource/ClasspathResourceReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/resource/ClasspathResourceReader.java
rename to core/src/main/java/org/teavm/resource/ClasspathResourceReader.java
diff --git a/teavm-core/src/main/java/org/teavm/resource/MapperClassHolderSource.java b/core/src/main/java/org/teavm/resource/MapperClassHolderSource.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/resource/MapperClassHolderSource.java
rename to core/src/main/java/org/teavm/resource/MapperClassHolderSource.java
diff --git a/teavm-core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java b/core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java
rename to core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java
diff --git a/teavm-core/src/main/java/org/teavm/resource/ResourceParser.java b/core/src/main/java/org/teavm/resource/ResourceParser.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/resource/ResourceParser.java
rename to core/src/main/java/org/teavm/resource/ResourceParser.java
diff --git a/teavm-core/src/main/java/org/teavm/resource/ResourceReader.java b/core/src/main/java/org/teavm/resource/ResourceReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/resource/ResourceReader.java
rename to core/src/main/java/org/teavm/resource/ResourceReader.java
diff --git a/teavm-core/src/main/java/org/teavm/testing/JUnitTestAdapter.java b/core/src/main/java/org/teavm/testing/JUnitTestAdapter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/testing/JUnitTestAdapter.java
rename to core/src/main/java/org/teavm/testing/JUnitTestAdapter.java
diff --git a/teavm-core/src/main/java/org/teavm/testing/TestAdapter.java b/core/src/main/java/org/teavm/testing/TestAdapter.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/testing/TestAdapter.java
rename to core/src/main/java/org/teavm/testing/TestAdapter.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/ClassAlias.java b/core/src/main/java/org/teavm/tooling/ClassAlias.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/ClassAlias.java
rename to core/src/main/java/org/teavm/tooling/ClassAlias.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/DirectorySourceFileProvider.java b/core/src/main/java/org/teavm/tooling/DirectorySourceFileProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/DirectorySourceFileProvider.java
rename to core/src/main/java/org/teavm/tooling/DirectorySourceFileProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/EmptyTeaVMToolLog.java b/core/src/main/java/org/teavm/tooling/EmptyTeaVMToolLog.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/EmptyTeaVMToolLog.java
rename to core/src/main/java/org/teavm/tooling/EmptyTeaVMToolLog.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/ExceptionHelper.java b/core/src/main/java/org/teavm/tooling/ExceptionHelper.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/ExceptionHelper.java
rename to core/src/main/java/org/teavm/tooling/ExceptionHelper.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/InstructionLocationReader.java b/core/src/main/java/org/teavm/tooling/InstructionLocationReader.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/InstructionLocationReader.java
rename to core/src/main/java/org/teavm/tooling/InstructionLocationReader.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/JarSourceFileProvider.java b/core/src/main/java/org/teavm/tooling/JarSourceFileProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/JarSourceFileProvider.java
rename to core/src/main/java/org/teavm/tooling/JarSourceFileProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/MethodAlias.java b/core/src/main/java/org/teavm/tooling/MethodAlias.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/MethodAlias.java
rename to core/src/main/java/org/teavm/tooling/MethodAlias.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/ProgramSourceAggregator.java b/core/src/main/java/org/teavm/tooling/ProgramSourceAggregator.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/ProgramSourceAggregator.java
rename to core/src/main/java/org/teavm/tooling/ProgramSourceAggregator.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/RuntimeCopyOperation.java b/core/src/main/java/org/teavm/tooling/RuntimeCopyOperation.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/RuntimeCopyOperation.java
rename to core/src/main/java/org/teavm/tooling/RuntimeCopyOperation.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/SourceFileProvider.java b/core/src/main/java/org/teavm/tooling/SourceFileProvider.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/SourceFileProvider.java
rename to core/src/main/java/org/teavm/tooling/SourceFileProvider.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/SourceFilesCopier.java b/core/src/main/java/org/teavm/tooling/SourceFilesCopier.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/SourceFilesCopier.java
rename to core/src/main/java/org/teavm/tooling/SourceFilesCopier.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TeaVMProblemRenderer.java b/core/src/main/java/org/teavm/tooling/TeaVMProblemRenderer.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TeaVMProblemRenderer.java
rename to core/src/main/java/org/teavm/tooling/TeaVMProblemRenderer.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TeaVMTestTool.java b/core/src/main/java/org/teavm/tooling/TeaVMTestTool.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TeaVMTestTool.java
rename to core/src/main/java/org/teavm/tooling/TeaVMTestTool.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TeaVMTool.java b/core/src/main/java/org/teavm/tooling/TeaVMTool.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TeaVMTool.java
rename to core/src/main/java/org/teavm/tooling/TeaVMTool.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TeaVMToolException.java b/core/src/main/java/org/teavm/tooling/TeaVMToolException.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TeaVMToolException.java
rename to core/src/main/java/org/teavm/tooling/TeaVMToolException.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TeaVMToolLog.java b/core/src/main/java/org/teavm/tooling/TeaVMToolLog.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TeaVMToolLog.java
rename to core/src/main/java/org/teavm/tooling/TeaVMToolLog.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TestExceptionDependency.java b/core/src/main/java/org/teavm/tooling/TestExceptionDependency.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TestExceptionDependency.java
rename to core/src/main/java/org/teavm/tooling/TestExceptionDependency.java
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TestExceptionPlugin.java b/core/src/main/java/org/teavm/tooling/TestExceptionPlugin.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/tooling/TestExceptionPlugin.java
rename to core/src/main/java/org/teavm/tooling/TestExceptionPlugin.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/BuildTarget.java b/core/src/main/java/org/teavm/vm/BuildTarget.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/BuildTarget.java
rename to core/src/main/java/org/teavm/vm/BuildTarget.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/DirectoryBuildTarget.java b/core/src/main/java/org/teavm/vm/DirectoryBuildTarget.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/DirectoryBuildTarget.java
rename to core/src/main/java/org/teavm/vm/DirectoryBuildTarget.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVM.java b/core/src/main/java/org/teavm/vm/TeaVM.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/TeaVM.java
rename to core/src/main/java/org/teavm/vm/TeaVM.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVMBuilder.java b/core/src/main/java/org/teavm/vm/TeaVMBuilder.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/TeaVMBuilder.java
rename to core/src/main/java/org/teavm/vm/TeaVMBuilder.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVMEntryPoint.java b/core/src/main/java/org/teavm/vm/TeaVMEntryPoint.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/TeaVMEntryPoint.java
rename to core/src/main/java/org/teavm/vm/TeaVMEntryPoint.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVMPhase.java b/core/src/main/java/org/teavm/vm/TeaVMPhase.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/TeaVMPhase.java
rename to core/src/main/java/org/teavm/vm/TeaVMPhase.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVMProgressFeedback.java b/core/src/main/java/org/teavm/vm/TeaVMProgressFeedback.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/TeaVMProgressFeedback.java
rename to core/src/main/java/org/teavm/vm/TeaVMProgressFeedback.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVMProgressListener.java b/core/src/main/java/org/teavm/vm/TeaVMProgressListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/TeaVMProgressListener.java
rename to core/src/main/java/org/teavm/vm/TeaVMProgressListener.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/Violations.java b/core/src/main/java/org/teavm/vm/Violations.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/Violations.java
rename to core/src/main/java/org/teavm/vm/Violations.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/spi/AbstractRendererListener.java b/core/src/main/java/org/teavm/vm/spi/AbstractRendererListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/spi/AbstractRendererListener.java
rename to core/src/main/java/org/teavm/vm/spi/AbstractRendererListener.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/spi/RendererListener.java b/core/src/main/java/org/teavm/vm/spi/RendererListener.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/spi/RendererListener.java
rename to core/src/main/java/org/teavm/vm/spi/RendererListener.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/spi/TeaVMHost.java b/core/src/main/java/org/teavm/vm/spi/TeaVMHost.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/spi/TeaVMHost.java
rename to core/src/main/java/org/teavm/vm/spi/TeaVMHost.java
diff --git a/teavm-core/src/main/java/org/teavm/vm/spi/TeaVMPlugin.java b/core/src/main/java/org/teavm/vm/spi/TeaVMPlugin.java
similarity index 100%
rename from teavm-core/src/main/java/org/teavm/vm/spi/TeaVMPlugin.java
rename to core/src/main/java/org/teavm/vm/spi/TeaVMPlugin.java
diff --git a/teavm-core/src/main/resources/.gitignore b/core/src/main/resources/.gitignore
similarity index 100%
rename from teavm-core/src/main/resources/.gitignore
rename to core/src/main/resources/.gitignore
diff --git a/teavm-core/src/main/resources/org/teavm/javascript/runtime.js b/core/src/main/resources/org/teavm/javascript/runtime.js
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/javascript/runtime.js
rename to core/src/main/resources/org/teavm/javascript/runtime.js
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/main.html b/core/src/main/resources/org/teavm/tooling/main.html
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/main.html
rename to core/src/main/resources/org/teavm/tooling/main.html
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/junit.html b/core/src/main/resources/org/teavm/tooling/test/junit.html
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/junit.html
rename to core/src/main/resources/org/teavm/tooling/test/junit.html
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/class_obj.png b/core/src/main/resources/org/teavm/tooling/test/res/class_obj.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/class_obj.png
rename to core/src/main/resources/org/teavm/tooling/test/res/class_obj.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/control-000-small.png b/core/src/main/resources/org/teavm/tooling/test/res/control-000-small.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/control-000-small.png
rename to core/src/main/resources/org/teavm/tooling/test/res/control-000-small.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/junit-support.js b/core/src/main/resources/org/teavm/tooling/test/res/junit-support.js
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/junit-support.js
rename to core/src/main/resources/org/teavm/tooling/test/res/junit-support.js
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/junit.css b/core/src/main/resources/org/teavm/tooling/test/res/junit.css
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/junit.css
rename to core/src/main/resources/org/teavm/tooling/test/res/junit.css
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/methpub_obj.png b/core/src/main/resources/org/teavm/tooling/test/res/methpub_obj.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/methpub_obj.png
rename to core/src/main/resources/org/teavm/tooling/test/res/methpub_obj.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/package_obj.png b/core/src/main/resources/org/teavm/tooling/test/res/package_obj.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/package_obj.png
rename to core/src/main/resources/org/teavm/tooling/test/res/package_obj.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/tick-small-red.png b/core/src/main/resources/org/teavm/tooling/test/res/tick-small-red.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/tick-small-red.png
rename to core/src/main/resources/org/teavm/tooling/test/res/tick-small-red.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/tick-small.png b/core/src/main/resources/org/teavm/tooling/test/res/tick-small.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/tick-small.png
rename to core/src/main/resources/org/teavm/tooling/test/res/tick-small.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/toggle-small-expand.png b/core/src/main/resources/org/teavm/tooling/test/res/toggle-small-expand.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/toggle-small-expand.png
rename to core/src/main/resources/org/teavm/tooling/test/res/toggle-small-expand.png
diff --git a/teavm-core/src/main/resources/org/teavm/tooling/test/res/toggle-small.png b/core/src/main/resources/org/teavm/tooling/test/res/toggle-small.png
similarity index 100%
rename from teavm-core/src/main/resources/org/teavm/tooling/test/res/toggle-small.png
rename to core/src/main/resources/org/teavm/tooling/test/res/toggle-small.png
diff --git a/teavm-core/src/test/java/.gitignore b/core/src/test/java/.gitignore
similarity index 100%
rename from teavm-core/src/test/java/.gitignore
rename to core/src/test/java/.gitignore
diff --git a/teavm-core/src/test/java/org/teavm/cache/ProgramIOTest.java b/core/src/test/java/org/teavm/cache/ProgramIOTest.java
similarity index 100%
rename from teavm-core/src/test/java/org/teavm/cache/ProgramIOTest.java
rename to core/src/test/java/org/teavm/cache/ProgramIOTest.java
diff --git a/teavm-core/src/test/java/org/teavm/common/GraphTest.java b/core/src/test/java/org/teavm/common/GraphTest.java
similarity index 100%
rename from teavm-core/src/test/java/org/teavm/common/GraphTest.java
rename to core/src/test/java/org/teavm/common/GraphTest.java
diff --git a/teavm-core/src/test/resources/.gitignore b/core/src/test/resources/.gitignore
similarity index 100%
rename from teavm-core/src/test/resources/.gitignore
rename to core/src/test/resources/.gitignore
diff --git a/teavm-extras-slf4j/pom.xml b/extras-slf4j/pom.xml
similarity index 100%
rename from teavm-extras-slf4j/pom.xml
rename to extras-slf4j/pom.xml
diff --git a/teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/LoggerFactoryTransformer.java b/extras-slf4j/src/main/java/org/teavm/extras/slf4j/LoggerFactoryTransformer.java
similarity index 100%
rename from teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/LoggerFactoryTransformer.java
rename to extras-slf4j/src/main/java/org/teavm/extras/slf4j/LoggerFactoryTransformer.java
diff --git a/teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/Slf4jPlugin.java b/extras-slf4j/src/main/java/org/teavm/extras/slf4j/Slf4jPlugin.java
similarity index 100%
rename from teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/Slf4jPlugin.java
rename to extras-slf4j/src/main/java/org/teavm/extras/slf4j/Slf4jPlugin.java
diff --git a/teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLogger.java b/extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLogger.java
similarity index 100%
rename from teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLogger.java
rename to extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLogger.java
diff --git a/teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactory.java b/extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactory.java
similarity index 100%
rename from teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactory.java
rename to extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactory.java
diff --git a/teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactorySubstitution.java b/extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactorySubstitution.java
similarity index 100%
rename from teavm-extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactorySubstitution.java
rename to extras-slf4j/src/main/java/org/teavm/extras/slf4j/TeaVMLoggerFactorySubstitution.java
diff --git a/teavm-extras-slf4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/extras-slf4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
similarity index 100%
rename from teavm-extras-slf4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
rename to extras-slf4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
diff --git a/teavm-html4j/pom.xml b/html4j/pom.xml
similarity index 100%
rename from teavm-html4j/pom.xml
rename to html4j/pom.xml
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/HTML4JPlugin.java b/html4j/src/main/java/org/teavm/html4j/HTML4JPlugin.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/HTML4JPlugin.java
rename to html4j/src/main/java/org/teavm/html4j/HTML4JPlugin.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JCLHacks.java b/html4j/src/main/java/org/teavm/html4j/JCLHacks.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JCLHacks.java
rename to html4j/src/main/java/org/teavm/html4j/JCLHacks.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyDependency.java b/html4j/src/main/java/org/teavm/html4j/JavaScriptBodyDependency.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyDependency.java
rename to html4j/src/main/java/org/teavm/html4j/JavaScriptBodyDependency.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyGenerator.java b/html4j/src/main/java/org/teavm/html4j/JavaScriptBodyGenerator.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyGenerator.java
rename to html4j/src/main/java/org/teavm/html4j/JavaScriptBodyGenerator.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyTransformer.java b/html4j/src/main/java/org/teavm/html4j/JavaScriptBodyTransformer.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyTransformer.java
rename to html4j/src/main/java/org/teavm/html4j/JavaScriptBodyTransformer.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptConv.java b/html4j/src/main/java/org/teavm/html4j/JavaScriptConv.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptConv.java
rename to html4j/src/main/java/org/teavm/html4j/JavaScriptConv.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptConvGenerator.java b/html4j/src/main/java/org/teavm/html4j/JavaScriptConvGenerator.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptConvGenerator.java
rename to html4j/src/main/java/org/teavm/html4j/JavaScriptConvGenerator.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptResourceInterceptor.java b/html4j/src/main/java/org/teavm/html4j/JavaScriptResourceInterceptor.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptResourceInterceptor.java
rename to html4j/src/main/java/org/teavm/html4j/JavaScriptResourceInterceptor.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/JsCallback.java b/html4j/src/main/java/org/teavm/html4j/JsCallback.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/JsCallback.java
rename to html4j/src/main/java/org/teavm/html4j/JsCallback.java
diff --git a/teavm-html4j/src/main/java/org/teavm/html4j/testing/KOTestAdapter.java b/html4j/src/main/java/org/teavm/html4j/testing/KOTestAdapter.java
similarity index 100%
rename from teavm-html4j/src/main/java/org/teavm/html4j/testing/KOTestAdapter.java
rename to html4j/src/main/java/org/teavm/html4j/testing/KOTestAdapter.java
diff --git a/teavm-html4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/html4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
similarity index 100%
rename from teavm-html4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
rename to html4j/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
diff --git a/teavm-html4j/src/test/java/org/teavm/html4j/test/A.java b/html4j/src/test/java/org/teavm/html4j/test/A.java
similarity index 100%
rename from teavm-html4j/src/test/java/org/teavm/html4j/test/A.java
rename to html4j/src/test/java/org/teavm/html4j/test/A.java
diff --git a/teavm-html4j/src/test/java/org/teavm/html4j/test/B.java b/html4j/src/test/java/org/teavm/html4j/test/B.java
similarity index 100%
rename from teavm-html4j/src/test/java/org/teavm/html4j/test/B.java
rename to html4j/src/test/java/org/teavm/html4j/test/B.java
diff --git a/teavm-html4j/src/test/java/org/teavm/html4j/test/Callback.java b/html4j/src/test/java/org/teavm/html4j/test/Callback.java
similarity index 100%
rename from teavm-html4j/src/test/java/org/teavm/html4j/test/Callback.java
rename to html4j/src/test/java/org/teavm/html4j/test/Callback.java
diff --git a/teavm-html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyConversionTest.java b/html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyConversionTest.java
similarity index 100%
rename from teavm-html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyConversionTest.java
rename to html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyConversionTest.java
diff --git a/teavm-html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyTest.java b/html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyTest.java
similarity index 100%
rename from teavm-html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyTest.java
rename to html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyTest.java
diff --git a/teavm-html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java b/html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java
similarity index 100%
rename from teavm-html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java
rename to html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java
diff --git a/teavm-html4j/src/test/resources/META-INF/services/org.netbeans.html.json.tck.KnockoutTCK b/html4j/src/test/resources/META-INF/services/org.netbeans.html.json.tck.KnockoutTCK
similarity index 100%
rename from teavm-html4j/src/test/resources/META-INF/services/org.netbeans.html.json.tck.KnockoutTCK
rename to html4j/src/test/resources/META-INF/services/org.netbeans.html.json.tck.KnockoutTCK
diff --git a/teavm-jso/pom.xml b/jso/core/pom.xml
similarity index 94%
rename from teavm-jso/pom.xml
rename to jso/core/pom.xml
index abaf056bd..89a011db5 100644
--- a/teavm-jso/pom.xml
+++ b/jso/core/pom.xml
@@ -52,7 +52,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../checkstyle.xml</configLocation>
+          <propertyExpansion>config_loc=${basedir}/../..</propertyExpansion>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
         </configuration>
       </plugin>
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSBody.java b/jso/core/src/main/java/org/teavm/jso/JSBody.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/JSBody.java
rename to jso/core/src/main/java/org/teavm/jso/JSBody.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSFunctor.java b/jso/core/src/main/java/org/teavm/jso/JSFunctor.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/JSFunctor.java
rename to jso/core/src/main/java/org/teavm/jso/JSFunctor.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSIndexer.java b/jso/core/src/main/java/org/teavm/jso/JSIndexer.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/JSIndexer.java
rename to jso/core/src/main/java/org/teavm/jso/JSIndexer.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSMethod.java b/jso/core/src/main/java/org/teavm/jso/JSMethod.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/JSMethod.java
rename to jso/core/src/main/java/org/teavm/jso/JSMethod.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSObject.java b/jso/core/src/main/java/org/teavm/jso/JSObject.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/JSObject.java
rename to jso/core/src/main/java/org/teavm/jso/JSObject.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSProperty.java b/jso/core/src/main/java/org/teavm/jso/JSProperty.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/JSProperty.java
rename to jso/core/src/main/java/org/teavm/jso/JSProperty.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/ajax/ReadyStateChangeHandler.java b/jso/core/src/main/java/org/teavm/jso/ajax/ReadyStateChangeHandler.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/ajax/ReadyStateChangeHandler.java
rename to jso/core/src/main/java/org/teavm/jso/ajax/ReadyStateChangeHandler.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/ajax/XMLHttpRequest.java b/jso/core/src/main/java/org/teavm/jso/ajax/XMLHttpRequest.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/ajax/XMLHttpRequest.java
rename to jso/core/src/main/java/org/teavm/jso/ajax/XMLHttpRequest.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/browser/Performance.java b/jso/core/src/main/java/org/teavm/jso/browser/Performance.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/browser/Performance.java
rename to jso/core/src/main/java/org/teavm/jso/browser/Performance.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/browser/Screen.java b/jso/core/src/main/java/org/teavm/jso/browser/Screen.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/browser/Screen.java
rename to jso/core/src/main/java/org/teavm/jso/browser/Screen.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/browser/Storage.java b/jso/core/src/main/java/org/teavm/jso/browser/Storage.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/browser/Storage.java
rename to jso/core/src/main/java/org/teavm/jso/browser/Storage.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/browser/StorageProvider.java b/jso/core/src/main/java/org/teavm/jso/browser/StorageProvider.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/browser/StorageProvider.java
rename to jso/core/src/main/java/org/teavm/jso/browser/StorageProvider.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/browser/TimerHandler.java b/jso/core/src/main/java/org/teavm/jso/browser/TimerHandler.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/browser/TimerHandler.java
rename to jso/core/src/main/java/org/teavm/jso/browser/TimerHandler.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/browser/Window.java b/jso/core/src/main/java/org/teavm/jso/browser/Window.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/browser/Window.java
rename to jso/core/src/main/java/org/teavm/jso/browser/Window.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasGradient.java b/jso/core/src/main/java/org/teavm/jso/canvas/CanvasGradient.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasGradient.java
rename to jso/core/src/main/java/org/teavm/jso/canvas/CanvasGradient.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasImageSource.java b/jso/core/src/main/java/org/teavm/jso/canvas/CanvasImageSource.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasImageSource.java
rename to jso/core/src/main/java/org/teavm/jso/canvas/CanvasImageSource.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasPattern.java b/jso/core/src/main/java/org/teavm/jso/canvas/CanvasPattern.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasPattern.java
rename to jso/core/src/main/java/org/teavm/jso/canvas/CanvasPattern.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasRenderingContext2D.java b/jso/core/src/main/java/org/teavm/jso/canvas/CanvasRenderingContext2D.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/canvas/CanvasRenderingContext2D.java
rename to jso/core/src/main/java/org/teavm/jso/canvas/CanvasRenderingContext2D.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/canvas/ImageData.java b/jso/core/src/main/java/org/teavm/jso/canvas/ImageData.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/canvas/ImageData.java
rename to jso/core/src/main/java/org/teavm/jso/canvas/ImageData.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/canvas/TextMetrics.java b/jso/core/src/main/java/org/teavm/jso/canvas/TextMetrics.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/canvas/TextMetrics.java
rename to jso/core/src/main/java/org/teavm/jso/canvas/TextMetrics.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSArray.java b/jso/core/src/main/java/org/teavm/jso/core/JSArray.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSArray.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSArray.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSArrayReader.java b/jso/core/src/main/java/org/teavm/jso/core/JSArrayReader.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSArrayReader.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSArrayReader.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSBoolean.java b/jso/core/src/main/java/org/teavm/jso/core/JSBoolean.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSBoolean.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSBoolean.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSDate.java b/jso/core/src/main/java/org/teavm/jso/core/JSDate.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSDate.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSDate.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSFunction.java b/jso/core/src/main/java/org/teavm/jso/core/JSFunction.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSFunction.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSFunction.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSNumber.java b/jso/core/src/main/java/org/teavm/jso/core/JSNumber.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSNumber.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSNumber.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSRegExp.java b/jso/core/src/main/java/org/teavm/jso/core/JSRegExp.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSRegExp.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSRegExp.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSRegExpFlag.java b/jso/core/src/main/java/org/teavm/jso/core/JSRegExpFlag.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSRegExpFlag.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSRegExpFlag.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSReplaceFunction.java b/jso/core/src/main/java/org/teavm/jso/core/JSReplaceFunction.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSReplaceFunction.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSReplaceFunction.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSSortFunction.java b/jso/core/src/main/java/org/teavm/jso/core/JSSortFunction.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSSortFunction.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSSortFunction.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/core/JSString.java b/jso/core/src/main/java/org/teavm/jso/core/JSString.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/core/JSString.java
rename to jso/core/src/main/java/org/teavm/jso/core/JSString.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/css/CSSStyleDeclaration.java b/jso/core/src/main/java/org/teavm/jso/dom/css/CSSStyleDeclaration.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/css/CSSStyleDeclaration.java
rename to jso/core/src/main/java/org/teavm/jso/dom/css/CSSStyleDeclaration.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/css/ElementCSSInlineStyle.java b/jso/core/src/main/java/org/teavm/jso/dom/css/ElementCSSInlineStyle.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/css/ElementCSSInlineStyle.java
rename to jso/core/src/main/java/org/teavm/jso/dom/css/ElementCSSInlineStyle.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/DocumentEvent.java b/jso/core/src/main/java/org/teavm/jso/dom/events/DocumentEvent.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/DocumentEvent.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/DocumentEvent.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/Event.java b/jso/core/src/main/java/org/teavm/jso/dom/events/Event.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/Event.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/Event.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/EventListener.java b/jso/core/src/main/java/org/teavm/jso/dom/events/EventListener.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/EventListener.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/EventListener.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/EventTarget.java b/jso/core/src/main/java/org/teavm/jso/dom/events/EventTarget.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/EventTarget.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/EventTarget.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/KeyboardEvent.java b/jso/core/src/main/java/org/teavm/jso/dom/events/KeyboardEvent.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/KeyboardEvent.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/KeyboardEvent.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/MouseEvent.java b/jso/core/src/main/java/org/teavm/jso/dom/events/MouseEvent.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/MouseEvent.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/MouseEvent.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/events/StorageEvent.java b/jso/core/src/main/java/org/teavm/jso/dom/events/StorageEvent.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/events/StorageEvent.java
rename to jso/core/src/main/java/org/teavm/jso/dom/events/StorageEvent.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLAudioElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLAudioElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLAudioElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLAudioElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLBaseElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLBaseElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLBaseElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLBaseElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLBodyElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLBodyElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLBodyElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLBodyElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLButtonElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLButtonElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLButtonElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLButtonElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLCanvasElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLCanvasElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLCanvasElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLCanvasElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLCollection.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLCollection.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLCollection.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLCollection.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLDocument.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLDocument.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLDocument.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLDocument.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLHeadElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLHeadElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLHeadElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLHeadElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLHtmlElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLHtmlElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLHtmlElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLHtmlElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLImageElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLImageElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLImageElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLImageElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLInputElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLInputElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLInputElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLInputElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLLinkElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLLinkElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLLinkElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLLinkElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLMediaElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLMediaElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLMediaElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLMediaElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLMetaElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLMetaElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLMetaElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLMetaElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLOptionElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLOptionElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLOptionElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLOptionElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLOptionsCollection.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLOptionsCollection.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLOptionsCollection.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLOptionsCollection.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLSelectElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLSelectElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLSelectElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLSelectElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLSourceElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLSourceElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLSourceElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLSourceElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLTitleElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLTitleElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLTitleElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLTitleElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLVideoElement.java b/jso/core/src/main/java/org/teavm/jso/dom/html/HTMLVideoElement.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/HTMLVideoElement.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/HTMLVideoElement.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/html/TextRectangle.java b/jso/core/src/main/java/org/teavm/jso/dom/html/TextRectangle.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/html/TextRectangle.java
rename to jso/core/src/main/java/org/teavm/jso/dom/html/TextRectangle.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Attr.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Attr.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Attr.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Attr.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/CDATASection.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/CDATASection.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/CDATASection.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/CDATASection.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/CharacterData.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/CharacterData.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/CharacterData.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/CharacterData.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Comment.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Comment.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Comment.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Comment.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/DOMImplementation.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/DOMImplementation.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/DOMImplementation.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/DOMImplementation.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Document.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Document.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Document.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Document.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/DocumentFragment.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/DocumentFragment.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/DocumentFragment.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/DocumentFragment.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/DocumentType.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/DocumentType.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/DocumentType.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/DocumentType.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Element.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Element.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Element.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Element.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Entity.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Entity.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Entity.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Entity.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/EntityReference.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/EntityReference.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/EntityReference.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/EntityReference.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/NamedNodeMap.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/NamedNodeMap.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/NamedNodeMap.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/NamedNodeMap.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Node.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Node.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Node.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Node.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/NodeList.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/NodeList.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/NodeList.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/NodeList.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Notation.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Notation.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Notation.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Notation.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/ProcessingInstruction.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/ProcessingInstruction.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/ProcessingInstruction.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/ProcessingInstruction.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/dom/xml/Text.java b/jso/core/src/main/java/org/teavm/jso/dom/xml/Text.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/dom/xml/Text.java
rename to jso/core/src/main/java/org/teavm/jso/dom/xml/Text.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/EventHandler.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/EventHandler.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/EventHandler.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/EventHandler.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCountRequest.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCountRequest.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCountRequest.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCountRequest.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCursor.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCursor.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCursor.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCursor.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCursorRequest.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCursorRequest.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCursorRequest.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCursorRequest.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCursorSource.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCursorSource.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBCursorSource.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBCursorSource.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBDatabase.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBDatabase.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBDatabase.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBDatabase.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBError.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBError.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBError.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBError.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBFactory.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBFactory.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBFactory.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBFactory.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBGetRequest.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBGetRequest.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBGetRequest.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBGetRequest.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBIndex.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBIndex.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBIndex.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBIndex.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBKeyRange.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBKeyRange.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBKeyRange.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBKeyRange.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBObjectStore.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBObjectStore.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBObjectStore.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBObjectStore.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBObjectStoreParameters.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBObjectStoreParameters.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBObjectStoreParameters.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBObjectStoreParameters.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBOpenDBRequest.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBOpenDBRequest.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBOpenDBRequest.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBOpenDBRequest.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBRequest.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBRequest.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBRequest.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBRequest.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBRequestSource.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBRequestSource.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBRequestSource.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBRequestSource.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBTransaction.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBTransaction.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBTransaction.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBTransaction.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBVersionChangeEvent.java b/jso/core/src/main/java/org/teavm/jso/indexeddb/IDBVersionChangeEvent.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/indexeddb/IDBVersionChangeEvent.java
rename to jso/core/src/main/java/org/teavm/jso/indexeddb/IDBVersionChangeEvent.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/json/JSON.java b/jso/core/src/main/java/org/teavm/jso/json/JSON.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/json/JSON.java
rename to jso/core/src/main/java/org/teavm/jso/json/JSON.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/AudioTrack.java b/jso/core/src/main/java/org/teavm/jso/media/AudioTrack.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/AudioTrack.java
rename to jso/core/src/main/java/org/teavm/jso/media/AudioTrack.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/AudioTrackList.java b/jso/core/src/main/java/org/teavm/jso/media/AudioTrackList.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/AudioTrackList.java
rename to jso/core/src/main/java/org/teavm/jso/media/AudioTrackList.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/MediaController.java b/jso/core/src/main/java/org/teavm/jso/media/MediaController.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/MediaController.java
rename to jso/core/src/main/java/org/teavm/jso/media/MediaController.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/MediaError.java b/jso/core/src/main/java/org/teavm/jso/media/MediaError.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/MediaError.java
rename to jso/core/src/main/java/org/teavm/jso/media/MediaError.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/MediaSource.java b/jso/core/src/main/java/org/teavm/jso/media/MediaSource.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/MediaSource.java
rename to jso/core/src/main/java/org/teavm/jso/media/MediaSource.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/SourceBuffer.java b/jso/core/src/main/java/org/teavm/jso/media/SourceBuffer.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/SourceBuffer.java
rename to jso/core/src/main/java/org/teavm/jso/media/SourceBuffer.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/TextTrack.java b/jso/core/src/main/java/org/teavm/jso/media/TextTrack.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/TextTrack.java
rename to jso/core/src/main/java/org/teavm/jso/media/TextTrack.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/TextTrackCue.java b/jso/core/src/main/java/org/teavm/jso/media/TextTrackCue.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/TextTrackCue.java
rename to jso/core/src/main/java/org/teavm/jso/media/TextTrackCue.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/TextTrackCueList.java b/jso/core/src/main/java/org/teavm/jso/media/TextTrackCueList.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/TextTrackCueList.java
rename to jso/core/src/main/java/org/teavm/jso/media/TextTrackCueList.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/TextTrackList.java b/jso/core/src/main/java/org/teavm/jso/media/TextTrackList.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/TextTrackList.java
rename to jso/core/src/main/java/org/teavm/jso/media/TextTrackList.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/TimeRanges.java b/jso/core/src/main/java/org/teavm/jso/media/TimeRanges.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/TimeRanges.java
rename to jso/core/src/main/java/org/teavm/jso/media/TimeRanges.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/VideoTrack.java b/jso/core/src/main/java/org/teavm/jso/media/VideoTrack.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/VideoTrack.java
rename to jso/core/src/main/java/org/teavm/jso/media/VideoTrack.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/media/VideoTrackList.java b/jso/core/src/main/java/org/teavm/jso/media/VideoTrackList.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/media/VideoTrackList.java
rename to jso/core/src/main/java/org/teavm/jso/media/VideoTrackList.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/package-info.java b/jso/core/src/main/java/org/teavm/jso/package-info.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/package-info.java
rename to jso/core/src/main/java/org/teavm/jso/package-info.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/ArrayBuffer.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/ArrayBuffer.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/ArrayBuffer.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/ArrayBuffer.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/ArrayBufferView.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/ArrayBufferView.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/ArrayBufferView.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/ArrayBufferView.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Float32Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Float32Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Float32Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Float32Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Float64Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Float64Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Float64Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Float64Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Int16Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Int16Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Int16Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Int16Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Int32Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Int32Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Int32Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Int32Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Int8Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Int8Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Int8Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Int8Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Uint16Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Uint16Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Uint16Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Uint16Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Uint8Array.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Uint8Array.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Uint8Array.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Uint8Array.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/typedarrays/Uint8ClampedArray.java b/jso/core/src/main/java/org/teavm/jso/typedarrays/Uint8ClampedArray.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/typedarrays/Uint8ClampedArray.java
rename to jso/core/src/main/java/org/teavm/jso/typedarrays/Uint8ClampedArray.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLActiveInfo.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLActiveInfo.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLActiveInfo.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLActiveInfo.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLBuffer.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLBuffer.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLBuffer.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLBuffer.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLContextAttributes.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLContextAttributes.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLContextAttributes.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLContextAttributes.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLFramebuffer.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLFramebuffer.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLFramebuffer.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLFramebuffer.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLProgram.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLProgram.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLProgram.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLProgram.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLRenderbuffer.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLRenderbuffer.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLRenderbuffer.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLRenderbuffer.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLRenderingContext.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLRenderingContext.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLRenderingContext.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLRenderingContext.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLShader.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLShader.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLShader.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLShader.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLShaderPrecisionFormat.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLShaderPrecisionFormat.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLShaderPrecisionFormat.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLShaderPrecisionFormat.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLTexture.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLTexture.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLTexture.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLTexture.java
diff --git a/teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLUniformLocation.java b/jso/core/src/main/java/org/teavm/jso/webgl/WebGLUniformLocation.java
similarity index 100%
rename from teavm-jso/src/main/java/org/teavm/jso/webgl/WebGLUniformLocation.java
rename to jso/core/src/main/java/org/teavm/jso/webgl/WebGLUniformLocation.java
diff --git a/teavm-jso/src/test/java/org/teavm/jso/test/AnnotationsTest.java b/jso/core/src/test/java/org/teavm/jso/test/AnnotationsTest.java
similarity index 100%
rename from teavm-jso/src/test/java/org/teavm/jso/test/AnnotationsTest.java
rename to jso/core/src/test/java/org/teavm/jso/test/AnnotationsTest.java
diff --git a/teavm-jso/src/test/java/org/teavm/jso/test/ConversionTest.java b/jso/core/src/test/java/org/teavm/jso/test/ConversionTest.java
similarity index 100%
rename from teavm-jso/src/test/java/org/teavm/jso/test/ConversionTest.java
rename to jso/core/src/test/java/org/teavm/jso/test/ConversionTest.java
diff --git a/teavm-jso/src/test/java/org/teavm/jso/test/FunctorTest.java b/jso/core/src/test/java/org/teavm/jso/test/FunctorTest.java
similarity index 100%
rename from teavm-jso/src/test/java/org/teavm/jso/test/FunctorTest.java
rename to jso/core/src/test/java/org/teavm/jso/test/FunctorTest.java
diff --git a/teavm-jso/src/test/java/org/teavm/jso/test/JavaInvocationTest.java b/jso/core/src/test/java/org/teavm/jso/test/JavaInvocationTest.java
similarity index 100%
rename from teavm-jso/src/test/java/org/teavm/jso/test/JavaInvocationTest.java
rename to jso/core/src/test/java/org/teavm/jso/test/JavaInvocationTest.java
diff --git a/teavm-jso-impl/pom.xml b/jso/impl/pom.xml
similarity index 94%
rename from teavm-jso-impl/pom.xml
rename to jso/impl/pom.xml
index 641ddd518..ae7de9d90 100644
--- a/teavm-jso-impl/pom.xml
+++ b/jso/impl/pom.xml
@@ -56,7 +56,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../checkstyle.xml</configLocation>
+          <propertyExpansion>config_loc=${basedir}/../..</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/AstWriter.java b/jso/impl/src/main/java/org/teavm/jso/impl/AstWriter.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/AstWriter.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/AstWriter.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/FunctorImpl.java b/jso/impl/src/main/java/org/teavm/jso/impl/FunctorImpl.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/FunctorImpl.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/FunctorImpl.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JS.java b/jso/impl/src/main/java/org/teavm/jso/impl/JS.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JS.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JS.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSAliasRenderer.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSAliasRenderer.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSAliasRenderer.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSAliasRenderer.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyBloatedEmitter.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyBloatedEmitter.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyBloatedEmitter.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyBloatedEmitter.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyEmitter.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyEmitter.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyEmitter.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyEmitter.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyGenerator.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyGenerator.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyGenerator.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyGenerator.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyInlineUtil.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyInlineUtil.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyInlineUtil.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyInlineUtil.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyRef.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyRef.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyRef.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyRef.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyRepository.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyRepository.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSBodyRepository.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSBodyRepository.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSDependencyListener.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSDependencyListener.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSDependencyListener.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSDependencyListener.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSOPlugin.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSOPlugin.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSOPlugin.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSOPlugin.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSObjectClassTransformer.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSObjectClassTransformer.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSObjectClassTransformer.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSObjectClassTransformer.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSParser.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSParser.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSParser.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSParser.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java b/jso/impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/NameEmitter.java b/jso/impl/src/main/java/org/teavm/jso/impl/NameEmitter.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/NameEmitter.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/NameEmitter.java
diff --git a/teavm-jso-impl/src/main/java/org/teavm/jso/impl/TeaVMErrorReporter.java b/jso/impl/src/main/java/org/teavm/jso/impl/TeaVMErrorReporter.java
similarity index 100%
rename from teavm-jso-impl/src/main/java/org/teavm/jso/impl/TeaVMErrorReporter.java
rename to jso/impl/src/main/java/org/teavm/jso/impl/TeaVMErrorReporter.java
diff --git a/teavm-jso-impl/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/jso/impl/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
similarity index 100%
rename from teavm-jso-impl/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
rename to jso/impl/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
diff --git a/teavm-jso-impl/src/test/java/org/teavm/jso/plugin/AstWriterTest.java b/jso/impl/src/test/java/org/teavm/jso/plugin/AstWriterTest.java
similarity index 100%
rename from teavm-jso-impl/src/test/java/org/teavm/jso/plugin/AstWriterTest.java
rename to jso/impl/src/test/java/org/teavm/jso/plugin/AstWriterTest.java
diff --git a/teavm-platform/pom.xml b/platform/pom.xml
similarity index 100%
rename from teavm-platform/pom.xml
rename to platform/pom.xml
diff --git a/teavm-platform/src/main/java/org/teavm/platform/Platform.java b/platform/src/main/java/org/teavm/platform/Platform.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/Platform.java
rename to platform/src/main/java/org/teavm/platform/Platform.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformAnnotationProvider.java b/platform/src/main/java/org/teavm/platform/PlatformAnnotationProvider.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformAnnotationProvider.java
rename to platform/src/main/java/org/teavm/platform/PlatformAnnotationProvider.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformClass.java b/platform/src/main/java/org/teavm/platform/PlatformClass.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformClass.java
rename to platform/src/main/java/org/teavm/platform/PlatformClass.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformClassMetadata.java b/platform/src/main/java/org/teavm/platform/PlatformClassMetadata.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformClassMetadata.java
rename to platform/src/main/java/org/teavm/platform/PlatformClassMetadata.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformConsole.java b/platform/src/main/java/org/teavm/platform/PlatformConsole.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformConsole.java
rename to platform/src/main/java/org/teavm/platform/PlatformConsole.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformHelper.java b/platform/src/main/java/org/teavm/platform/PlatformHelper.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformHelper.java
rename to platform/src/main/java/org/teavm/platform/PlatformHelper.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformObject.java b/platform/src/main/java/org/teavm/platform/PlatformObject.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformObject.java
rename to platform/src/main/java/org/teavm/platform/PlatformObject.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformPrimitives.java b/platform/src/main/java/org/teavm/platform/PlatformPrimitives.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformPrimitives.java
rename to platform/src/main/java/org/teavm/platform/PlatformPrimitives.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformQueue.java b/platform/src/main/java/org/teavm/platform/PlatformQueue.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformQueue.java
rename to platform/src/main/java/org/teavm/platform/PlatformQueue.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformRunnable.java b/platform/src/main/java/org/teavm/platform/PlatformRunnable.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformRunnable.java
rename to platform/src/main/java/org/teavm/platform/PlatformRunnable.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformSequence.java b/platform/src/main/java/org/teavm/platform/PlatformSequence.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformSequence.java
rename to platform/src/main/java/org/teavm/platform/PlatformSequence.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformString.java b/platform/src/main/java/org/teavm/platform/PlatformString.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformString.java
rename to platform/src/main/java/org/teavm/platform/PlatformString.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformStringClass.java b/platform/src/main/java/org/teavm/platform/PlatformStringClass.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/PlatformStringClass.java
rename to platform/src/main/java/org/teavm/platform/PlatformStringClass.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/async/AsyncCallback.java b/platform/src/main/java/org/teavm/platform/async/AsyncCallback.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/async/AsyncCallback.java
rename to platform/src/main/java/org/teavm/platform/async/AsyncCallback.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/BooleanResource.java b/platform/src/main/java/org/teavm/platform/metadata/BooleanResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/BooleanResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/BooleanResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ByteResource.java b/platform/src/main/java/org/teavm/platform/metadata/ByteResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ByteResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/ByteResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ClassResource.java b/platform/src/main/java/org/teavm/platform/metadata/ClassResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ClassResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/ClassResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataGenerator.java b/platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataGenerator.java
rename to platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataProvider.java b/platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataProvider.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataProvider.java
rename to platform/src/main/java/org/teavm/platform/metadata/ClassScopedMetadataProvider.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/DoubleResource.java b/platform/src/main/java/org/teavm/platform/metadata/DoubleResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/DoubleResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/DoubleResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/FloatResource.java b/platform/src/main/java/org/teavm/platform/metadata/FloatResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/FloatResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/FloatResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/IntResource.java b/platform/src/main/java/org/teavm/platform/metadata/IntResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/IntResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/IntResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java b/platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java
rename to platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java b/platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java
rename to platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataProvider.java b/platform/src/main/java/org/teavm/platform/metadata/MetadataProvider.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataProvider.java
rename to platform/src/main/java/org/teavm/platform/metadata/MetadataProvider.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/Resource.java b/platform/src/main/java/org/teavm/platform/metadata/Resource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/Resource.java
rename to platform/src/main/java/org/teavm/platform/metadata/Resource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java b/platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java
rename to platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java b/platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java
rename to platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ShortResource.java b/platform/src/main/java/org/teavm/platform/metadata/ShortResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/ShortResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/ShortResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/StaticFieldResource.java b/platform/src/main/java/org/teavm/platform/metadata/StaticFieldResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/StaticFieldResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/StaticFieldResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/StringResource.java b/platform/src/main/java/org/teavm/platform/metadata/StringResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/metadata/StringResource.java
rename to platform/src/main/java/org/teavm/platform/metadata/StringResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/AnnotationDependencySupport.java b/platform/src/main/java/org/teavm/platform/plugin/AnnotationDependencySupport.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/AnnotationDependencySupport.java
rename to platform/src/main/java/org/teavm/platform/plugin/AnnotationDependencySupport.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/AsyncCallbackWrapper.java b/platform/src/main/java/org/teavm/platform/plugin/AsyncCallbackWrapper.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/AsyncCallbackWrapper.java
rename to platform/src/main/java/org/teavm/platform/plugin/AsyncCallbackWrapper.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/AsyncMethodGenerator.java b/platform/src/main/java/org/teavm/platform/plugin/AsyncMethodGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/AsyncMethodGenerator.java
rename to platform/src/main/java/org/teavm/platform/plugin/AsyncMethodGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java b/platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java
rename to platform/src/main/java/org/teavm/platform/plugin/AsyncMethodProcessor.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeClassResource.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeClassResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeClassResource.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeClassResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceArray.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceArray.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceArray.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceArray.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceGetter.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceGetter.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceGetter.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceGetter.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMap.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMap.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMap.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMap.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMethod.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMethod.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMethod.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceMethod.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxy.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxy.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxy.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxy.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyFactory.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyFactory.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyFactory.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyFactory.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceSetter.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceSetter.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceSetter.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceSetter.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceWriterMethod.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceWriterMethod.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceWriterMethod.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceWriterMethod.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeStaticFieldResource.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeStaticFieldResource.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/BuildTimeStaticFieldResource.java
rename to platform/src/main/java/org/teavm/platform/plugin/BuildTimeStaticFieldResource.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ClassLookupDependencySupport.java b/platform/src/main/java/org/teavm/platform/plugin/ClassLookupDependencySupport.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ClassLookupDependencySupport.java
rename to platform/src/main/java/org/teavm/platform/plugin/ClassLookupDependencySupport.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ClassScopedMetadataProviderNativeGenerator.java b/platform/src/main/java/org/teavm/platform/plugin/ClassScopedMetadataProviderNativeGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ClassScopedMetadataProviderNativeGenerator.java
rename to platform/src/main/java/org/teavm/platform/plugin/ClassScopedMetadataProviderNativeGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/DefaultMetadataGeneratorContext.java b/platform/src/main/java/org/teavm/platform/plugin/DefaultMetadataGeneratorContext.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/DefaultMetadataGeneratorContext.java
rename to platform/src/main/java/org/teavm/platform/plugin/DefaultMetadataGeneratorContext.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/EnumDependencySupport.java b/platform/src/main/java/org/teavm/platform/plugin/EnumDependencySupport.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/EnumDependencySupport.java
rename to platform/src/main/java/org/teavm/platform/plugin/EnumDependencySupport.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/MetadataProviderNativeGenerator.java b/platform/src/main/java/org/teavm/platform/plugin/MetadataProviderNativeGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/MetadataProviderNativeGenerator.java
rename to platform/src/main/java/org/teavm/platform/plugin/MetadataProviderNativeGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/MetadataProviderRef.java b/platform/src/main/java/org/teavm/platform/plugin/MetadataProviderRef.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/MetadataProviderRef.java
rename to platform/src/main/java/org/teavm/platform/plugin/MetadataProviderRef.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/MetadataProviderTransformer.java b/platform/src/main/java/org/teavm/platform/plugin/MetadataProviderTransformer.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/MetadataProviderTransformer.java
rename to platform/src/main/java/org/teavm/platform/plugin/MetadataProviderTransformer.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/NewInstanceDependencySupport.java b/platform/src/main/java/org/teavm/platform/plugin/NewInstanceDependencySupport.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/NewInstanceDependencySupport.java
rename to platform/src/main/java/org/teavm/platform/plugin/NewInstanceDependencySupport.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformDependencyListener.java b/platform/src/main/java/org/teavm/platform/plugin/PlatformDependencyListener.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformDependencyListener.java
rename to platform/src/main/java/org/teavm/platform/plugin/PlatformDependencyListener.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformGenerator.java b/platform/src/main/java/org/teavm/platform/plugin/PlatformGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformGenerator.java
rename to platform/src/main/java/org/teavm/platform/plugin/PlatformGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformPlugin.java b/platform/src/main/java/org/teavm/platform/plugin/PlatformPlugin.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformPlugin.java
rename to platform/src/main/java/org/teavm/platform/plugin/PlatformPlugin.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformQueueGenerator.java b/platform/src/main/java/org/teavm/platform/plugin/PlatformQueueGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/PlatformQueueGenerator.java
rename to platform/src/main/java/org/teavm/platform/plugin/PlatformQueueGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessor.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceAccessor.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessor.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceAccessor.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorDependencyListener.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorDependencyListener.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorDependencyListener.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorDependencyListener.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorGenerator.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorGenerator.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorGenerator.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorGenerator.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorInjector.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorInjector.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorInjector.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorInjector.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorTransformer.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorTransformer.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorTransformer.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceAccessorTransformer.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceTransformer.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceTransformer.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceTransformer.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceTransformer.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceWriter.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceWriter.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceWriter.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceWriter.java
diff --git a/teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceWriterHelper.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceWriterHelper.java
similarity index 100%
rename from teavm-platform/src/main/java/org/teavm/platform/plugin/ResourceWriterHelper.java
rename to platform/src/main/java/org/teavm/platform/plugin/ResourceWriterHelper.java
diff --git a/teavm-platform/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/platform/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
similarity index 100%
rename from teavm-platform/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
rename to platform/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin
diff --git a/pom.xml b/pom.xml
index e815ebe04..a5e460bf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,19 +73,18 @@
   </properties>
 
   <modules>
-    <module>teavm-core</module>
-    <module>teavm-classlib</module>
-    <module>teavm-maven</module>
-    <module>teavm-dom</module>
-    <module>teavm-jso</module>
-    <module>teavm-html4j</module>
-    <module>teavm-samples</module>
-    <module>teavm-platform</module>
-    <module>teavm-cli</module>
-    <module>teavm-chrome-rdp</module>
-    <module>teavm-tests</module>
-    <module>teavm-extras-slf4j</module>
-    <module>teavm-jso-impl</module>
+    <module>core</module>
+    <module>classlib</module>
+    <module>jso/core</module>
+    <module>jso/impl</module>
+    <module>html4j</module>
+    <module>samples</module>
+    <module>platform</module>
+    <module>tools/cli</module>
+    <module>tools/maven</module>
+    <module>tools/chrome-rdp</module>
+    <module>tests</module>
+    <module>extras-slf4j</module>
   </modules>
 
   <dependencyManagement>
@@ -294,7 +293,7 @@
     <profile>
       <id>enable-eclipse</id>
       <modules>
-        <module>teavm-eclipse</module>
+        <module>tools/eclipse</module>
       </modules>
     </profile>
   </profiles>
diff --git a/teavm-samples/teavm-samples-async/pom.xml b/samples/async/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-async/pom.xml
rename to samples/async/pom.xml
diff --git a/teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java b/samples/async/src/main/java/org/teavm/samples/async/AsyncProgram.java
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java
rename to samples/async/src/main/java/org/teavm/samples/async/AsyncProgram.java
diff --git a/teavm-samples/teavm-samples-async/src/main/webapp/WEB-INF/web.xml b/samples/async/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/webapp/WEB-INF/web.xml
rename to samples/async/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-async/src/main/webapp/highlight.pack.js b/samples/async/src/main/webapp/highlight.pack.js
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/webapp/highlight.pack.js
rename to samples/async/src/main/webapp/highlight.pack.js
diff --git a/teavm-samples/teavm-samples-async/src/main/webapp/index.html b/samples/async/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/webapp/index.html
rename to samples/async/src/main/webapp/index.html
diff --git a/teavm-samples/teavm-samples-async/src/main/webapp/style.css b/samples/async/src/main/webapp/style.css
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/webapp/style.css
rename to samples/async/src/main/webapp/style.css
diff --git a/teavm-samples/teavm-samples-async/src/main/webapp/syntax.css b/samples/async/src/main/webapp/syntax.css
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/webapp/syntax.css
rename to samples/async/src/main/webapp/syntax.css
diff --git a/teavm-samples/teavm-samples-async/src/main/webapp/teavm/stdout.js b/samples/async/src/main/webapp/teavm/stdout.js
similarity index 100%
rename from teavm-samples/teavm-samples-async/src/main/webapp/teavm/stdout.js
rename to samples/async/src/main/webapp/teavm/stdout.js
diff --git a/teavm-samples/teavm-samples-benchmark/README.md b/samples/benchmark/README.md
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/README.md
rename to samples/benchmark/README.md
diff --git a/teavm-samples/teavm-samples-benchmark/pom.xml b/samples/benchmark/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/pom.xml
rename to samples/benchmark/pom.xml
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/Scene.java b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/Scene.java
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/Scene.java
rename to samples/benchmark/src/main/java/org/teavm/samples/benchmark/Scene.java
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/gwt/BenchmarkStarter.java b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/gwt/BenchmarkStarter.java
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/gwt/BenchmarkStarter.java
rename to samples/benchmark/src/main/java/org/teavm/samples/benchmark/gwt/BenchmarkStarter.java
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/gwt/Performance.java b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/gwt/Performance.java
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/gwt/Performance.java
rename to samples/benchmark/src/main/java/org/teavm/samples/benchmark/gwt/Performance.java
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java
rename to samples/benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
similarity index 99%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
rename to samples/benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
index 1d4837261..de40d583e 100644
--- a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
+++ b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
@@ -128,5 +128,5 @@ public final class BenchmarkStarter {
         + "row.appendChild(timeCell);\n"
         + "timeCell.appendChild(document.createTextNode(timeSpentCalculating));\n"
     )
-    private static native void publishResults(int second, double time);
+    private static native void publishResults(int second, double timeSpentCalculating);
 }
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/teavm/BenchmarkStarter.java b/samples/benchmark/src/main/java/org/teavm/samples/benchmark/teavm/BenchmarkStarter.java
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/teavm/BenchmarkStarter.java
rename to samples/benchmark/src/main/java/org/teavm/samples/benchmark/teavm/BenchmarkStarter.java
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/benchmark.gwt.xml b/samples/benchmark/src/main/resources/org/teavm/samples/benchmark/benchmark.gwt.xml
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/benchmark.gwt.xml
rename to samples/benchmark/src/main/resources/org/teavm/samples/benchmark/benchmark.gwt.xml
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/htmljava/fx.html b/samples/benchmark/src/main/resources/org/teavm/samples/benchmark/htmljava/fx.html
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/htmljava/fx.html
rename to samples/benchmark/src/main/resources/org/teavm/samples/benchmark/htmljava/fx.html
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/webapp/WEB-INF/web.xml b/samples/benchmark/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/webapp/WEB-INF/web.xml
rename to samples/benchmark/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/webapp/gwt.html b/samples/benchmark/src/main/webapp/gwt.html
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/webapp/gwt.html
rename to samples/benchmark/src/main/webapp/gwt.html
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/webapp/index.html b/samples/benchmark/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/webapp/index.html
rename to samples/benchmark/src/main/webapp/index.html
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/webapp/teavm.html b/samples/benchmark/src/main/webapp/teavm.html
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/webapp/teavm.html
rename to samples/benchmark/src/main/webapp/teavm.html
diff --git a/teavm-samples/teavm-samples-hello/pom.xml b/samples/hello/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-hello/pom.xml
rename to samples/hello/pom.xml
diff --git a/teavm-samples/teavm-samples-hello/src/main/java/org/teavm/samples/hello/Client.java b/samples/hello/src/main/java/org/teavm/samples/hello/Client.java
similarity index 100%
rename from teavm-samples/teavm-samples-hello/src/main/java/org/teavm/samples/hello/Client.java
rename to samples/hello/src/main/java/org/teavm/samples/hello/Client.java
diff --git a/teavm-samples/teavm-samples-hello/src/main/java/org/teavm/samples/hello/Server.java b/samples/hello/src/main/java/org/teavm/samples/hello/Server.java
similarity index 100%
rename from teavm-samples/teavm-samples-hello/src/main/java/org/teavm/samples/hello/Server.java
rename to samples/hello/src/main/java/org/teavm/samples/hello/Server.java
diff --git a/teavm-samples/teavm-samples-hello/src/main/webapp/WEB-INF/web.xml b/samples/hello/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-hello/src/main/webapp/WEB-INF/web.xml
rename to samples/hello/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-hello/src/main/webapp/index.html b/samples/hello/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-hello/src/main/webapp/index.html
rename to samples/hello/src/main/webapp/index.html
diff --git a/teavm-samples/teavm-samples-kotlin/pom.xml b/samples/kotlin/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-kotlin/pom.xml
rename to samples/kotlin/pom.xml
diff --git a/teavm-samples/teavm-samples-kotlin/src/main/kotlin/Hello.kt b/samples/kotlin/src/main/kotlin/Hello.kt
similarity index 100%
rename from teavm-samples/teavm-samples-kotlin/src/main/kotlin/Hello.kt
rename to samples/kotlin/src/main/kotlin/Hello.kt
diff --git a/teavm-samples/teavm-samples-kotlin/src/main/webapp/WEB-INF/web.xml b/samples/kotlin/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-kotlin/src/main/webapp/WEB-INF/web.xml
rename to samples/kotlin/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-kotlin/src/main/webapp/index.html b/samples/kotlin/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-kotlin/src/main/webapp/index.html
rename to samples/kotlin/src/main/webapp/index.html
diff --git a/teavm-samples/pom.xml b/samples/pom.xml
similarity index 79%
rename from teavm-samples/pom.xml
rename to samples/pom.xml
index 6722bef47..fea836574 100644
--- a/teavm-samples/pom.xml
+++ b/samples/pom.xml
@@ -30,12 +30,12 @@
   <description>TeaVM code samples</description>
 
   <modules>
-    <module>teavm-samples-hello</module>
-    <module>teavm-samples-benchmark</module>
-    <module>teavm-samples-storage</module>
-    <module>teavm-samples-video</module>
-    <module>teavm-samples-async</module>
-    <module>teavm-samples-kotlin</module>
-    <module>teavm-samples-scala</module>
+    <module>hello</module>
+    <module>benchmark</module>
+    <module>storage</module>
+    <module>video</module>
+    <module>async</module>
+    <module>kotlin</module>
+    <module>scala</module>
   </modules>
 </project>
\ No newline at end of file
diff --git a/teavm-samples/teavm-samples-scala/pom.xml b/samples/scala/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-scala/pom.xml
rename to samples/scala/pom.xml
diff --git a/teavm-samples/teavm-samples-scala/src/main/scala/org/teavm/samples/scala/Client.scala b/samples/scala/src/main/scala/org/teavm/samples/scala/Client.scala
similarity index 100%
rename from teavm-samples/teavm-samples-scala/src/main/scala/org/teavm/samples/scala/Client.scala
rename to samples/scala/src/main/scala/org/teavm/samples/scala/Client.scala
diff --git a/teavm-samples/teavm-samples-scala/src/main/scala/org/teavm/samples/scala/Grammar.scala b/samples/scala/src/main/scala/org/teavm/samples/scala/Grammar.scala
similarity index 100%
rename from teavm-samples/teavm-samples-scala/src/main/scala/org/teavm/samples/scala/Grammar.scala
rename to samples/scala/src/main/scala/org/teavm/samples/scala/Grammar.scala
diff --git a/teavm-samples/teavm-samples-scala/src/main/webapp/WEB-INF/web.xml b/samples/scala/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-scala/src/main/webapp/WEB-INF/web.xml
rename to samples/scala/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-scala/src/main/webapp/calculator.css b/samples/scala/src/main/webapp/calculator.css
similarity index 100%
rename from teavm-samples/teavm-samples-scala/src/main/webapp/calculator.css
rename to samples/scala/src/main/webapp/calculator.css
diff --git a/teavm-samples/teavm-samples-scala/src/main/webapp/index.html b/samples/scala/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-scala/src/main/webapp/index.html
rename to samples/scala/src/main/webapp/index.html
diff --git a/teavm-samples/teavm-samples-storage/pom.xml b/samples/storage/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-storage/pom.xml
rename to samples/storage/pom.xml
diff --git a/teavm-samples/teavm-samples-storage/src/main/java/org/teavm/samples/storage/Application.java b/samples/storage/src/main/java/org/teavm/samples/storage/Application.java
similarity index 100%
rename from teavm-samples/teavm-samples-storage/src/main/java/org/teavm/samples/storage/Application.java
rename to samples/storage/src/main/java/org/teavm/samples/storage/Application.java
diff --git a/teavm-samples/teavm-samples-storage/src/main/webapp/WEB-INF/web.xml b/samples/storage/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-storage/src/main/webapp/WEB-INF/web.xml
rename to samples/storage/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-storage/src/main/webapp/index.html b/samples/storage/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-storage/src/main/webapp/index.html
rename to samples/storage/src/main/webapp/index.html
diff --git a/teavm-samples/teavm-samples-video/pom.xml b/samples/video/pom.xml
similarity index 100%
rename from teavm-samples/teavm-samples-video/pom.xml
rename to samples/video/pom.xml
diff --git a/teavm-samples/teavm-samples-video/src/main/java/org/teavm/samples/video/Player.java b/samples/video/src/main/java/org/teavm/samples/video/Player.java
similarity index 100%
rename from teavm-samples/teavm-samples-video/src/main/java/org/teavm/samples/video/Player.java
rename to samples/video/src/main/java/org/teavm/samples/video/Player.java
diff --git a/teavm-samples/teavm-samples-video/src/main/webapp/WEB-INF/web.xml b/samples/video/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-samples/teavm-samples-video/src/main/webapp/WEB-INF/web.xml
rename to samples/video/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-samples/teavm-samples-video/src/main/webapp/index.html b/samples/video/src/main/webapp/index.html
similarity index 100%
rename from teavm-samples/teavm-samples-video/src/main/webapp/index.html
rename to samples/video/src/main/webapp/index.html
diff --git a/teavm-samples/teavm-samples-video/src/main/webapp/style.css b/samples/video/src/main/webapp/style.css
similarity index 100%
rename from teavm-samples/teavm-samples-video/src/main/webapp/style.css
rename to samples/video/src/main/webapp/style.css
diff --git a/teavm-chrome-rdp/.gitignore b/teavm-chrome-rdp/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-chrome-rdp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-classlib/.gitignore b/teavm-classlib/.gitignore
deleted file mode 100644
index 324450954..000000000
--- a/teavm-classlib/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-.settings
-.project
-.classpath
\ No newline at end of file
diff --git a/teavm-cli/.gitignore b/teavm-cli/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-cli/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-core/.gitignore b/teavm-core/.gitignore
deleted file mode 100644
index 707b0a7ea..000000000
--- a/teavm-core/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-.classpath
-.project
-.settings
-.directory
\ No newline at end of file
diff --git a/teavm-dom/.gitignore b/teavm-dom/.gitignore
deleted file mode 100644
index 968391422..000000000
--- a/teavm-dom/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-.classpath
-.project
-.settings
\ No newline at end of file
diff --git a/teavm-dom/pom.xml b/teavm-dom/pom.xml
deleted file mode 100644
index 28b4eb3f2..000000000
--- a/teavm-dom/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-    Copyright 2014 Alexey Andreev.
-
-    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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.teavm</groupId>
-    <artifactId>teavm</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>teavm-dom</artifactId>
-
-  <name>TeaVM DOM</name>
-  <description>TeaVM browser interface declaration</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.teavm</groupId>
-      <artifactId>teavm-core</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.teavm</groupId>
-      <artifactId>teavm-jso</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/teavm-eclipse/.gitignore b/teavm-eclipse/.gitignore
deleted file mode 100644
index 650751b26..000000000
--- a/teavm-eclipse/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.settings
-/.project
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore b/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
deleted file mode 100644
index 8f0913a70..000000000
--- a/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
-/lib
diff --git a/teavm-eclipse/teavm-eclipse-feature/.gitignore b/teavm-eclipse/teavm-eclipse-feature/.gitignore
deleted file mode 100644
index dc18fc4dc..000000000
--- a/teavm-eclipse/teavm-eclipse-feature/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/.settings
-/.project
diff --git a/teavm-eclipse/teavm-eclipse-m2e-feature/.gitignore b/teavm-eclipse/teavm-eclipse-m2e-feature/.gitignore
deleted file mode 100644
index dc18fc4dc..000000000
--- a/teavm-eclipse/teavm-eclipse-m2e-feature/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/.settings
-/.project
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore b/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.gitignore b/teavm-eclipse/teavm-eclipse-plugin/.gitignore
deleted file mode 100644
index dbe5a1815..000000000
--- a/teavm-eclipse/teavm-eclipse-plugin/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/lib
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/.gitignore b/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
deleted file mode 100644
index dc18fc4dc..000000000
--- a/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/.settings
-/.project
diff --git a/teavm-extras-slf4j/.gitignore b/teavm-extras-slf4j/.gitignore
deleted file mode 100644
index 8bd3a0588..000000000
--- a/teavm-extras-slf4j/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project
diff --git a/teavm-html4j/.gitignore b/teavm-html4j/.gitignore
deleted file mode 100644
index df70de676..000000000
--- a/teavm-html4j/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-/.settings
-/.classpath
-/.factorypath
-/.project
diff --git a/teavm-jso-impl/.gitignore b/teavm-jso-impl/.gitignore
deleted file mode 100644
index 8bd3a0588..000000000
--- a/teavm-jso-impl/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project
diff --git a/teavm-jso/.gitignore b/teavm-jso/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-jso/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-maven/.gitignore b/teavm-maven/.gitignore
deleted file mode 100644
index 650751b26..000000000
--- a/teavm-maven/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.settings
-/.project
diff --git a/teavm-maven/teavm-maven-plugin/.factorypath b/teavm-maven/teavm-maven-plugin/.factorypath
deleted file mode 100644
index d1aae2f90..000000000
--- a/teavm-maven/teavm-maven-plugin/.factorypath
+++ /dev/null
@@ -1,37 +0,0 @@
-<factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-plugin-api/3.3.3/maven-plugin-api-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.0/org.eclipse.sisu.plexus-0.3.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.0/org.eclipse.sisu.inject-0.3.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.3/maven-plugin-annotations-3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-core/3.3.3/maven-core-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-settings/3.3.3/maven-settings-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-settings-builder/3.3.3/maven-settings-builder-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-builder-support/3.3.3/maven-builder-support-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-repository-metadata/3.3.3/maven-repository-metadata-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model-builder/3.3.3/maven-model-builder-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/18.0/guava-18.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-aether-provider/3.3.3/maven-aether-provider-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/sisu/sisu-guice/3.2.5/sisu-guice-3.2.5-no_aop.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-utils/3.0.20/plexus-utils-3.0.20.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-artifact/3.3.3/maven-artifact-3.3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/carrotsearch/hppc/0.6.1/hppc-0.6.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.11/junit-4.11.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
-</factorypath>
diff --git a/teavm-maven/teavm-maven-plugin/.gitignore b/teavm-maven/teavm-maven-plugin/.gitignore
deleted file mode 100644
index 921305bbc..000000000
--- a/teavm-maven/teavm-maven-plugin/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-bin
-.project
-.settings
-.classpath
\ No newline at end of file
diff --git a/teavm-maven/teavm-maven-webapp/.gitignore b/teavm-maven/teavm-maven-webapp/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-maven/teavm-maven-webapp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-platform/.gitignore b/teavm-platform/.gitignore
deleted file mode 100644
index bb138cf03..000000000
--- a/teavm-platform/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.project
-/.classpath
diff --git a/teavm-samples/.gitignore b/teavm-samples/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-samples/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-samples/teavm-samples-async/.gitignore b/teavm-samples/teavm-samples-async/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-samples/teavm-samples-async/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-samples/teavm-samples-benchmark/.gitignore b/teavm-samples/teavm-samples-benchmark/.gitignore
deleted file mode 100644
index 006fd3a0b..000000000
--- a/teavm-samples/teavm-samples-benchmark/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
-/.factorypath
diff --git a/teavm-samples/teavm-samples-hello/.gitignore b/teavm-samples/teavm-samples-hello/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-samples/teavm-samples-hello/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-samples/teavm-samples-kotlin/.gitignore b/teavm-samples/teavm-samples-kotlin/.gitignore
deleted file mode 100644
index 8bd3a0588..000000000
--- a/teavm-samples/teavm-samples-kotlin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project
diff --git a/teavm-samples/teavm-samples-scala/.gitignore b/teavm-samples/teavm-samples-scala/.gitignore
deleted file mode 100644
index 4ee0de943..000000000
--- a/teavm-samples/teavm-samples-scala/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project
-/.cache-main
diff --git a/teavm-samples/teavm-samples-storage/.gitignore b/teavm-samples/teavm-samples-storage/.gitignore
deleted file mode 100644
index 8bd3a0588..000000000
--- a/teavm-samples/teavm-samples-storage/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project
diff --git a/teavm-samples/teavm-samples-video/.gitignore b/teavm-samples/teavm-samples-video/.gitignore
deleted file mode 100644
index 8bd3a0588..000000000
--- a/teavm-samples/teavm-samples-video/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project
diff --git a/teavm-tests/.gitignore b/teavm-tests/.gitignore
deleted file mode 100644
index c708c363d..000000000
--- a/teavm-tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/.settings
-/.classpath
-/.project
diff --git a/teavm-tests/pom.xml b/tests/pom.xml
similarity index 100%
rename from teavm-tests/pom.xml
rename to tests/pom.xml
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java
rename to tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java b/tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java
rename to tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java b/tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java
rename to tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java b/tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java
rename to tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java
rename to tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/BooleanTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/BooleanTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/BooleanTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/BooleanTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/CharacterTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/CharacterTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/CharacterTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/CharacterTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/DoubleTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/DoubleTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/DoubleTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/DoubleTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/FloatTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/FloatTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/FloatTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/FloatTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/LambdaTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/LambdaTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/LambdaTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/LambdaTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/MathTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/MathTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/MathTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/MathTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/TestObject.java b/tests/src/test/java/org/teavm/classlib/java/lang/TestObject.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/TestObject.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/TestObject.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/VMTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/VMTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/VMTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/VMTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java
rename to tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java
rename to tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java b/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java
rename to tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java
rename to tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java b/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java
rename to tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java
rename to tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java
rename to tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java
rename to tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/ArrayDequeTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ArrayDequeTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/ArrayDequeTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/ArrayDequeTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java b/tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java b/tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/CollectionsTest.java b/tests/src/test/java/org/teavm/classlib/java/util/CollectionsTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/CollectionsTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/CollectionsTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java b/tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/DateTest.java b/tests/src/test/java/org/teavm/classlib/java/util/DateTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/DateTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/DateTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java b/tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java b/tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java b/tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/PriorityQueueTest.java b/tests/src/test/java/org/teavm/classlib/java/util/PriorityQueueTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/PriorityQueueTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/PriorityQueueTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java b/tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/TestService.java b/tests/src/test/java/org/teavm/classlib/java/util/TestService.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/TestService.java
rename to tests/src/test/java/org/teavm/classlib/java/util/TestService.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/TestServiceImpl.java b/tests/src/test/java/org/teavm/classlib/java/util/TestServiceImpl.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/TestServiceImpl.java
rename to tests/src/test/java/org/teavm/classlib/java/util/TestServiceImpl.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java b/tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java b/tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/zip/GZIPInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/util/zip/GZIPInputStreamTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/java/util/zip/GZIPInputStreamTest.java
rename to tests/src/test/java/org/teavm/classlib/java/util/zip/GZIPInputStreamTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/support/Support_CollectionTest.java b/tests/src/test/java/org/teavm/classlib/support/Support_CollectionTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/support/Support_CollectionTest.java
rename to tests/src/test/java/org/teavm/classlib/support/Support_CollectionTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/support/Support_ListTest.java b/tests/src/test/java/org/teavm/classlib/support/Support_ListTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/support/Support_ListTest.java
rename to tests/src/test/java/org/teavm/classlib/support/Support_ListTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/support/Support_MapTest2.java b/tests/src/test/java/org/teavm/classlib/support/Support_MapTest2.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/support/Support_MapTest2.java
rename to tests/src/test/java/org/teavm/classlib/support/Support_MapTest2.java
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/support/Support_UnmodifiableCollectionTest.java b/tests/src/test/java/org/teavm/classlib/support/Support_UnmodifiableCollectionTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/classlib/support/Support_UnmodifiableCollectionTest.java
rename to tests/src/test/java/org/teavm/classlib/support/Support_UnmodifiableCollectionTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/platform/metadata/DependentTestResource.java b/tests/src/test/java/org/teavm/platform/metadata/DependentTestResource.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/platform/metadata/DependentTestResource.java
rename to tests/src/test/java/org/teavm/platform/metadata/DependentTestResource.java
diff --git a/teavm-tests/src/test/java/org/teavm/platform/metadata/MetadataGeneratorTest.java b/tests/src/test/java/org/teavm/platform/metadata/MetadataGeneratorTest.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/platform/metadata/MetadataGeneratorTest.java
rename to tests/src/test/java/org/teavm/platform/metadata/MetadataGeneratorTest.java
diff --git a/teavm-tests/src/test/java/org/teavm/platform/metadata/TestResource.java b/tests/src/test/java/org/teavm/platform/metadata/TestResource.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/platform/metadata/TestResource.java
rename to tests/src/test/java/org/teavm/platform/metadata/TestResource.java
diff --git a/teavm-tests/src/test/java/org/teavm/platform/metadata/TestResourceGenerator.java b/tests/src/test/java/org/teavm/platform/metadata/TestResourceGenerator.java
similarity index 100%
rename from teavm-tests/src/test/java/org/teavm/platform/metadata/TestResourceGenerator.java
rename to tests/src/test/java/org/teavm/platform/metadata/TestResourceGenerator.java
diff --git a/teavm-tests/src/test/resources/META-INF/services/org.teavm.classlib.java.util.TestService b/tests/src/test/resources/META-INF/services/org.teavm.classlib.java.util.TestService
similarity index 100%
rename from teavm-tests/src/test/resources/META-INF/services/org.teavm.classlib.java.util.TestService
rename to tests/src/test/resources/META-INF/services/org.teavm.classlib.java.util.TestService
diff --git a/teavm-chrome-rdp/pom.xml b/tools/chrome-rdp/pom.xml
similarity index 96%
rename from teavm-chrome-rdp/pom.xml
rename to tools/chrome-rdp/pom.xml
index d734f22e9..cc17209eb 100644
--- a/teavm-chrome-rdp/pom.xml
+++ b/tools/chrome-rdp/pom.xml
@@ -81,7 +81,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../checkstyle.xml</configLocation>
+          <propertyExpansion>config_loc=${basedir}/../..</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPContainer.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPContainer.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPContainer.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPContainer.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebuggerEndpoint.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebuggerEndpoint.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebuggerEndpoint.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebuggerEndpoint.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchange.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchange.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchange.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchange.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeConsumer.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeConsumer.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeConsumer.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeConsumer.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeListener.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeListener.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeListener.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPExchangeListener.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPServer.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPServer.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPServer.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPServer.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPBreakpoint.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPBreakpoint.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPBreakpoint.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPBreakpoint.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPCallFrame.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPCallFrame.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPCallFrame.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPCallFrame.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPLocalVariable.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPLocalVariable.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPLocalVariable.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPLocalVariable.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPScope.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPScope.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPScope.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPScope.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPValue.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPValue.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/RDPValue.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/RDPValue.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallArgumentDTO.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallArgumentDTO.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallArgumentDTO.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallArgumentDTO.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallFrameDTO.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallFrameDTO.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallFrameDTO.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/CallFrameDTO.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/LocationDTO.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/LocationDTO.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/LocationDTO.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/LocationDTO.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/Message.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/Message.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/Message.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/Message.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/PropertyDescriptorDTO.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/PropertyDescriptorDTO.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/PropertyDescriptorDTO.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/PropertyDescriptorDTO.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/RemoteObjectDTO.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/RemoteObjectDTO.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/RemoteObjectDTO.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/RemoteObjectDTO.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/Response.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/Response.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/Response.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/Response.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/ScopeDTO.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/ScopeDTO.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/data/ScopeDTO.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/data/ScopeDTO.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionCommand.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionCommand.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionCommand.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionCommand.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionResponse.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionResponse.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionResponse.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/CallFunctionResponse.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ContinueToLocationCommand.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ContinueToLocationCommand.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ContinueToLocationCommand.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ContinueToLocationCommand.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesCommand.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesCommand.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesCommand.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesCommand.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesResponse.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesResponse.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesResponse.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/GetPropertiesResponse.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/RemoveBreakpointCommand.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/RemoveBreakpointCommand.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/RemoveBreakpointCommand.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/RemoveBreakpointCommand.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ScriptParsedNotification.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ScriptParsedNotification.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ScriptParsedNotification.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/ScriptParsedNotification.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointCommand.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointCommand.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointCommand.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointCommand.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointResponse.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointResponse.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointResponse.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SetBreakpointResponse.java
diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SuspendedNotification.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SuspendedNotification.java
similarity index 100%
rename from teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SuspendedNotification.java
rename to tools/chrome-rdp/src/main/java/org/teavm/chromerdp/messages/SuspendedNotification.java
diff --git a/teavm-chrome-rdp/src/main/js/chrome/main.js b/tools/chrome-rdp/src/main/js/chrome/main.js
similarity index 100%
rename from teavm-chrome-rdp/src/main/js/chrome/main.js
rename to tools/chrome-rdp/src/main/js/chrome/main.js
diff --git a/teavm-chrome-rdp/src/main/js/chrome/manifest.json b/tools/chrome-rdp/src/main/js/chrome/manifest.json
similarity index 100%
rename from teavm-chrome-rdp/src/main/js/chrome/manifest.json
rename to tools/chrome-rdp/src/main/js/chrome/manifest.json
diff --git a/teavm-chrome-rdp/src/main/js/chrome/teavm-16.png b/tools/chrome-rdp/src/main/js/chrome/teavm-16.png
similarity index 100%
rename from teavm-chrome-rdp/src/main/js/chrome/teavm-16.png
rename to tools/chrome-rdp/src/main/js/chrome/teavm-16.png
diff --git a/teavm-cli/pom.xml b/tools/cli/pom.xml
similarity index 93%
rename from teavm-cli/pom.xml
rename to tools/cli/pom.xml
index ed3beeff0..7d1e838c8 100644
--- a/teavm-cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -46,7 +46,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../checkstyle.xml</configLocation>
+          <propertyExpansion>config_loc=${basedir}/../..</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>
diff --git a/teavm-cli/src/main/java/org/teavm/cli/ConsoleTeaVMToolLog.java b/tools/cli/src/main/java/org/teavm/cli/ConsoleTeaVMToolLog.java
similarity index 100%
rename from teavm-cli/src/main/java/org/teavm/cli/ConsoleTeaVMToolLog.java
rename to tools/cli/src/main/java/org/teavm/cli/ConsoleTeaVMToolLog.java
diff --git a/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java b/tools/cli/src/main/java/org/teavm/cli/TeaVMRunner.java
similarity index 100%
rename from teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
rename to tools/cli/src/main/java/org/teavm/cli/TeaVMRunner.java
diff --git a/teavm-cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java b/tools/cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java
similarity index 100%
rename from teavm-cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java
rename to tools/cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java
diff --git a/tools/eclipse/core-plugin/.gitignore b/tools/eclipse/core-plugin/.gitignore
new file mode 100644
index 000000000..12c18d4ed
--- /dev/null
+++ b/tools/eclipse/core-plugin/.gitignore
@@ -0,0 +1 @@
+/lib/
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/META-INF/MANIFEST.MF b/tools/eclipse/core-plugin/META-INF/MANIFEST.MF
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-core-plugin/META-INF/MANIFEST.MF
rename to tools/eclipse/core-plugin/META-INF/MANIFEST.MF
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/build.properties b/tools/eclipse/core-plugin/build.properties
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-core-plugin/build.properties
rename to tools/eclipse/core-plugin/build.properties
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml b/tools/eclipse/core-plugin/dep-pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml
rename to tools/eclipse/core-plugin/dep-pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/logback.xml b/tools/eclipse/core-plugin/logback.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-core-plugin/logback.xml
rename to tools/eclipse/core-plugin/logback.xml
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml b/tools/eclipse/core-plugin/pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-core-plugin/pom.xml
rename to tools/eclipse/core-plugin/pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-feature/build.properties b/tools/eclipse/feature/build.properties
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-feature/build.properties
rename to tools/eclipse/feature/build.properties
diff --git a/teavm-eclipse/teavm-eclipse-feature/feature.xml b/tools/eclipse/feature/feature.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-feature/feature.xml
rename to tools/eclipse/feature/feature.xml
diff --git a/teavm-eclipse/teavm-eclipse-feature/pom.xml b/tools/eclipse/feature/pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-feature/pom.xml
rename to tools/eclipse/feature/pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-m2e-feature/build.properties b/tools/eclipse/m2e-feature/build.properties
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-feature/build.properties
rename to tools/eclipse/m2e-feature/build.properties
diff --git a/teavm-eclipse/teavm-eclipse-m2e-feature/feature.xml b/tools/eclipse/m2e-feature/feature.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-feature/feature.xml
rename to tools/eclipse/m2e-feature/feature.xml
diff --git a/teavm-eclipse/teavm-eclipse-m2e-feature/pom.xml b/tools/eclipse/m2e-feature/pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-feature/pom.xml
rename to tools/eclipse/m2e-feature/pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/META-INF/MANIFEST.MF b/tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-plugin/META-INF/MANIFEST.MF
rename to tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/build.properties b/tools/eclipse/m2e-plugin/build.properties
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-plugin/build.properties
rename to tools/eclipse/m2e-plugin/build.properties
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/lifecycle-mapping-metadata.xml b/tools/eclipse/m2e-plugin/lifecycle-mapping-metadata.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-plugin/lifecycle-mapping-metadata.xml
rename to tools/eclipse/m2e-plugin/lifecycle-mapping-metadata.xml
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/plugin.xml b/tools/eclipse/m2e-plugin/plugin.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-plugin/plugin.xml
rename to tools/eclipse/m2e-plugin/plugin.xml
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml b/tools/eclipse/m2e-plugin/pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml
rename to tools/eclipse/m2e-plugin/pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/src/main/java/org/teavm/eclipse/m2e/TeaVMProjectConfigurator.java b/tools/eclipse/m2e-plugin/src/main/java/org/teavm/eclipse/m2e/TeaVMProjectConfigurator.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-m2e-plugin/src/main/java/org/teavm/eclipse/m2e/TeaVMProjectConfigurator.java
rename to tools/eclipse/m2e-plugin/src/main/java/org/teavm/eclipse/m2e/TeaVMProjectConfigurator.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/META-INF/MANIFEST.MF b/tools/eclipse/plugin/META-INF/MANIFEST.MF
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/META-INF/MANIFEST.MF
rename to tools/eclipse/plugin/META-INF/MANIFEST.MF
diff --git a/teavm-eclipse/teavm-eclipse-plugin/build.properties b/tools/eclipse/plugin/build.properties
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/build.properties
rename to tools/eclipse/plugin/build.properties
diff --git a/teavm-eclipse/teavm-eclipse-plugin/logback.xml b/tools/eclipse/plugin/logback.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/logback.xml
rename to tools/eclipse/plugin/logback.xml
diff --git a/teavm-eclipse/teavm-eclipse-plugin/plugin.xml b/tools/eclipse/plugin/plugin.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/plugin.xml
rename to tools/eclipse/plugin/plugin.xml
diff --git a/teavm-eclipse/teavm-eclipse-plugin/pom.xml b/tools/eclipse/plugin/pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/pom.xml
rename to tools/eclipse/plugin/pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/PreferencesBasedTeaVMProjectSettings.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/PreferencesBasedTeaVMProjectSettings.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/PreferencesBasedTeaVMProjectSettings.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/PreferencesBasedTeaVMProjectSettings.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMEclipsePlugin.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMEclipsePlugin.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMEclipsePlugin.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMEclipsePlugin.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMEclipseProgressListener.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMEclipseProgressListener.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMEclipseProgressListener.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMEclipseProgressListener.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProfile.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProfile.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProfile.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProfile.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectNature.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProjectNature.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectNature.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProjectNature.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectSettings.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProjectSettings.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectSettings.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMProjectSettings.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMRuntimeMode.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMRuntimeMode.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMRuntimeMode.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/TeaVMRuntimeMode.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/PropertyNameComparator.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/PropertyNameComparator.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/PropertyNameComparator.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/PropertyNameComparator.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugElement.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugElement.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugElement.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugElement.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugProcess.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugProcess.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugProcess.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugProcess.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugTarget.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugTarget.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugTarget.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugTarget.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSScope.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSScope.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSScope.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSScope.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSStackFrame.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSStackFrame.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSStackFrame.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSStackFrame.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSThread.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSThread.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSThread.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSThread.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSValue.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSValue.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSValue.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSValue.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariable.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariable.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariable.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariable.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariablesHolder.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariablesHolder.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariablesHolder.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJSVariablesHolder.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaStackFrame.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaStackFrame.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaStackFrame.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaStackFrame.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaThread.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaThread.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaThread.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaThread.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaValue.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaValue.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaValue.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaValue.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariable.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariable.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariable.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariable.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariablesHolder.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariablesHolder.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariablesHolder.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMJavaVariablesHolder.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMLaunchConfigurationDelegate.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMLaunchConfigurationDelegate.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMLaunchConfigurationDelegate.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMLaunchConfigurationDelegate.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupDirector.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupDirector.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupDirector.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupDirector.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupParticipant.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupParticipant.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupParticipant.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupParticipant.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourcePathComputerDelegate.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourcePathComputerDelegate.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourcePathComputerDelegate.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourcePathComputerDelegate.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStackFrame.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStackFrame.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStackFrame.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStackFrame.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamMonitor.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamMonitor.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamMonitor.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamMonitor.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamsProxy.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamsProxy.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamsProxy.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamsProxy.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMThread.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMThread.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMThread.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMThread.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMValue.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMValue.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMValue.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMValue.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariable.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariable.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariable.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariable.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariablesHolder.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariablesHolder.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariablesHolder.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMVariablesHolder.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/StorageEditorInput.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/StorageEditorInput.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/StorageEditorInput.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/StorageEditorInput.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMDebugModelPresentation.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMDebugModelPresentation.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMDebugModelPresentation.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMDebugModelPresentation.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTab.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTab.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTab.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTab.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTabGroup.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTabGroup.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTabGroup.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTabGroup.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLEditorInput.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLEditorInput.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLEditorInput.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLEditorInput.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLStorage.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLStorage.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLStorage.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/debugger/ui/URLStorage.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/AnyClassSelectionDialog.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/AnyClassSelectionDialog.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/AnyClassSelectionDialog.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/AnyClassSelectionDialog.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/ClassSelectionDialog.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/ClassSelectionDialog.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/ClassSelectionDialog.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/ClassSelectionDialog.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/MainClassSelectionDialog.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/MainClassSelectionDialog.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/MainClassSelectionDialog.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/MainClassSelectionDialog.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProfileDialog.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProfileDialog.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProfileDialog.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProfileDialog.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProjectPropertyPage.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProjectPropertyPage.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProjectPropertyPage.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/TeaVMProjectPropertyPage.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/TransformerClassSelectionDialog.java b/tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/TransformerClassSelectionDialog.java
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/ui/TransformerClassSelectionDialog.java
rename to tools/eclipse/plugin/src/main/java/org/teavm/eclipse/ui/TransformerClassSelectionDialog.java
diff --git a/teavm-eclipse/teavm-eclipse-plugin/teavm-16.png b/tools/eclipse/plugin/teavm-16.png
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-plugin/teavm-16.png
rename to tools/eclipse/plugin/teavm-16.png
diff --git a/teavm-eclipse/pom.xml b/tools/eclipse/pom.xml
similarity index 91%
rename from teavm-eclipse/pom.xml
rename to tools/eclipse/pom.xml
index 0c661d539..9d5cccf51 100644
--- a/teavm-eclipse/pom.xml
+++ b/tools/eclipse/pom.xml
@@ -34,12 +34,12 @@
   </properties>
 
   <modules>
-    <module>teavm-eclipse-core-plugin</module>
-    <module>teavm-eclipse-plugin</module>
-    <module>teavm-eclipse-m2e-plugin</module>
-    <module>teavm-eclipse-feature</module>
-    <module>teavm-eclipse-m2e-feature</module>
-    <module>teavm-eclipse-updatesite</module>
+    <module>core-plugin</module>
+    <module>plugin</module>
+    <module>m2e-plugin</module>
+    <module>feature</module>
+    <module>m2e-feature</module>
+    <module>updatesite</module>
   </modules>
 
   <repositories>
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/category.xml b/tools/eclipse/updatesite/category.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-updatesite/category.xml
rename to tools/eclipse/updatesite/category.xml
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/pom.xml b/tools/eclipse/updatesite/pom.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-updatesite/pom.xml
rename to tools/eclipse/updatesite/pom.xml
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/site.xml b/tools/eclipse/updatesite/site.xml
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-updatesite/site.xml
rename to tools/eclipse/updatesite/site.xml
diff --git a/teavm-maven/teavm-maven-plugin/pom.xml b/tools/maven/plugin/pom.xml
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/pom.xml
rename to tools/maven/plugin/pom.xml
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java b/tools/maven/plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptTestMojo.java b/tools/maven/plugin/src/main/java/org/teavm/maven/BuildJavascriptTestMojo.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptTestMojo.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/BuildJavascriptTestMojo.java
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/MavenSourceFileProviderLookup.java b/tools/maven/plugin/src/main/java/org/teavm/maven/MavenSourceFileProviderLookup.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/MavenSourceFileProviderLookup.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/MavenSourceFileProviderLookup.java
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/MavenTeaVMToolLog.java b/tools/maven/plugin/src/main/java/org/teavm/maven/MavenTeaVMToolLog.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/MavenTeaVMToolLog.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/MavenTeaVMToolLog.java
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/MethodAliasArgument.java b/tools/maven/plugin/src/main/java/org/teavm/maven/MethodAliasArgument.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/MethodAliasArgument.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/MethodAliasArgument.java
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/TestExceptionDependency.java b/tools/maven/plugin/src/main/java/org/teavm/maven/TestExceptionDependency.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/TestExceptionDependency.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/TestExceptionDependency.java
diff --git a/teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/TestExceptionPlugin.java b/tools/maven/plugin/src/main/java/org/teavm/maven/TestExceptionPlugin.java
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/main/java/org/teavm/maven/TestExceptionPlugin.java
rename to tools/maven/plugin/src/main/java/org/teavm/maven/TestExceptionPlugin.java
diff --git a/teavm-maven/teavm-maven-plugin/src/test/java/.gitignore b/tools/maven/plugin/src/test/java/.gitignore
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/test/java/.gitignore
rename to tools/maven/plugin/src/test/java/.gitignore
diff --git a/teavm-maven/teavm-maven-plugin/src/test/resources/.gitignore b/tools/maven/plugin/src/test/resources/.gitignore
similarity index 100%
rename from teavm-maven/teavm-maven-plugin/src/test/resources/.gitignore
rename to tools/maven/plugin/src/test/resources/.gitignore
diff --git a/teavm-maven/pom.xml b/tools/maven/pom.xml
similarity index 93%
rename from teavm-maven/pom.xml
rename to tools/maven/pom.xml
index 77e719b48..84507fd9b 100644
--- a/teavm-maven/pom.xml
+++ b/tools/maven/pom.xml
@@ -31,7 +31,7 @@
   <url>http://teavm.org</url>
 
   <modules>
-    <module>teavm-maven-plugin</module>
-    <module>teavm-maven-webapp</module>
+    <module>plugin</module>
+    <module>webapp</module>
   </modules>
 </project>
diff --git a/teavm-maven/teavm-maven-webapp/pom.xml b/tools/maven/webapp/pom.xml
similarity index 100%
rename from teavm-maven/teavm-maven-webapp/pom.xml
rename to tools/maven/webapp/pom.xml
diff --git a/teavm-maven/teavm-maven-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/maven/webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from teavm-maven/teavm-maven-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to tools/maven/webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/pom.xml b/tools/maven/webapp/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/pom.xml
rename to tools/maven/webapp/src/main/resources/archetype-resources/pom.xml
diff --git a/teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/src/main/java/Client.java b/tools/maven/webapp/src/main/resources/archetype-resources/src/main/java/Client.java
similarity index 100%
rename from teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/src/main/java/Client.java
rename to tools/maven/webapp/src/main/resources/archetype-resources/src/main/java/Client.java
diff --git a/teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/tools/maven/webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
rename to tools/maven/webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/src/main/webapp/index.html b/tools/maven/webapp/src/main/resources/archetype-resources/src/main/webapp/index.html
similarity index 100%
rename from teavm-maven/teavm-maven-webapp/src/main/resources/archetype-resources/src/main/webapp/index.html
rename to tools/maven/webapp/src/main/resources/archetype-resources/src/main/webapp/index.html