diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7e085f3..a3bebec 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,11 +9,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/apktool" />
-            <option value="$PROJECT_DIR$/apktool/androlib" />
-            <option value="$PROJECT_DIR$/apktool/common" />
-            <option value="$PROJECT_DIR$/apktool/directory" />
-            <option value="$PROJECT_DIR$/apktool/util" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/common" />
             <option value="$PROJECT_DIR$/engine" />
diff --git a/apktool/androlib/.gitignore b/apktool/androlib/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/apktool/androlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/apktool/androlib/build.gradle b/apktool/androlib/build.gradle
deleted file mode 100644
index 1360c17..0000000
--- a/apktool/androlib/build.gradle
+++ /dev/null
@@ -1,47 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'brut.androlib'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 26
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs = ['src/main/java']
-            resources.srcDirs = ['src/main/java', 'src/main/resources']
-        }
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled = true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    coreLibraryDesugaring libs.desugar.jdk.libs.nio
-    implementation project(':common')
-    implementation project(':apktool:common')
-    implementation project(':apktool:directory')
-    implementation project(':apktool:util')
-    implementation libs.androidx.annotation
-    testImplementation libs.junit
-    androidTestImplementation libs.androidx.test.ext.junit
-    androidTestImplementation libs.espresso.core
-}
\ No newline at end of file
diff --git a/apktool/androlib/consumer-rules.pro b/apktool/androlib/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/apktool/androlib/proguard-rules.pro b/apktool/androlib/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/apktool/androlib/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/apktool/androlib/src/androidTest/java/brut/androlib/ExampleInstrumentedTest.java b/apktool/androlib/src/androidTest/java/brut/androlib/ExampleInstrumentedTest.java
deleted file mode 100644
index 5ffe373..0000000
--- a/apktool/androlib/src/androidTest/java/brut/androlib/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package brut.androlib;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("brut.androlib.test", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/apktool/androlib/src/main/AndroidManifest.xml b/apktool/androlib/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/apktool/androlib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/apktool/androlib/src/main/java/brut/androlib/ApkBuilder.java b/apktool/androlib/src/main/java/brut/androlib/ApkBuilder.java
deleted file mode 100644
index 0334798..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/ApkBuilder.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib;
-
-import static java.util.Objects.requireNonNull;
-import static brut.androlib.Config.get;
-
-import android.annotation.SuppressLint;
-
-import com.apkide.common.FileUtils;
-import com.apkide.common.log.Logger;
-
-import org.xml.sax.SAXException;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.CRC32;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.meta.MetaInfo;
-import brut.androlib.meta.UsesFramework;
-import brut.androlib.res.AndrolibResources;
-import brut.androlib.res.Framework;
-import brut.androlib.res.data.ResConfigFlags;
-import brut.androlib.res.xml.ResXmlPatcher;
-import brut.androlib.src.SmaliBuilder;
-import brut.common.BrutException;
-import brut.common.InvalidUnknownFileException;
-import brut.common.RootUnknownFileException;
-import brut.common.TraversalUnknownFileException;
-import brut.directory.Directory;
-import brut.directory.DirectoryException;
-import brut.directory.ExtFile;
-import brut.util.BrutIO;
-import brut.util.OS;
-
-public class ApkBuilder {
-    public static Logger LOGGER = Logger.get("ApkTool");
-    public static final String LOG_NAME = "ApkTool";
-    public static final String VERSION = "2.7.0";
-    private final AndrolibResources mAndRes;
-    private int mMinSdkVersion = 0;
-    private final ExtFile mApkDir;
-
-    private final static String APK_DIRNAME = "build/apk";
-    private final static String UNK_DIRNAME = "unknown";
-    private final static String[] APK_RESOURCES_FILENAMES = new String[] {
-            "resources.arsc", "AndroidManifest.xml", "res", "r", "R" };
-    private final static String[] APK_RESOURCES_WITHOUT_RES_FILENAMES = new String[] {
-            "resources.arsc", "AndroidManifest.xml" };
-    private final static String[] APP_RESOURCES_FILENAMES = new String[] {
-            "AndroidManifest.xml", "res" };
-    private final static String[] APK_MANIFEST_FILENAMES = new String[] {
-            "AndroidManifest.xml" };
-
-    public ApkBuilder(ExtFile apkDir) {
-        mAndRes = new AndrolibResources();
-        mApkDir = apkDir;
-    }
-
-
-    public void build(File outFile)
-            throws BrutException {
-        LOGGER.info("Using Apktool " + getVersion());
-
-        MetaInfo meta = MetaInfo.readMetaFile(mApkDir);
-        get().isFramework = meta.isFrameworkApk;
-        get().resourcesAreCompressed = meta.compressionType;
-        get().doNotCompress = meta.doNotCompress;
-        get().sync();
-
-        mAndRes.setSdkInfo(meta.sdkInfo);
-        mAndRes.setPackageId(meta.packageInfo);
-        mAndRes.setPackageRenamed(meta.packageInfo);
-        mAndRes.setVersionInfo(meta.versionInfo);
-        mAndRes.setSharedLibrary(meta.sharedLibrary);
-        mAndRes.setSparseResources(meta.sparseResources);
-
-        if (meta.sdkInfo != null && meta.sdkInfo.get("minSdkVersion") != null) {
-            String minSdkVersion = meta.sdkInfo.get("minSdkVersion");
-            mMinSdkVersion = mAndRes.getMinSdkVersionFromAndroidCodename(meta, minSdkVersion);
-        }
-
-        if (outFile == null) {
-            String outFileName = meta.apkFileName;
-            outFile = new File(mApkDir, "dist" + File.separator + (outFileName == null ? "out.apk" : outFileName));
-        }
-
-        //noinspection ResultOfMethodCallIgnored
-        new File(mApkDir, APK_DIRNAME).mkdirs();
-        File manifest = new File(mApkDir, "AndroidManifest.xml");
-        File manifestOriginal = new File(mApkDir, "AndroidManifest.xml.orig");
-
-        buildSources(mApkDir);
-        buildNonDefaultSources(mApkDir);
-        buildManifestFile(mApkDir, manifest, manifestOriginal);
-        buildResources(mApkDir, meta.usesFramework);
-        buildLibs(mApkDir);
-        buildCopyOriginalFiles(mApkDir);
-        buildApk(mApkDir, outFile);
-
-        // we must go after the Apk is built, and copy the files in via Zip
-        // this is because Aapt won't add files it doesn't know (ex unknown files)
-        buildUnknownFiles(mApkDir, outFile, meta);
-
-        // we copied the AndroidManifest.xml to AndroidManifest.xml.orig so we can edit it
-        // lets restore the unedited one, to not change the original
-        if (manifest.isFile() && manifest.exists() && manifestOriginal.isFile()) {
-            try {
-                if (new File(mApkDir, "AndroidManifest.xml").delete()) {
-                    FileUtils.copyFile(manifestOriginal,manifest);
-                    manifestOriginal.delete();
-                }
-            } catch (IOException ex) {
-                throw new AndrolibException(ex.getMessage());
-            }
-        }
-        LOGGER.info("Built apk into: " + outFile.getPath());
-    }
-
-    private void buildManifestFile(File appDir, File manifest, File manifestOriginal)
-            throws AndrolibException {
-
-        // If we decoded in "raw", we cannot patch AndroidManifest
-        if (new File(appDir, "resources.arsc").exists()) {
-            return;
-        }
-        if (manifest.isFile() && manifest.exists()) {
-            try {
-                if (manifestOriginal.exists()) {
-                    //noinspection ResultOfMethodCallIgnored
-                    manifestOriginal.delete();
-                }
-                FileUtils.copyFile(manifest, manifestOriginal);
-                ResXmlPatcher.fixingPublicAttrsInProviderAttributes(manifest);
-            } catch (IOException ex) {
-                throw new AndrolibException(ex.getMessage());
-            }
-        }
-    }
-
-    public void buildSources(File appDir)
-            throws AndrolibException {
-        if (!buildSourcesRaw(appDir, "classes.dex") && !buildSourcesSmali(appDir, "smali", "classes.dex")) {
-            LOGGER.warning("Could not find sources");
-        }
-    }
-
-    public void buildNonDefaultSources(ExtFile appDir)
-            throws AndrolibException {
-        try {
-            // loop through any smali_ directories for multi-dex apks
-            Map<String, Directory> dirs = appDir.getDirectory().getDirs();
-            for (Map.Entry<String, Directory> directory : dirs.entrySet()) {
-                String name = directory.getKey();
-                if (name.startsWith("smali_")) {
-                    String filename = name.substring(name.indexOf("_") + 1) + ".dex";
-
-                    if (!buildSourcesRaw(appDir, filename) && !buildSourcesSmali(appDir, name, filename)) {
-                        LOGGER.warning("Could not find sources");
-                    }
-                }
-            }
-
-            // loop through any classes#.dex files for multi-dex apks
-            File[] dexFiles = appDir.listFiles();
-            if (dexFiles != null) {
-                for (File dex : dexFiles) {
-
-                    // skip classes.dex because we have handled it in buildSources()
-                    if (dex.getName().endsWith(".dex") && ! dex.getName().equalsIgnoreCase("classes.dex")) {
-                        buildSourcesRaw(appDir, dex.getName());
-                    }
-                }
-            }
-        } catch(DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean buildSourcesRaw(File appDir, String filename)
-            throws AndrolibException {
-        File working = new File(appDir, filename);
-        if (!working.exists()) {
-            return false;
-        }
-        File stored = new File(appDir, APK_DIRNAME + "/" + filename);
-        if (get().forceBuildAll || isModified(working, stored)) {
-            LOGGER.info("Copying " + appDir.toString() + " " + filename + " file...");
-            try {
-                BrutIO.copyAndClose(Files.newInputStream(working.toPath()), Files.newOutputStream(stored.toPath()));
-                return true;
-            } catch (IOException ex) {
-                throw new AndrolibException(ex);
-            }
-        }
-        return true;
-    }
-
-    public boolean buildSourcesSmali(File appDir, String folder, String filename)
-            throws AndrolibException {
-        ExtFile smaliDir = new ExtFile(appDir, folder);
-        if (!smaliDir.exists()) {
-            return false;
-        }
-        File dex = new File(appDir, APK_DIRNAME + "/" + filename);
-        if (! get().forceBuildAll) {
-            LOGGER.info("Checking whether sources has changed...");
-        }
-        if (get().forceBuildAll || isModified(smaliDir, dex)) {
-            LOGGER.info("Smaling " + folder + " folder into " + filename + "...");
-            //noinspection ResultOfMethodCallIgnored
-            dex.delete();
-            SmaliBuilder.build(smaliDir, dex, get().forceApi > 0 ? get().forceApi : mMinSdkVersion);
-        }
-        return true;
-    }
-
-    public void buildResources(ExtFile appDir, UsesFramework usesFramework)
-            throws BrutException {
-        if (!buildResourcesRaw(appDir) && !buildResourcesFull(appDir, usesFramework)
-                && !buildManifest(appDir, usesFramework)) {
-            LOGGER.warning("Could not find resources");
-        }
-    }
-
-    public boolean buildResourcesRaw(ExtFile appDir)
-            throws AndrolibException {
-        try {
-            if (!new File(appDir, "resources.arsc").exists()) {
-                return false;
-            }
-            File apkDir = new File(appDir, APK_DIRNAME);
-            if (! get().forceBuildAll) {
-                LOGGER.info("Checking whether resources has changed...");
-            }
-            if (get().forceBuildAll || isModified(newFiles(APK_RESOURCES_FILENAMES, appDir),
-                    newFiles(APK_RESOURCES_FILENAMES, apkDir))) {
-                LOGGER.info("Copying raw resources...");
-                appDir.getDirectory().copyToDir(apkDir, APK_RESOURCES_FILENAMES);
-            }
-            return true;
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean buildResourcesFull(File appDir, UsesFramework usesFramework)
-            throws AndrolibException {
-        try {
-            if (!new File(appDir, "res").exists()) {
-                return false;
-            }
-            if (! get().forceBuildAll) {
-                LOGGER.info("Checking whether resources has changed...");
-            }
-            File apkDir = new File(appDir, APK_DIRNAME);
-            File resourceFile = new File(apkDir.getParent(), "resources.zip");
-
-            if (get().forceBuildAll || isModified(newFiles(APP_RESOURCES_FILENAMES, appDir),
-                    newFiles(APK_RESOURCES_FILENAMES, apkDir)) || (get().isAapt2() && !isFile(resourceFile))) {
-                LOGGER.info("Building resources...");
-
-                if (get().debugMode) {
-                    if (get().isAapt2()) {
-                        LOGGER.info("Using aapt2 - setting 'debuggable' attribute to 'true' in AndroidManifest.xml");
-                        ResXmlPatcher.setApplicationDebugTagTrue(new File(appDir, "AndroidManifest.xml"));
-                    } else {
-                        ResXmlPatcher.removeApplicationDebugTag(new File(appDir, "AndroidManifest.xml"));
-                    }
-                }
-
-                if (get().netSecConf) {
-                    MetaInfo meta = MetaInfo.readMetaFile(new ExtFile(appDir));
-                    if (meta.sdkInfo != null && meta.sdkInfo.get("targetSdkVersion") != null) {
-                        if (Integer.parseInt(requireNonNull(meta.sdkInfo.get("targetSdkVersion"))) < ResConfigFlags.SDK_NOUGAT) {
-                            LOGGER.warning("Target SDK version is lower than 24! Network Security Configuration might be ignored!");
-                        }
-                    }
-                    File netSecConfOrig = new File(appDir, "res/xml/network_security_config.xml");
-                    if (netSecConfOrig.exists()) {
-                        LOGGER.info("Replacing existing network_security_config.xml!");
-                        //noinspection ResultOfMethodCallIgnored
-                        netSecConfOrig.delete();
-                    }
-                    ResXmlPatcher.modNetworkSecurityConfig(netSecConfOrig);
-                    ResXmlPatcher.setNetworkSecurityConfig(new File(appDir, "AndroidManifest.xml"));
-                    LOGGER.info("Added permissive network security config in manifest");
-                }
-
-                File apkFile = File.createTempFile("APKTOOL", null);
-                //noinspection ResultOfMethodCallIgnored
-                apkFile.delete();
-                //noinspection ResultOfMethodCallIgnored
-                resourceFile.delete();
-
-                File ninePatch = new File(appDir, "9patch");
-                if (!ninePatch.exists()) {
-                    ninePatch = null;
-                }
-                mAndRes.aaptPackage(apkFile, new File(appDir,
-                                "AndroidManifest.xml"), new File(appDir, "res"),
-                        ninePatch, null, parseUsesFramework(usesFramework));
-
-                ExtFile tmpExtFile = new ExtFile(apkFile);
-                Directory tmpDir = tmpExtFile.getDirectory();
-
-                // Sometimes an application is built with a resources.arsc file with no resources,
-                // Apktool assumes it will have a rebuilt arsc file, when it doesn't. So if we
-                // encounter a copy error, move to a warning and continue on. (#1730)
-                try {
-                    tmpDir.copyToDir(apkDir,
-                            tmpDir.containsDir("res") ? APK_RESOURCES_FILENAMES
-                                    : APK_RESOURCES_WITHOUT_RES_FILENAMES);
-                } catch (DirectoryException ex) {
-                    LOGGER.warning(ex.getMessage());
-                } finally {
-                    tmpExtFile.close();
-                }
-
-                // delete tmpDir
-                //noinspection ResultOfMethodCallIgnored
-                apkFile.delete();
-            }
-            return true;
-        } catch (IOException | BrutException | ParserConfigurationException | TransformerException | SAXException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean buildManifestRaw(ExtFile appDir)
-            throws AndrolibException {
-        try {
-            File apkDir = new File(appDir, APK_DIRNAME);
-            LOGGER.info("Copying raw AndroidManifest.xml...");
-            appDir.getDirectory().copyToDir(apkDir, APK_MANIFEST_FILENAMES);
-            return true;
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean buildManifest(ExtFile appDir, UsesFramework usesFramework)
-            throws BrutException {
-        try {
-            if (!new File(appDir, "AndroidManifest.xml").exists()) {
-                return false;
-            }
-            if (! get().forceBuildAll) {
-                LOGGER.info("Checking whether resources has changed...");
-            }
-
-            File apkDir = new File(appDir, APK_DIRNAME);
-
-            if (get().forceBuildAll || isModified(newFiles(APK_MANIFEST_FILENAMES, appDir),
-                    newFiles(APK_MANIFEST_FILENAMES, apkDir))) {
-                LOGGER.info("Building AndroidManifest.xml...");
-
-                File apkFile = File.createTempFile("APKTOOL", null);
-                //noinspection ResultOfMethodCallIgnored
-                apkFile.delete();
-
-                File ninePatch = new File(appDir, "9patch");
-                if (!ninePatch.exists()) {
-                    ninePatch = null;
-                }
-
-                mAndRes.aaptPackage(apkFile, new File(appDir,
-                                "AndroidManifest.xml"), null, ninePatch, null,
-                        parseUsesFramework(usesFramework));
-
-                Directory tmpDir = new ExtFile(apkFile).getDirectory();
-                tmpDir.copyToDir(apkDir, APK_MANIFEST_FILENAMES);
-
-                //noinspection ResultOfMethodCallIgnored
-                apkFile.delete();
-            }
-            return true;
-        } catch (IOException | DirectoryException ex) {
-            throw new AndrolibException(ex);
-        } catch (AndrolibException ex) {
-            LOGGER.warning("Parse AndroidManifest.xml failed, treat it as raw file.");
-            return buildManifestRaw(appDir);
-        }
-    }
-
-    public void buildLibs(File appDir) throws AndrolibException {
-        buildLibrary(appDir, "lib");
-        buildLibrary(appDir, "libs");
-        buildLibrary(appDir, "kotlin");
-        buildLibrary(appDir, "META-INF/services");
-    }
-
-    public void buildLibrary(File appDir, String folder) throws AndrolibException {
-        File working = new File(appDir, folder);
-
-        if (! working.exists()) {
-            return;
-        }
-
-        File stored = new File(appDir, APK_DIRNAME + "/" + folder);
-        if (get().forceBuildAll || isModified(working, stored)) {
-            LOGGER.info("Copying libs... (/" + folder + ")");
-            try {
-                OS.rmdir(stored);
-                OS.cpdir(working, stored);
-            } catch (BrutException ex) {
-                throw new AndrolibException(ex);
-            }
-        }
-    }
-
-    public void buildCopyOriginalFiles(File appDir)
-            throws AndrolibException {
-        if (get().copyOriginalFiles) {
-            File originalDir = new File(appDir, "original");
-            if (originalDir.exists()) {
-                try {
-                    LOGGER.info("Copy original files...");
-                    Directory in = (new ExtFile(originalDir)).getDirectory();
-                    if (in.containsFile("AndroidManifest.xml")) {
-                        LOGGER.info("Copy AndroidManifest.xml...");
-                        in.copyToDir(new File(appDir, APK_DIRNAME), "AndroidManifest.xml");
-                    }
-                    if (in.containsFile("stamp-cert-sha256")) {
-                        LOGGER.info("Copy stamp-cert-sha256...");
-                        in.copyToDir(new File(appDir, APK_DIRNAME), "stamp-cert-sha256");
-                    }
-                    if (in.containsDir("META-INF")) {
-                        LOGGER.info("Copy META-INF...");
-                        in.copyToDir(new File(appDir, APK_DIRNAME), "META-INF");
-                    }
-                } catch (DirectoryException ex) {
-                    throw new AndrolibException(ex);
-                }
-            }
-        }
-    }
-
-    public void buildUnknownFiles(File appDir, File outFile, MetaInfo meta)
-            throws AndrolibException {
-        if (meta.unknownFiles != null) {
-            LOGGER.info("Copying unknown files/dir...");
-
-            Map<String, String> files = meta.unknownFiles;
-            File tempFile = new File(outFile.getParent(), outFile.getName() + ".apktool_temp");
-            boolean renamed = outFile.renameTo(tempFile);
-            if (!renamed) {
-                throw new AndrolibException("Unable to rename temporary file");
-            }
-
-            try (
-                    ZipFile inputFile = new ZipFile(tempFile);
-                    ZipOutputStream actualOutput = new ZipOutputStream(Files.newOutputStream(outFile.toPath()))
-            ) {
-                copyExistingFiles(inputFile, actualOutput);
-                copyUnknownFiles(appDir, actualOutput, files);
-            } catch (IOException | BrutException ex) {
-                throw new AndrolibException(ex);
-            }
-
-            // Remove our temporary file.
-            //noinspection ResultOfMethodCallIgnored
-            tempFile.delete();
-        }
-    }
-
-    private void copyExistingFiles(ZipFile inputFile, ZipOutputStream outputFile) throws IOException {
-        // First, copy the contents from the existing outFile:
-        Enumeration<? extends ZipEntry> entries = inputFile.entries();
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = new ZipEntry(entries.nextElement());
-
-            // We can't reuse the compressed size because it depends on compression sizes.
-            entry.setCompressedSize(-1);
-            outputFile.putNextEntry(entry);
-
-            // No need to create directory entries in the final apk
-            if (! entry.isDirectory()) {
-                BrutIO.copy(inputFile, outputFile, entry);
-            }
-
-            outputFile.closeEntry();
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
-    private void copyUnknownFiles(File appDir, ZipOutputStream outputFile, Map<String, String> files)
-            throws BrutException, IOException {
-        File unknownFileDir = new File(appDir, UNK_DIRNAME);
-
-        // loop through unknown files
-        for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) {
-            File inputFile;
-
-            try {
-                inputFile = new File(unknownFileDir, BrutIO.sanitizeUnknownFile(unknownFileDir, unknownFileInfo.getKey()));
-            } catch (RootUnknownFileException | InvalidUnknownFileException | TraversalUnknownFileException exception) {
-                LOGGER.warning(String.format("Skipping file %s (%s)", unknownFileInfo.getKey(), exception.getMessage()));
-                continue;
-            }
-
-            if (inputFile.isDirectory()) {
-                continue;
-            }
-
-            ZipEntry newEntry = new ZipEntry(unknownFileInfo.getKey());
-            int method = Integer.parseInt(unknownFileInfo.getValue());
-            LOGGER.info(String.format("Copying unknown file %s with method %d", unknownFileInfo.getKey(), method));
-            if (method == ZipEntry.STORED) {
-                newEntry.setMethod(ZipEntry.STORED);
-                newEntry.setSize(inputFile.length());
-                newEntry.setCompressedSize(-1);
-                BufferedInputStream unknownFile = new BufferedInputStream(Files.newInputStream(inputFile.toPath()));
-                CRC32 crc = BrutIO.calculateCrc(unknownFile);
-                newEntry.setCrc(crc.getValue());
-                unknownFile.close();
-            } else {
-                newEntry.setMethod(ZipEntry.DEFLATED);
-            }
-            outputFile.putNextEntry(newEntry);
-
-            BrutIO.copy(inputFile, outputFile);
-            outputFile.closeEntry();
-        }
-    }
-
-    public void buildApk(File appDir, File outApk) throws AndrolibException {
-        LOGGER.info("Building apk file...");
-        if (outApk.exists()) {
-            //noinspection ResultOfMethodCallIgnored
-            outApk.delete();
-        } else {
-            File outDir = outApk.getParentFile();
-            if (outDir != null && !outDir.exists()) {
-                //noinspection ResultOfMethodCallIgnored
-                outDir.mkdirs();
-            }
-        }
-        File assetDir = new File(appDir, "assets");
-        if (!assetDir.exists()) {
-            assetDir = null;
-        }
-        mAndRes.zipPackage(outApk, new File(appDir, APK_DIRNAME), assetDir);
-    }
-
-    private File[] parseUsesFramework(UsesFramework usesFramework)
-            throws AndrolibException {
-        if (usesFramework == null) {
-            return null;
-        }
-
-        List<Integer> ids = usesFramework.ids;
-        if (ids == null || ids.isEmpty()) {
-            return null;
-        }
-
-        Framework framework = new Framework();
-        String tag = usesFramework.tag;
-        File[] files = new File[ids.size()];
-        int i = 0;
-        for (int id : ids) {
-            files[i++] = framework.getFrameworkApk(id, tag);
-        }
-        return files;
-    }
-
-    private boolean isModified(File working, File stored) {
-        return ! stored.exists() || BrutIO.recursiveModifiedTime(working) > BrutIO .recursiveModifiedTime(stored);
-    }
-
-    private boolean isFile(File working) {
-        return working.exists();
-    }
-
-    private boolean isModified(File[] working, File[] stored) {
-        for (File file : stored) {
-            if (!file.exists()) {
-                return true;
-            }
-        }
-        return BrutIO.recursiveModifiedTime(working) > BrutIO.recursiveModifiedTime(stored);
-    }
-
-    private File[] newFiles(String[] names, File dir) {
-        File[] files = new File[names.length];
-        for (int i = 0; i < names.length; i++) {
-            files[i] = new File(dir, names[i]);
-        }
-        return files;
-    }
-
-    public void close() throws IOException {
-        mAndRes.close();
-    }
-
-    public static String getVersion() {
-        return VERSION;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/ApkDecoder.java b/apktool/androlib/src/main/java/brut/androlib/ApkDecoder.java
deleted file mode 100644
index 9c4328a..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/ApkDecoder.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-import static brut.androlib.Config.get;
-
-import com.android.tools.smali.dexlib2.iface.DexFile;
-import com.apkide.common.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.InFileNotFoundException;
-import brut.androlib.err.OutDirExistsException;
-import brut.androlib.meta.MetaInfo;
-import brut.androlib.res.AndrolibResources;
-import brut.androlib.res.data.ResTable;
-import brut.androlib.res.data.ResUnknownFiles;
-import brut.androlib.src.SmaliDecoder;
-import brut.common.BrutException;
-import brut.directory.Directory;
-import brut.directory.DirectoryException;
-import brut.directory.ExtFile;
-import brut.util.OS;
-
-public class ApkDecoder {
-    private final AndrolibResources mAndRes;
-    private final ExtFile mApkFile;
-    private ResTable mResTable;
-    protected final ResUnknownFiles mResUnknownFiles;
-    private Collection<String> mUncompressedFiles;
-    private int mMinSdkVersion = 0;
-
-    private final static String SMALI_DIRNAME = "smali";
-    private final static String UNK_DIRNAME = "unknown";
-    private final static String[] APK_RESOURCES_FILENAMES = new String[] {
-            "resources.arsc", "res", "r", "R" };
-    private final static String[] APK_MANIFEST_FILENAMES = new String[] {
-            "AndroidManifest.xml" };
-    private final static String[] APK_STANDARD_ALL_FILENAMES = new String[] {
-            "classes.dex", "AndroidManifest.xml", "resources.arsc", "res", "r", "R",
-            "lib", "libs", "assets", "META-INF", "kotlin" };
-    private final static Pattern NO_COMPRESS_PATTERN = Pattern.compile("(" +
-            "jpg|jpeg|png|gif|wav|mp2|mp3|ogg|aac|mpg|mpeg|mid|midi|smf|jet|rtttl|imy|xmf|mp4|" +
-            "m4a|m4v|3gp|3gpp|3g2|3gpp2|amr|awb|wma|wmv|webm|webp|mkv)$");
-
-
-    public ApkDecoder(ExtFile apkFile) {
-        mAndRes = new AndrolibResources();
-        mResUnknownFiles = new ResUnknownFiles();
-        mApkFile = apkFile;
-    }
-
-    public ApkDecoder(File apkFile) {
-        this(new ExtFile(apkFile));
-    }
-
-    public void decode(File outDir) throws AndrolibException, IOException, DirectoryException {
-        try {
-            if (!get().forceDelete && outDir.exists()) {
-                throw new OutDirExistsException();
-            }
-
-            if (!mApkFile.isFile() || !mApkFile.canRead()) {
-                throw new InFileNotFoundException();
-            }
-
-            OS.rmdir(outDir);
-            outDir.mkdirs();
-
-            LOGGER.info("Using Apktool " + ApkBuilder.getVersion() + " on " + mApkFile.getName());
-
-            decodeManifest(outDir);
-            decodeResources(outDir);
-
-            if (hasSources()) {
-                switch (get().decodeSources) {
-                    case Config.DECODE_SOURCES_NONE:
-                        copySourcesRaw(outDir, "classes.dex");
-                        break;
-                    case Config.DECODE_SOURCES_SMALI:
-                    case Config.DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES:
-                        decodeSourcesSmali(outDir, "classes.dex");
-                        break;
-                }
-            }
-
-            if (hasMultipleSources()) {
-                // foreach unknown dex file in root, lets disassemble it
-                Set<String> files = mApkFile.getDirectory().getFiles(true);
-                for (String file : files) {
-                    if (file.endsWith(".dex")) {
-                        if (! file.equalsIgnoreCase("classes.dex")) {
-                            switch(get().decodeSources) {
-                                case Config.DECODE_SOURCES_NONE:
-                                    copySourcesRaw(outDir, file);
-                                    break;
-                                case Config.DECODE_SOURCES_SMALI:
-                                    decodeSourcesSmali(outDir, file);
-                                    break;
-                                case Config.DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES:
-                                    if (file.startsWith("classes") && file.endsWith(".dex")) {
-                                        decodeSourcesSmali(outDir, file);
-                                    } else {
-                                        copySourcesRaw(outDir, file);
-                                    }
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            copyRawFiles(outDir);
-            copyUnknownFiles(outDir);
-            mUncompressedFiles = new ArrayList<>();
-            recordUncompressedFiles(mUncompressedFiles);
-            copyOriginalFiles(outDir);
-            writeMetaFile(outDir);
-        } finally {
-            try {
-                mApkFile.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public ResTable getResTable() throws AndrolibException {
-        if (mResTable == null) {
-            boolean hasResources = hasResources();
-            boolean hasManifest = hasManifest();
-            if (! (hasManifest || hasResources)) {
-                throw new AndrolibException(
-                        "Apk doesn't contain either AndroidManifest.xml file or resources.arsc file");
-            }
-            mResTable = mAndRes.getResTable(mApkFile, hasResources);
-            mResTable.setAnalysisMode(get().analysisMode);
-        }
-        return mResTable;
-    }
-
-    public boolean hasSources() throws AndrolibException {
-        try {
-            return mApkFile.getDirectory().containsFile("classes.dex");
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean hasMultipleSources() throws AndrolibException {
-        try {
-            Set<String> files = mApkFile.getDirectory().getFiles(false);
-            for (String file : files) {
-                if (file.endsWith(".dex")) {
-                    if (! file.equalsIgnoreCase("classes.dex")) {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean hasManifest() throws AndrolibException {
-        try {
-            return mApkFile.getDirectory().containsFile("AndroidManifest.xml");
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public boolean hasResources() throws AndrolibException {
-        try {
-            return mApkFile.getDirectory().containsFile("resources.arsc");
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void close() throws IOException {
-        mAndRes.close();
-    }
-
-    private void writeMetaFile(File outDir) throws AndrolibException {
-        MetaInfo meta = new MetaInfo();
-        meta.version = ApkBuilder.getVersion();
-        meta.apkFileName = mApkFile.getName();
-
-        if (mResTable != null) {
-            mResTable.initMetaInfo(meta, outDir);
-            if (get().frameworkTag != null) {
-                meta.usesFramework.tag = get().frameworkTag;
-            }
-        } else {
-            if (mMinSdkVersion > 0) {
-                meta.sdkInfo = getMinSdkInfo();
-            }
-        }
-        meta.unknownFiles = mResUnknownFiles.getUnknownFiles();
-        if (mUncompressedFiles != null && !mUncompressedFiles.isEmpty()) {
-            meta.doNotCompress = mUncompressedFiles;
-        }
-
-        try {
-            meta.save(new File(outDir, "apktool.yml"));
-        } catch (IOException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private Map<String, String> getMinSdkInfo() {
-        Map<String, String> sdkInfo = new LinkedHashMap<>();
-        sdkInfo.put("minSdkVersion", Integer.toString(mMinSdkVersion));
-        return sdkInfo;
-    }
-
-    private void copySourcesRaw(File outDir, String filename)
-            throws AndrolibException {
-        try {
-            LOGGER.info("Copying raw " + filename + " file...");
-            mApkFile.getDirectory().copyToDir(outDir, filename);
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private void decodeSourcesSmali(File outDir, String filename)
-            throws AndrolibException {
-        try {
-            File smaliDir;
-            if (filename.equalsIgnoreCase("classes.dex")) {
-                smaliDir = new File(outDir, SMALI_DIRNAME);
-            } else {
-                smaliDir = new File(outDir, SMALI_DIRNAME + "_" + filename.substring(0, filename.indexOf(".")));
-            }
-            OS.rmdir(smaliDir);
-            //noinspection ResultOfMethodCallIgnored
-            smaliDir.mkdirs();
-            LOGGER.info("Baksmaling " + filename + "...");
-            DexFile dexFile = SmaliDecoder.decode(mApkFile, smaliDir, filename,
-                    get().baksmaliDebugMode, get().apiLevel);
-            int minSdkVersion = dexFile.getOpcodes().api;
-            if (mMinSdkVersion == 0 || mMinSdkVersion > minSdkVersion) {
-                mMinSdkVersion = minSdkVersion;
-            }
-        } catch (BrutException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private void decodeManifest(File outDir) throws AndrolibException {
-        if (hasManifest()) {
-            if (get().decodeResources == Config.DECODE_RESOURCES_FULL ||
-                    get().forceDecodeManifest == Config.FORCE_DECODE_MANIFEST_FULL) {
-                if (hasResources()) {
-                    mAndRes.decodeManifestWithResources(getResTable(), mApkFile, outDir);
-                } else {
-                    // if there's no resources.arsc, decode the manifest without looking
-                    // up attribute references
-                    mAndRes.decodeManifest(getResTable(), mApkFile, outDir);
-                }
-            }
-            else {
-                try {
-                    LOGGER.info("Copying raw manifest...");
-                    mApkFile.getDirectory().copyToDir(outDir, APK_MANIFEST_FILENAMES);
-                } catch (DirectoryException ex) {
-                    throw new AndrolibException(ex);
-                }
-            }
-        }
-    }
-
-    private void decodeResources(File outDir) throws AndrolibException {
-        if (hasResources()) {
-            switch (get().decodeResources) {
-                case Config.DECODE_RESOURCES_NONE:
-                    try {
-                        LOGGER.info("Copying raw resources...");
-                        mApkFile.getDirectory().copyToDir(outDir, APK_RESOURCES_FILENAMES);
-                    } catch (DirectoryException ex) {
-                        throw new AndrolibException(ex);
-                    }
-                    break;
-                case Config.DECODE_RESOURCES_FULL:
-                    mAndRes.decode(getResTable(), mApkFile, outDir);
-                    break;
-            }
-        }
-    }
-
-    private void copyRawFiles(File outDir)
-            throws AndrolibException {
-        LOGGER.info("Copying assets and libs...");
-        try {
-            Directory in = mApkFile.getDirectory();
-
-            if (get().decodeAssets == Config.DECODE_ASSETS_FULL) {
-                if (in.containsDir("assets")) {
-                    in.copyToDir(outDir, "assets");
-                }
-            }
-            if (in.containsDir("lib")) {
-                in.copyToDir(outDir, "lib");
-            }
-            if (in.containsDir("libs")) {
-                in.copyToDir(outDir, "libs");
-            }
-            if (in.containsDir("kotlin")) {
-                in.copyToDir(outDir, "kotlin");
-            }
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private boolean isAPKFileNames(String file) {
-        for (String apkFile : APK_STANDARD_ALL_FILENAMES) {
-            if (apkFile.equals(file) || file.startsWith(apkFile + "/")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void copyUnknownFiles(File outDir)
-            throws AndrolibException {
-        LOGGER.info("Copying unknown files...");
-        File unknownOut = new File(outDir, UNK_DIRNAME);
-        try {
-            Directory unk = mApkFile.getDirectory();
-
-            // loop all items in container recursively, ignoring any that are pre-defined by aapt
-            Set<String> files = unk.getFiles(true);
-            for (String file : files) {
-                if (!isAPKFileNames(file) && !file.endsWith(".dex")) {
-
-                    // copy file out of archive into special "unknown" folder
-                    unk.copyToDir(unknownOut, file);
-                    // let's record the name of the file, and its compression type
-                    // so that we may re-include it the same way
-                    mResUnknownFiles.addUnknownFileInfo(file, String.valueOf(unk.getCompressionLevel(file)));
-                }
-            }
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private void copyOriginalFiles(File outDir)
-            throws AndrolibException {
-        LOGGER.info("Copying original files...");
-        File originalDir = new File(outDir, "original");
-        if (!originalDir.exists()) {
-            //noinspection ResultOfMethodCallIgnored
-            originalDir.mkdirs();
-        }
-
-        try {
-            Directory in = mApkFile.getDirectory();
-            if (in.containsFile("AndroidManifest.xml")) {
-                in.copyToDir(originalDir, "AndroidManifest.xml");
-            }
-            if (in.containsFile("stamp-cert-sha256")) {
-                in.copyToDir(originalDir, "stamp-cert-sha256");
-            }
-            if (in.containsDir("META-INF")) {
-                in.copyToDir(originalDir, "META-INF");
-
-                if (in.containsDir("META-INF/services")) {
-                    // If the original APK contains the folder META-INF/services folder
-                    // that is used for service locators (like coroutines on android),
-                    // copy it to the destination folder, so it does not get dropped.
-                    LOGGER.info("Copying META-INF/services directory");
-                    in.copyToDir(outDir, "META-INF/services");
-                }
-            }
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private void recordUncompressedFiles(Collection<String> uncompressedFilesOrExts) throws AndrolibException {
-        try {
-            Directory unk = mApkFile.getDirectory();
-            Set<String> files = unk.getFiles(true);
-
-            for (String file : files) {
-                if (isAPKFileNames(file) && unk.getCompressionLevel(file) == 0) {
-                    String extOrFile = "";
-                    if (unk.getSize(file) != 0) {
-                        extOrFile = FileUtils.getExtension(file);
-                    }
-
-                    if (extOrFile.isEmpty() || !NO_COMPRESS_PATTERN.matcher(extOrFile).find()) {
-                        extOrFile = file;
-                        if (mAndRes.mResFileMapping.containsKey(extOrFile)) {
-                            extOrFile = mAndRes.mResFileMapping.get(extOrFile);
-                        }
-                    }
-                    if (!uncompressedFilesOrExts.contains(extOrFile)) {
-                        uncompressedFilesOrExts.add(extOrFile);
-                    }
-                }
-            }
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/apktool/androlib/src/main/java/brut/androlib/Config.java b/apktool/androlib/src/main/java/brut/androlib/Config.java
deleted file mode 100644
index 44af78a..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/Config.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package brut.androlib;
-
-import com.apkide.common.ApplicationProvider;
-
-import java.util.Collection;
-
-import brut.androlib.err.AndrolibException;
-
-public abstract class Config {
-    public final static short DECODE_SOURCES_NONE = 0x0000;
-    public final static short DECODE_SOURCES_SMALI = 0x0001;
-    public final static short DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES = 0x0010;
-
-    public final static short DECODE_RESOURCES_NONE = 0x0100;
-    public final static short DECODE_RESOURCES_FULL = 0x0101;
-
-    public final static short FORCE_DECODE_MANIFEST_NONE = 0x0000;
-    public final static short FORCE_DECODE_MANIFEST_FULL = 0x0001;
-
-    public final static short DECODE_ASSETS_NONE = 0x0000;
-    public final static short DECODE_ASSETS_FULL = 0x0001;
-
-    // Build options
-    public boolean forceBuildAll = false;
-    public boolean forceDeleteFramework = false;
-    public boolean debugMode = false;
-    public boolean netSecConf = false;
-    public boolean verbose = false;
-    public boolean copyOriginalFiles = false;
-    public boolean updateFiles = false;
-    public boolean isFramework = false;
-    public boolean resourcesAreCompressed = false;
-    public boolean useAapt2 = false;
-    public boolean noCrunch = false;
-    public int forceApi = 0;
-    public Collection<String> doNotCompress;
-
-    // Decode options
-    public short decodeSources = DECODE_SOURCES_SMALI;
-    public short decodeResources = DECODE_RESOURCES_FULL;
-    public short forceDecodeManifest = FORCE_DECODE_MANIFEST_NONE;
-    public short decodeAssets = DECODE_ASSETS_FULL;
-    public int apiLevel = 0;
-    public boolean analysisMode = false;
-    public boolean forceDelete = false;
-    public boolean keepBrokenResources = false;
-    public boolean baksmaliDebugMode = true;
-
-    // Common options
-    public String frameworkDirectory = null;
-    public String frameworkTag = null;
-    public String aaptPath = "";
-    public int aaptVersion = 1; // default to v1
-
-    // Utility functions
-    public boolean isAapt2() {
-        return this.useAapt2 || this.aaptVersion == 2;
-    }
-
-    public Config() {
-        setDefaultFrameworkDirectory();
-    }
-
-    private void setDefaultFrameworkDirectory() {
-        frameworkDirectory = ApplicationProvider.get().foundFile("android.jar").getAbsolutePath();
-    }
-
-    public void setDecodeSources(short mode) throws AndrolibException {
-        if (mode != DECODE_SOURCES_NONE && mode != DECODE_SOURCES_SMALI && mode != DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES) {
-            throw new AndrolibException("Invalid decode sources mode: " + mode);
-        }
-        if (decodeSources == DECODE_SOURCES_NONE && mode == DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES) {
-            ApkBuilder.LOGGER.info("--only-main-classes cannot be paired with -s/--no-src. Ignoring.");
-            return;
-        }
-        decodeSources = mode;
-        sync();
-    }
-
-    public void setDecodeResources(short mode) throws AndrolibException {
-        if (mode != DECODE_RESOURCES_NONE && mode != DECODE_RESOURCES_FULL) {
-            throw new AndrolibException("Invalid decode resources mode");
-        }
-        decodeResources = mode;
-        sync();
-    }
-
-    public void setForceDecodeManifest(short mode) throws AndrolibException {
-        if (mode != FORCE_DECODE_MANIFEST_NONE && mode != FORCE_DECODE_MANIFEST_FULL) {
-            throw new AndrolibException("Invalid force decode manifest mode");
-        }
-        forceDecodeManifest = mode;
-        sync();
-    }
-
-    public void setDecodeAssets(short mode) throws AndrolibException {
-        if (mode != DECODE_ASSETS_NONE && mode != DECODE_ASSETS_FULL) {
-            throw new AndrolibException("Invalid decode asset mode");
-        }
-        decodeAssets = mode;
-        sync();
-    }
-
-    private static final Object myLock=new Object();
-    private static Config myConfig =new Config() {
-        @Override
-        public void onChanged() {
-            //ignore
-        }
-    };
-
-    public void sync(){
-        onChanged();
-    }
-    public abstract void onChanged();
-
-    public static void set(Config config){
-        synchronized (myLock){
-            myConfig=config;
-        }
-    }
-
-    public static Config get(){
-        synchronized (myLock){
-            return myConfig;
-        }
-    }
-}
\ No newline at end of file
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/AXmlDecodingException.java b/apktool/androlib/src/main/java/brut/androlib/err/AXmlDecodingException.java
deleted file mode 100644
index 2860a73..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/AXmlDecodingException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class AXmlDecodingException extends AndrolibException {
-    public AXmlDecodingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/AndrolibException.java b/apktool/androlib/src/main/java/brut/androlib/err/AndrolibException.java
deleted file mode 100644
index cc59604..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/AndrolibException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-import brut.common.BrutException;
-
-public class AndrolibException extends BrutException {
-    public AndrolibException() {
-    }
-
-    public AndrolibException(String message) {
-        super(message);
-    }
-
-    public AndrolibException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public AndrolibException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/CantFind9PatchChunkException.java b/apktool/androlib/src/main/java/brut/androlib/err/CantFind9PatchChunkException.java
deleted file mode 100644
index 3fd2a55..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/CantFind9PatchChunkException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class CantFind9PatchChunkException extends AndrolibException {
-	public CantFind9PatchChunkException(String message, Throwable cause) {
-		super(message, cause);
-	}
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java b/apktool/androlib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java
deleted file mode 100644
index a795663..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class CantFindFrameworkResException extends AndrolibException {
-	public CantFindFrameworkResException(int id) {
-		mPkgId = id;
-	}
-
-	public int getPkgId() {
-		return mPkgId;
-	}
-
-	@Override
-	public String getMessage() {
-		return String.format("Can't find framework resources for package of id: %d", this.getPkgId());
-	}
-
-	private final int mPkgId;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/InFileNotFoundException.java b/apktool/androlib/src/main/java/brut/androlib/err/InFileNotFoundException.java
deleted file mode 100644
index 0b713af..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/InFileNotFoundException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class InFileNotFoundException extends AndrolibException {
-	public InFileNotFoundException() {
-	}
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/OutDirExistsException.java b/apktool/androlib/src/main/java/brut/androlib/err/OutDirExistsException.java
deleted file mode 100644
index 8d29ee6..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/OutDirExistsException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class OutDirExistsException extends AndrolibException {
-	public OutDirExistsException() {
-	}
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/RawXmlEncounteredException.java b/apktool/androlib/src/main/java/brut/androlib/err/RawXmlEncounteredException.java
deleted file mode 100644
index ba97b70..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/RawXmlEncounteredException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class RawXmlEncounteredException extends AndrolibException {
-    public RawXmlEncounteredException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/err/UndefinedResObjectException.java b/apktool/androlib/src/main/java/brut/androlib/err/UndefinedResObjectException.java
deleted file mode 100644
index 2883afd..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/err/UndefinedResObjectException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.err;
-
-public class UndefinedResObjectException extends AndrolibException {
-	public UndefinedResObjectException(String message) {
-		super(message);
-	}
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/ClassSafeConstructor.java b/apktool/androlib/src/main/java/brut/androlib/meta/ClassSafeConstructor.java
deleted file mode 100644
index 00870ec..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/ClassSafeConstructor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-import org.yaml.snakeyaml.LoaderOptions;
-import org.yaml.snakeyaml.constructor.AbstractConstruct;
-import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.nodes.ScalarNode;
-import org.yaml.snakeyaml.nodes.Tag;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ClassSafeConstructor extends Constructor {
-    protected final List<Class<?>> allowableClasses = new ArrayList<>();
-
-    public ClassSafeConstructor() {
-        super(new LoaderOptions());
-        this.yamlConstructors.put(Tag.STR, new ConstructStringEx());
-
-        this.allowableClasses.add(MetaInfo.class);
-        this.allowableClasses.add(PackageInfo.class);
-        this.allowableClasses.add(UsesFramework.class);
-        this.allowableClasses.add(VersionInfo.class);
-    }
-
-    protected Object newInstance(Node node) {
-        if (this.yamlConstructors.containsKey(node.getTag()) || this.allowableClasses.contains(node.getType())) {
-            return super.newInstance(node);
-        }
-        throw new YAMLException("Invalid Class attempting to be constructed: " + node.getTag());
-    }
-
-    protected Object finalizeConstruction(Node node, Object data) {
-        if (this.yamlConstructors.containsKey(node.getTag()) || this.allowableClasses.contains(node.getType())) {
-            return super.finalizeConstruction(node, data);
-        }
-
-        return this.newInstance(node);
-    }
-
-    private class ConstructStringEx extends AbstractConstruct {
-        public Object construct(Node node) {
-            String val = constructScalar((ScalarNode) node);
-            return YamlStringEscapeUtils.unescapeString(val);
-        }
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java b/apktool/androlib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java
deleted file mode 100644
index b2e8404..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.representer.Representer;
-
-public class EscapedStringRepresenter extends Representer {
-    public EscapedStringRepresenter() {
-        super(new DumperOptions());
-        RepresentStringEx representStringEx = new RepresentStringEx();
-        multiRepresenters.put(String.class, representStringEx);
-        representers.put(String.class, representStringEx);
-    }
-
-    private class RepresentStringEx extends RepresentString {
-
-        @Override
-        public Node representData(Object data) {
-            return super.representData(YamlStringEscapeUtils.escapeString(data.toString()));
-        }
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/MetaInfo.java b/apktool/androlib/src/main/java/brut/androlib/meta/MetaInfo.java
deleted file mode 100644
index c1a9ab4..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/MetaInfo.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.LoaderOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.introspector.PropertyUtils;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Map;
-
-import brut.androlib.err.AndrolibException;
-import brut.directory.DirectoryException;
-import brut.directory.ExtFile;
-
-public class MetaInfo {
-    public String version;
-    public String apkFileName;
-    public boolean isFrameworkApk;
-    public UsesFramework usesFramework;
-    public Map<String, String> sdkInfo;
-    public PackageInfo packageInfo;
-    public VersionInfo versionInfo;
-    public boolean compressionType;
-    public boolean sharedLibrary;
-    public boolean sparseResources;
-    public Map<String, String> unknownFiles;
-    public Collection<String> doNotCompress;
-
-
-    private static Yaml getYaml() {
-        DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-
-        EscapedStringRepresenter representer = new EscapedStringRepresenter();
-        PropertyUtils propertyUtils = representer.getPropertyUtils();
-        propertyUtils.setSkipMissingProperties(true);
-
-        LoaderOptions loaderOptions = new LoaderOptions();
-        loaderOptions.setCodePointLimit(10 * 1024 * 1024);
-
-        return new Yaml(new ClassSafeConstructor(), representer, options, loaderOptions);
-    }
-
-    public void save(Writer output) {
-        DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        getYaml().dump(this, output);
-    }
-
-    public void save(File file) throws IOException {
-        try (
-                FileOutputStream fos = new FileOutputStream(file);
-                OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
-                Writer writer = new BufferedWriter(outputStreamWriter)
-        ) {
-            save(writer);
-        }
-    }
-
-    public static MetaInfo load(InputStream is) {
-        return getYaml().loadAs(is, MetaInfo.class);
-    }
-
-
-    public static MetaInfo readMetaFile(ExtFile appDir)
-            throws AndrolibException {
-        try (InputStream in = appDir.getDirectory().getFileInput("apktool.yml")) {
-            return MetaInfo.load(in);
-        } catch (DirectoryException | IOException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/PackageInfo.java b/apktool/androlib/src/main/java/brut/androlib/meta/PackageInfo.java
deleted file mode 100644
index ff07a96..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/PackageInfo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-public class PackageInfo {
-    public String forcedPackageId;
-    public String renameManifestPackage;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/UsesFramework.java b/apktool/androlib/src/main/java/brut/androlib/meta/UsesFramework.java
deleted file mode 100644
index 361fbbd..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/UsesFramework.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-import java.util.List;
-
-public class UsesFramework {
-    public List<Integer> ids;
-    public String tag;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/VersionInfo.java b/apktool/androlib/src/main/java/brut/androlib/meta/VersionInfo.java
deleted file mode 100644
index 8109369..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/VersionInfo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-public class VersionInfo {
-    public String versionCode;
-    public String versionName;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/meta/YamlStringEscapeUtils.java b/apktool/androlib/src/main/java/brut/androlib/meta/YamlStringEscapeUtils.java
deleted file mode 100644
index 9b11d47..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/meta/YamlStringEscapeUtils.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.meta;
-
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.text.translate.CharSequenceTranslator;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-
-public class YamlStringEscapeUtils {
-
-    public static String escapeString(String str) {
-        return escapeJavaStyleString(str, false, false);
-    }
-
-    /**
-     * @param str String to escape values in, may be null
-     * @param escapeSingleQuotes escapes single quotes if <code>true</code>
-     * @param escapeForwardSlash TODO
-     * @return the escaped string
-     */
-    private static String escapeJavaStyleString(String str, boolean escapeSingleQuotes, boolean escapeForwardSlash) {
-        if (str == null) {
-            return null;
-        }
-        try {
-            StringWriter writer = new StringWriter(str.length() * 2);
-            escapeJavaStyleString(writer, str, escapeSingleQuotes, escapeForwardSlash);
-            return writer.toString();
-        } catch (IOException ioe) {
-            // this should never ever happen while writing to a StringWriter
-            throw new RuntimeException(ioe);
-        }
-    }
-
-    /**
-     * @param out write to receieve the escaped string
-     * @param str String to escape values in, may be null
-     * @param escapeSingleQuote escapes single quotes if <code>true</code>
-     * @param escapeForwardSlash TODO
-     * @throws IOException if an IOException occurs
-     */
-    private static void escapeJavaStyleString(Writer out, String str, boolean escapeSingleQuote,
-                                              boolean escapeForwardSlash) throws IOException {
-        if (out == null) {
-            throw new IllegalArgumentException("The Writer must not be null");
-        }
-        if (str == null) {
-            return;
-        }
-        int sz;
-        sz = str.length();
-        for (int i = 0; i < sz; i++) {
-            char ch = str.charAt(i);
-            // "[^\t\n\r -~\u0085\u00A0-\uD7FF\uE000-\uFFFD]"
-            // handle unicode
-            if (ch > 0xFFFD) {
-                out.write("\\u" + CharSequenceTranslator.hex(ch));
-            } else if (ch > 0xD7FF && ch < 0xE000) {
-                out.write("\\u" + CharSequenceTranslator.hex(ch));
-            } else if (ch > 0x7E && ch != 0x85 && ch < 0xA0) {
-                out.write("\\u00" + CharSequenceTranslator.hex(ch));
-            } else if (ch < 32) {
-                switch (ch) {
-                    case '\t' :
-                        out.write('\\');
-                        out.write('t');
-                        break;
-                    case '\n' :
-                        out.write('\\');
-                        out.write('n');
-                        break;
-                    case '\r' :
-                        out.write('\\');
-                        out.write('r');
-                        break;
-                    default :
-                        if (ch > 0xf) {
-                            out.write("\\u00" + CharSequenceTranslator.hex(ch));
-                        } else {
-                            out.write("\\u000" + CharSequenceTranslator.hex(ch));
-                        }
-                        break;
-                }
-            } else {
-                switch (ch) {
-                    case '\'' :
-                        if (escapeSingleQuote) {
-                            out.write('\\');
-                        }
-                        out.write('\'');
-                        break;
-                    case '"' :
-                        out.write('\\');
-                        out.write('"');
-                        break;
-                    case '\\' :
-                        out.write('\\');
-                        out.write('\\');
-                        break;
-                    case '/' :
-                        if (escapeForwardSlash) {
-                            out.write('\\');
-                        }
-                        out.write('/');
-                        break;
-                    default :
-                        out.write(ch);
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * <p>Unescapes any Java literals found in the <code>String</code>.
-     * For example, it will turn a sequence of <code>'\'</code> and
-     * <code>'n'</code> into a newline character, unless the <code>'\'</code>
-     * is preceded by another <code>'\'</code>.</p>
-     *
-     * @param str  the <code>String</code> to unescape, may be null
-     * @return a new unescaped <code>String</code>, <code>null</code> if null string input
-     */
-    public static String unescapeString(String str) {
-        return StringEscapeUtils.unescapeJava(str);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/mod/SmaliMod.java b/apktool/androlib/src/main/java/brut/androlib/mod/SmaliMod.java
deleted file mode 100644
index 9f1fa9c..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/mod/SmaliMod.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.mod;
-
-import com.android.tools.smali.dexlib2.writer.builder.DexBuilder;
-import com.android.tools.smali.smali.smaliFlexLexer;
-import com.android.tools.smali.smali.smaliParser;
-import com.android.tools.smali.smali.smaliTreeWalker;
-import com.apkide.common.AppLog;
-
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-
-public class SmaliMod {
-    public static boolean assembleSmaliFile(File smaliFile, DexBuilder dexBuilder, int apiLevel, boolean verboseErrors,
-                                            boolean printTokens) throws IOException, RecognitionException {
-
-        CommonTokenStream tokens;
-        smaliFlexLexer lexer;
-
-        InputStream is = Files.newInputStream(smaliFile.toPath());
-        InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
-
-        lexer = new smaliFlexLexer(reader, apiLevel);
-        (lexer).setSourceFile(smaliFile);
-        tokens = new CommonTokenStream(lexer);
-
-        if (printTokens) {
-            tokens.getTokens();
-
-            for (int i=0; i<tokens.size(); i++) {
-                Token token = tokens.get(i);
-                if (token.getChannel() == smaliParser.HIDDEN) {
-                    continue;
-                }
-
-                AppLog.d(smaliParser.tokenNames[token.getType()] + ": " + token.getText());
-            }
-        }
-
-        smaliParser parser = new smaliParser(tokens);
-        parser.setApiLevel(apiLevel);
-        parser.setVerboseErrors(verboseErrors);
-
-        smaliParser.smali_file_return result = parser.smali_file();
-
-        if (parser.getNumberOfSyntaxErrors() > 0 || lexer.getNumberOfSyntaxErrors() > 0) {
-            is.close();
-            reader.close();
-            return false;
-        }
-
-        CommonTree t = result.getTree();
-
-        CommonTreeNodeStream treeStream = new CommonTreeNodeStream(t);
-        treeStream.setTokenStream(tokens);
-
-        smaliTreeWalker dexGen = new smaliTreeWalker(treeStream);
-        dexGen.setApiLevel(apiLevel);
-        dexGen.setVerboseErrors(verboseErrors);
-        dexGen.setDexBuilder(dexBuilder);
-        dexGen.smali_file();
-
-        is.close();
-        reader.close();
-
-        return dexGen.getNumberOfSyntaxErrors() == 0;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/AndrolibResources.java b/apktool/androlib/src/main/java/brut/androlib/res/AndrolibResources.java
deleted file mode 100644
index a0e0b57..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ /dev/null
@@ -1,864 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import android.text.TextUtils;
-
-import com.apkide.common.IOUtils;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import brut.androlib.Config;
-import brut.androlib.err.AndrolibException;
-import brut.androlib.meta.MetaInfo;
-import brut.androlib.meta.PackageInfo;
-import brut.androlib.meta.VersionInfo;
-import brut.androlib.res.data.ResConfigFlags;
-import brut.androlib.res.data.ResPackage;
-import brut.androlib.res.data.ResResSpec;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.data.ResTable;
-import brut.androlib.res.data.ResValuesFile;
-import brut.androlib.res.decoder.ARSCDecoder;
-import brut.androlib.res.decoder.AXmlResourceParser;
-import brut.androlib.res.decoder.AndroidManifestResourceParser;
-import brut.androlib.res.decoder.Res9patchStreamDecoder;
-import brut.androlib.res.decoder.ResAttrDecoder;
-import brut.androlib.res.decoder.ResFileDecoder;
-import brut.androlib.res.decoder.ResRawStreamDecoder;
-import brut.androlib.res.decoder.ResStreamDecoderContainer;
-import brut.androlib.res.decoder.XmlPullStreamDecoder;
-import brut.androlib.res.util.ExtMXSerializer;
-import brut.androlib.res.util.ExtXmlSerializer;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.androlib.res.xml.ResXmlPatcher;
-import brut.common.BrutException;
-import brut.directory.Directory;
-import brut.directory.DirectoryException;
-import brut.directory.ExtFile;
-import brut.directory.FileDirectory;
-import brut.directory.ZipUtils;
-import brut.util.AaptManager;
-import brut.util.Duo;
-import brut.util.OS;
-
-final public class AndrolibResources {
-    public Map<String, String> mResFileMapping = new HashMap<>();
-    private File mFrameworkDirectory = null;
-
-    private ExtFile mFramework = null;
-
-    private String mMinSdkVersion = null;
-    private String mMaxSdkVersion = null;
-    private String mTargetSdkVersion = null;
-    private String mVersionCode = null;
-    private String mVersionName = null;
-    private String mPackageRenamed = null;
-    private String mPackageId = null;
-
-    private boolean mSharedLibrary = false;
-    private boolean mSparseResources = false;
-
-    private final static String[] IGNORED_PACKAGES = new String[]{
-            "android", "com.htc", "com.lge", "com.lge.internal", "yi", "flyme", "air.com.adobe.appentry",
-            "FFFFFFFFFFFFFFFFFFFFFF"};
-
-
-    public ResTable getResTable(ExtFile apkFile) throws AndrolibException {
-        return getResTable(apkFile, true);
-    }
-
-    public ResTable getResTable(ExtFile apkFile, boolean loadMainPkg)
-            throws AndrolibException {
-        ResTable resTable = new ResTable(this);
-        if (loadMainPkg) {
-            loadMainPkg(resTable, apkFile);
-        }
-        return resTable;
-    }
-
-    public ResPackage loadMainPkg(ResTable resTable, ExtFile apkFile)
-            throws AndrolibException {
-        LOGGER.info("Loading resource table...");
-        ResPackage[] pkgs = getResPackagesFromApk(apkFile, resTable, Config.get().keepBrokenResources);
-        ResPackage pkg;
-
-        switch (pkgs.length) {
-            case 0:
-                pkg = new ResPackage(resTable, 0, null);
-                break;
-            case 1:
-                pkg = pkgs[0];
-                break;
-            case 2:
-                LOGGER.warning("Skipping package group: " + pkgs[0].getName());
-                pkg = pkgs[1];
-                break;
-            default:
-                pkg = selectPkgWithMostResSpecs(pkgs);
-                break;
-        }
-
-        resTable.addPackage(pkg, true);
-        return pkg;
-    }
-
-    public ResPackage selectPkgWithMostResSpecs(ResPackage[] pkgs) {
-        int id = 0;
-        int value = 0;
-        int index = 0;
-
-        for (int i = 0; i < pkgs.length; i++) {
-            ResPackage resPackage = pkgs[i];
-            if (resPackage.getResSpecCount() > value && !resPackage.getName().equalsIgnoreCase("android")) {
-                value = resPackage.getResSpecCount();
-                id = resPackage.getId();
-                index = i;
-            }
-        }
-
-        // if id is still 0, we only have one pkgId which is "android" -> 1
-        return (id == 0) ? pkgs[0] : pkgs[index];
-    }
-
-    public ResPackage loadFrameworkPkg(ResTable resTable, int id)
-            throws AndrolibException {
-
-        Framework framework = new Framework();
-        File apk = framework.getFrameworkApk(id, Config.get().frameworkTag);
-
-        LOGGER.info("Loading resource table from file: " + apk);
-        mFramework = new ExtFile(apk);
-        ResPackage[] pkgs = getResPackagesFromApk(mFramework, resTable, true);
-
-        ResPackage pkg;
-        if (pkgs.length > 1) {
-            pkg = selectPkgWithMostResSpecs(pkgs);
-        } else if (pkgs.length == 0) {
-            throw new AndrolibException("Arsc files with zero or multiple packages");
-        } else {
-            pkg = pkgs[0];
-        }
-
-        if (pkg.getId() != id) {
-            throw new AndrolibException("Expected pkg of id: " + id + ", got: " + pkg.getId());
-        }
-
-        resTable.addPackage(pkg, false);
-        return pkg;
-    }
-
-    public void decodeManifest(ResTable resTable, ExtFile apkFile, File outDir)
-            throws AndrolibException {
-
-        Duo<ResFileDecoder, AXmlResourceParser> duo = getManifestFileDecoder(false);
-        ResFileDecoder fileDecoder = duo.m1;
-
-        // Set ResAttrDecoder
-        duo.m2.setAttrDecoder(new ResAttrDecoder());
-        ResAttrDecoder attrDecoder = duo.m2.getAttrDecoder();
-
-        // Fake ResPackage
-        attrDecoder.setCurrentPackage(new ResPackage(resTable, 0, null));
-
-        Directory inApk, out;
-        try {
-            inApk = apkFile.getDirectory();
-            out = new FileDirectory(outDir);
-
-            LOGGER.info("Decoding AndroidManifest.xml with only framework resources...");
-            fileDecoder.decodeManifest(inApk, "AndroidManifest.xml", out, "AndroidManifest.xml");
-
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void adjustPackageManifest(ResTable resTable, String filePath)
-            throws AndrolibException {
-
-        // compare resources.arsc package name to the one present in AndroidManifest
-        ResPackage resPackage = resTable.getCurrentResPackage();
-        String pkgOriginal = resPackage.getName();
-        mPackageRenamed = resTable.getPackageRenamed();
-
-        resTable.setPackageId(resPackage.getId());
-        resTable.setPackageOriginal(pkgOriginal);
-
-        // 1) Check if pkgOriginal === mPackageRenamed
-        // 2) Check if pkgOriginal is ignored via IGNORED_PACKAGES
-        if (pkgOriginal == null || pkgOriginal.equalsIgnoreCase(mPackageRenamed)
-                || (Arrays.asList(IGNORED_PACKAGES).contains(pkgOriginal))) {
-            LOGGER.info("Regular manifest package...");
-        } else {
-            LOGGER.info("Renamed manifest package found! Replacing " + mPackageRenamed + " with " + pkgOriginal);
-            ResXmlPatcher.renameManifestPackage(new File(filePath), pkgOriginal);
-        }
-    }
-
-    public void decodeManifestWithResources(ResTable resTable, ExtFile apkFile, File outDir)
-            throws AndrolibException {
-
-        Duo<ResFileDecoder, AXmlResourceParser> duo = getManifestFileDecoder(true);
-        ResFileDecoder fileDecoder = duo.m1;
-        ResAttrDecoder attrDecoder = duo.m2.getAttrDecoder();
-
-        attrDecoder.setCurrentPackage(resTable.listMainPackages().iterator().next());
-
-        Directory inApk, in = null, out;
-        try {
-            inApk = apkFile.getDirectory();
-            out = new FileDirectory(outDir);
-            LOGGER.info("Decoding AndroidManifest.xml with resources...");
-
-            fileDecoder.decodeManifest(inApk, "AndroidManifest.xml", out, "AndroidManifest.xml");
-
-            // Remove versionName / versionCode (aapt API 16)
-            if (!resTable.getAnalysisMode()) {
-
-                // check for a mismatch between resources.arsc package and the package listed in AndroidManifest
-                // also remove the android::versionCode / versionName from manifest for rebuild
-                // this is a required change to prevent aapt warning about conflicting versions
-                // it will be passed as a parameter to aapt like "--min-sdk-version" via apktool.yml
-                adjustPackageManifest(resTable, outDir.getAbsolutePath() + File.separator + "AndroidManifest.xml");
-
-                ResXmlPatcher.removeManifestVersions(new File(
-                        outDir.getAbsolutePath() + File.separator + "AndroidManifest.xml"));
-
-                mPackageId = String.valueOf(resTable.getPackageId());
-            }
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void decode(ResTable resTable, ExtFile apkFile, File outDir)
-            throws AndrolibException {
-        Duo<ResFileDecoder, AXmlResourceParser> duo = getResFileDecoder();
-        ResFileDecoder fileDecoder = duo.m1;
-        ResAttrDecoder attrDecoder = duo.m2.getAttrDecoder();
-
-        attrDecoder.setCurrentPackage(resTable.listMainPackages().iterator().next());
-        Directory in, out;
-
-        try {
-            out = new FileDirectory(outDir);
-            in = apkFile.getDirectory();
-            out = out.createDir("res");
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-
-        ExtMXSerializer xmlSerializer = getResXmlSerializer();
-        for (ResPackage pkg : resTable.listMainPackages()) {
-            attrDecoder.setCurrentPackage(pkg);
-
-            LOGGER.info("Decoding file-resources...");
-            for (ResResource res : pkg.listFiles()) {
-                fileDecoder.decode(res, in, out, mResFileMapping);
-            }
-
-            LOGGER.info("Decoding values */* XMLs...");
-            for (ResValuesFile valuesFile : pkg.listValuesFiles()) {
-                generateValuesFile(valuesFile, out, xmlSerializer);
-            }
-            generatePublicXml(pkg, out, xmlSerializer);
-        }
-
-        AndrolibException decodeError = duo.m2.getFirstError();
-        if (decodeError != null) {
-            throw decodeError;
-        }
-    }
-
-    public void setSdkInfo(Map<String, String> map) {
-        if (map != null) {
-            mMinSdkVersion = map.get("minSdkVersion");
-            mTargetSdkVersion = map.get("targetSdkVersion");
-            mMaxSdkVersion = map.get("maxSdkVersion");
-        }
-    }
-
-    public void setVersionInfo(VersionInfo versionInfo) {
-        if (versionInfo != null) {
-            mVersionCode = versionInfo.versionCode;
-            mVersionName = versionInfo.versionName;
-        }
-    }
-
-    public void setPackageRenamed(PackageInfo packageInfo) {
-        if (packageInfo != null) {
-            mPackageRenamed = packageInfo.renameManifestPackage;
-        }
-    }
-
-    public void setPackageId(PackageInfo packageInfo) {
-        if (packageInfo != null) {
-            mPackageId = packageInfo.forcedPackageId;
-        }
-    }
-
-    public void setSharedLibrary(boolean flag) {
-        mSharedLibrary = flag;
-    }
-
-    public void setSparseResources(boolean flag) {
-        mSparseResources = flag;
-    }
-
-    public String checkTargetSdkVersionBounds() {
-        int target = mapSdkShorthandToVersion(mTargetSdkVersion);
-
-        int min = (mMinSdkVersion != null) ? mapSdkShorthandToVersion(mMinSdkVersion) : 0;
-        int max = (mMaxSdkVersion != null) ? mapSdkShorthandToVersion(mMaxSdkVersion) : target;
-
-        target = Math.min(max, target);
-        target = Math.max(min, target);
-        return Integer.toString(target);
-    }
-
-    private File createDoNotCompressExtensionsFile() throws AndrolibException {
-        if (Config.get().doNotCompress == null || Config.get().doNotCompress.isEmpty()) {
-            return null;
-        }
-
-        File doNotCompressFile;
-        try {
-            doNotCompressFile = File.createTempFile("APKTOOL", null);
-            doNotCompressFile.deleteOnExit();
-
-            BufferedWriter fileWriter = new BufferedWriter(new FileWriter(doNotCompressFile));
-            for (String extension : Config.get().doNotCompress) {
-                fileWriter.write(extension);
-                fileWriter.newLine();
-            }
-            fileWriter.close();
-
-            return doNotCompressFile;
-        } catch (IOException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private void aapt2Package(File apkFile, File manifest, File resDir, File rawDir, File assetDir, File[] include,
-                              List<String> cmd, boolean customAapt)
-            throws AndrolibException {
-
-        List<String> compileCommand = new ArrayList<>(cmd);
-        File resourcesZip = null;
-
-        if (resDir != null) {
-            File buildDir = new File(resDir.getParent(), "build");
-            resourcesZip = new File(buildDir, "resources.zip");
-        }
-
-        if (resDir != null && !resourcesZip.exists()) {
-
-            // Compile the files into flat arsc files
-            cmd.add("compile");
-
-            cmd.add("--dir");
-            cmd.add(resDir.getAbsolutePath());
-
-            // Treats error that used to be valid in aapt1 as warnings in aapt2
-            cmd.add("--legacy");
-
-            File buildDir = new File(resDir.getParent(), "build");
-            resourcesZip = new File(buildDir, "resources.zip");
-
-            cmd.add("-o");
-            cmd.add(resourcesZip.getAbsolutePath());
-
-            if (Config.get().verbose) {
-                cmd.add("-v");
-            }
-
-            if (Config.get().noCrunch) {
-                cmd.add("--no-crunch");
-            }
-
-            try {
-                OS.exec(cmd.toArray(new String[0]));
-                LOGGER.info("aapt2 compile command ran: ");
-                LOGGER.info(cmd.toString());
-            } catch (BrutException ex) {
-                throw new AndrolibException(ex);
-            }
-        }
-
-        if (manifest == null) {
-            return;
-        }
-
-        // Link them into the final apk, reusing our old command after clearing for the aapt2 binary
-        cmd = new ArrayList<>(compileCommand);
-        cmd.add("link");
-
-        cmd.add("-o");
-        cmd.add(apkFile.getAbsolutePath());
-
-        if (mPackageId != null && !mSharedLibrary) {
-            cmd.add("--package-id");
-            cmd.add(mPackageId);
-        }
-
-        if (mSharedLibrary) {
-            cmd.add("--shared-lib");
-        }
-
-        if (mMinSdkVersion != null) {
-            cmd.add("--min-sdk-version");
-            cmd.add(mMinSdkVersion);
-        }
-
-        if (mTargetSdkVersion != null) {
-            cmd.add("--target-sdk-version");
-            cmd.add(checkTargetSdkVersionBounds());
-        }
-
-        if (mPackageRenamed != null) {
-            cmd.add("--rename-manifest-package");
-            cmd.add(mPackageRenamed);
-
-            cmd.add("--rename-instrumentation-target-package");
-            cmd.add(mPackageRenamed);
-        }
-
-        if (mVersionCode != null) {
-            cmd.add("--version-code");
-            cmd.add(mVersionCode);
-        }
-
-        if (mVersionName != null) {
-            cmd.add("--version-name");
-            cmd.add(mVersionName);
-        }
-
-        // Disable automatic changes
-        cmd.add("--no-auto-version");
-        cmd.add("--no-version-vectors");
-        cmd.add("--no-version-transitions");
-        cmd.add("--no-resource-deduping");
-
-        cmd.add("--allow-reserved-package-id");
-
-        if (mSparseResources) {
-            cmd.add("--enable-sparse-encoding");
-        }
-
-        if (Config.get().isFramework) {
-            cmd.add("-x");
-        }
-
-        if (Config.get().doNotCompress != null && !customAapt) {
-            // Use custom -e option to avoid limits on commandline length.
-            // Can only be used when custom aapt binary is not used.
-            String extensionsFilePath = Objects.requireNonNull(createDoNotCompressExtensionsFile()).getAbsolutePath();
-            cmd.add("-e");
-            cmd.add(extensionsFilePath);
-        } else if (Config.get().doNotCompress != null) {
-            for (String file : Config.get().doNotCompress) {
-                cmd.add("-0");
-                cmd.add(file);
-            }
-        }
-
-        if (!Config.get().resourcesAreCompressed) {
-            cmd.add("-0");
-            cmd.add("arsc");
-        }
-
-        if (include != null) {
-            for (File file : include) {
-                cmd.add("-I");
-                cmd.add(file.getPath());
-            }
-        }
-
-        cmd.add("--manifest");
-        cmd.add(manifest.getAbsolutePath());
-
-        if (assetDir != null) {
-            cmd.add("-A");
-            cmd.add(assetDir.getAbsolutePath());
-        }
-
-        if (rawDir != null) {
-            cmd.add("-R");
-            cmd.add(rawDir.getAbsolutePath());
-        }
-
-        if (Config.get().verbose) {
-            cmd.add("-v");
-        }
-
-        if (resourcesZip != null) {
-            cmd.add(resourcesZip.getAbsolutePath());
-        }
-
-        try {
-            OS.exec(cmd.toArray(new String[0]));
-            LOGGER.info("aapt2 link command ran: ");
-            LOGGER.info(cmd.toString());
-        } catch (BrutException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private void aapt1Package(File apkFile, File manifest, File resDir, File rawDir, File assetDir, File[] include,
-                              List<String> cmd, boolean customAapt)
-            throws AndrolibException {
-
-        cmd.add("p");
-
-        if (Config.get().verbose) { // output aapt verbose
-            cmd.add("-v");
-        }
-        if (Config.get().updateFiles) {
-            cmd.add("-u");
-        }
-        if (Config.get().debugMode) { // inject debuggable="true" into manifest
-            cmd.add("--debug-mode");
-        }
-        if (Config.get().noCrunch) {
-            cmd.add("--no-crunch");
-        }
-        // force package id so that some frameworks build with correct id
-        // disable if user adds own aapt (can't know if they have this feature)
-        if (mPackageId != null && !customAapt && !mSharedLibrary) {
-            cmd.add("--forced-package-id");
-            cmd.add(mPackageId);
-        }
-        if (mSharedLibrary) {
-            cmd.add("--shared-lib");
-        }
-        if (mMinSdkVersion != null) {
-            cmd.add("--min-sdk-version");
-            cmd.add(mMinSdkVersion);
-        }
-        if (mTargetSdkVersion != null) {
-            cmd.add("--target-sdk-version");
-
-            // Ensure that targetSdkVersion is between minSdkVersion/maxSdkVersion if
-            // they are specified.
-            cmd.add(checkTargetSdkVersionBounds());
-        }
-        if (mMaxSdkVersion != null) {
-            cmd.add("--max-sdk-version");
-            cmd.add(mMaxSdkVersion);
-
-            // if we have max sdk version, set --max-res-version
-            // so we can ignore anything over that during build.
-            cmd.add("--max-res-version");
-            cmd.add(mMaxSdkVersion);
-        }
-        if (mPackageRenamed != null) {
-            cmd.add("--rename-manifest-package");
-            cmd.add(mPackageRenamed);
-        }
-        if (mVersionCode != null) {
-            cmd.add("--version-code");
-            cmd.add(mVersionCode);
-        }
-        if (mVersionName != null) {
-            cmd.add("--version-name");
-            cmd.add(mVersionName);
-        }
-        cmd.add("--no-version-vectors");
-        cmd.add("-F");
-        cmd.add(apkFile.getAbsolutePath());
-
-        if (Config.get().isFramework) {
-            cmd.add("-x");
-        }
-
-        if (Config.get().doNotCompress != null && !customAapt) {
-            // Use custom -e option to avoid limits on commandline length.
-            // Can only be used when custom aapt binary is not used.
-            String extensionsFilePath = Objects.requireNonNull(createDoNotCompressExtensionsFile()).getAbsolutePath();
-            cmd.add("-e");
-            cmd.add(extensionsFilePath);
-        } else if (Config.get().doNotCompress != null) {
-            for (String file : Config.get().doNotCompress) {
-                cmd.add("-0");
-                cmd.add(file);
-            }
-        }
-
-        if (!Config.get().resourcesAreCompressed) {
-            cmd.add("-0");
-            cmd.add("arsc");
-        }
-
-        if (include != null) {
-            for (File file : include) {
-                cmd.add("-I");
-                cmd.add(file.getPath());
-            }
-        }
-        if (resDir != null) {
-            cmd.add("-S");
-            cmd.add(resDir.getAbsolutePath());
-        }
-        if (manifest != null) {
-            cmd.add("-M");
-            cmd.add(manifest.getAbsolutePath());
-        }
-        if (assetDir != null) {
-            cmd.add("-A");
-            cmd.add(assetDir.getAbsolutePath());
-        }
-        if (rawDir != null) {
-            cmd.add(rawDir.getAbsolutePath());
-        }
-        try {
-            OS.exec(cmd.toArray(new String[0]));
-            LOGGER.info("command ran: ");
-            LOGGER.info(cmd.toString());
-        } catch (BrutException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void aaptPackage(File apkFile, File manifest, File resDir, File rawDir, File assetDir, File[] include)
-            throws AndrolibException {
-
-        String aaptPath = Config.get().aaptPath;
-        boolean customAapt = !TextUtils.isEmpty(aaptPath);
-        List<String> cmd = new ArrayList<>();
-
-        try {
-            String aaptCommand = AaptManager.getAaptExecutionCommand(aaptPath, getAaptBinaryFile());
-            cmd.add(aaptCommand);
-        } catch (BrutException ex) {
-            LOGGER.warning("aapt: " + ex.getMessage() + " (defaulting to $PATH binary)");
-            cmd.add(AaptManager.getAaptBinaryName(getAaptVersion()));
-        }
-
-        if (Config.get().isAapt2()) {
-            aapt2Package(apkFile, manifest, resDir, rawDir, assetDir, include, cmd, customAapt);
-            return;
-        }
-        aapt1Package(apkFile, manifest, resDir, rawDir, assetDir, include, cmd, customAapt);
-    }
-
-    public void zipPackage(File apkFile, File rawDir, File assetDir)
-            throws AndrolibException {
-
-        try {
-            ZipUtils.zipFolders(rawDir, apkFile, assetDir, Config.get().doNotCompress);
-        } catch (IOException | BrutException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public int getMinSdkVersionFromAndroidCodename(MetaInfo meta, String sdkVersion) {
-        int sdkNumber = mapSdkShorthandToVersion(sdkVersion);
-
-        if (sdkNumber == ResConfigFlags.SDK_BASE) {
-            return Integer.parseInt(Objects.requireNonNull(meta.sdkInfo.get("minSdkVersion")));
-        }
-        return sdkNumber;
-    }
-
-    private int mapSdkShorthandToVersion(String sdkVersion) {
-        switch (sdkVersion.toUpperCase()) {
-            case "M":
-                return ResConfigFlags.SDK_MNC;
-            case "N":
-                return ResConfigFlags.SDK_NOUGAT;
-            case "O":
-                return ResConfigFlags.SDK_OREO;
-            case "P":
-                return ResConfigFlags.SDK_P;
-            case "Q":
-                return ResConfigFlags.SDK_Q;
-            case "R":
-                return ResConfigFlags.SDK_R;
-            case "S":
-                return ResConfigFlags.SDK_S;
-            case "SV2":
-                return ResConfigFlags.SDK_S_V2;
-            case "T":
-            case "TIRAMISU":
-                return ResConfigFlags.SDK_TIRAMISU;
-            case "UPSIDEDOWNCAKE":
-            case "UPSIDE_DOWN_CAKE":
-            case "VANILLAICECREAM":
-            case "VANILLA_ICE_CREAM":
-                return ResConfigFlags.SDK_DEVELOPMENT;
-            default:
-                return Integer.parseInt(sdkVersion);
-        }
-    }
-
-    public boolean detectWhetherAppIsFramework(File appDir)
-            throws AndrolibException {
-        File publicXml = new File(appDir, "res/values/public.xml");
-        if (!publicXml.exists()) {
-            return false;
-        }
-
-        Iterator<String> it;
-        try {
-            it = IOUtils.lineIterator(new FileReader(new File(appDir,
-                    "res/values/public.xml")));
-        } catch (FileNotFoundException ex) {
-            throw new AndrolibException(
-                    "Could not detect whether app is framework one", ex);
-        }
-        it.next();
-        it.next();
-        return it.next().contains("0x01");
-    }
-
-    public Duo<ResFileDecoder, AXmlResourceParser> getResFileDecoder() {
-        ResStreamDecoderContainer decoders = new ResStreamDecoderContainer();
-        decoders.setDecoder("raw", new ResRawStreamDecoder());
-        decoders.setDecoder("9patch", new Res9patchStreamDecoder());
-
-        AXmlResourceParser axmlParser = new AXmlResourceParser();
-        axmlParser.setAttrDecoder(new ResAttrDecoder());
-        decoders.setDecoder("xml", new XmlPullStreamDecoder(axmlParser, getResXmlSerializer()));
-
-        return new Duo<>(new ResFileDecoder(decoders), axmlParser);
-    }
-
-    public Duo<ResFileDecoder, AXmlResourceParser> getManifestFileDecoder(boolean withResources) {
-        ResStreamDecoderContainer decoders = new ResStreamDecoderContainer();
-
-        AXmlResourceParser axmlParser = new AndroidManifestResourceParser();
-        if (withResources) {
-            axmlParser.setAttrDecoder(new ResAttrDecoder());
-        }
-        decoders.setDecoder("xml", new XmlPullStreamDecoder(axmlParser, getResXmlSerializer()));
-
-        return new Duo<>(new ResFileDecoder(decoders), axmlParser);
-    }
-
-    public ExtMXSerializer getResXmlSerializer() {
-        ExtMXSerializer serial = new ExtMXSerializer();
-        serial.setProperty(ExtXmlSerializer.PROPERTY_SERIALIZER_INDENTATION, "    ");
-        serial.setProperty(ExtXmlSerializer.PROPERTY_SERIALIZER_LINE_SEPARATOR, System.getProperty("line.separator"));
-        serial.setProperty(ExtXmlSerializer.PROPERTY_DEFAULT_ENCODING, "utf-8");
-        serial.setDisabledAttrEscape(true);
-        return serial;
-    }
-
-    private void generateValuesFile(ResValuesFile valuesFile, Directory out,
-                                    ExtXmlSerializer serial) throws AndrolibException {
-        try {
-            OutputStream outStream = out.getFileOutput(valuesFile.getPath());
-            serial.setOutput((outStream), null);
-            serial.startDocument(null, null);
-            serial.startTag(null, "resources");
-
-            for (ResResource res : valuesFile.listResources()) {
-                if (valuesFile.isSynthesized(res)) {
-                    continue;
-                }
-                ((ResValuesXmlSerializable) res.getValue()).serializeToResValuesXml(serial, res);
-            }
-
-            serial.endTag(null, "resources");
-            serial.newLine();
-            serial.endDocument();
-            serial.flush();
-            outStream.close();
-        } catch (IOException | DirectoryException ex) {
-            throw new AndrolibException("Could not generate: " + valuesFile.getPath(), ex);
-        }
-    }
-
-    private void generatePublicXml(ResPackage pkg, Directory out,
-                                   XmlSerializer serial) throws AndrolibException {
-        try {
-            OutputStream outStream = out.getFileOutput("values/public.xml");
-            serial.setOutput(outStream, null);
-            serial.startDocument(null, null);
-            serial.startTag(null, "resources");
-
-            for (ResResSpec spec : pkg.listResSpecs()) {
-                serial.startTag(null, "public");
-                serial.attribute(null, "type", spec.getType().getName());
-                serial.attribute(null, "name", spec.getName());
-                serial.attribute(null, "id", String.format("0x%08x", spec.getId().id));
-                serial.endTag(null, "public");
-            }
-
-            serial.endTag(null, "resources");
-            serial.endDocument();
-            serial.flush();
-            outStream.close();
-        } catch (IOException | DirectoryException ex) {
-            throw new AndrolibException("Could not generate public.xml file", ex);
-        }
-    }
-
-    private ResPackage[] getResPackagesFromApk(ExtFile apkFile, ResTable resTable, boolean keepBroken)
-            throws AndrolibException {
-        try {
-            Directory dir = apkFile.getDirectory();
-            try (BufferedInputStream bfi = new BufferedInputStream(dir.getFileInput("resources.arsc"))) {
-                return ARSCDecoder.decode(bfi, false, keepBroken, resTable).getPackages();
-            }
-        } catch (DirectoryException | IOException ex) {
-            throw new AndrolibException("Could not load resources.arsc from file: " + apkFile, ex);
-        }
-    }
-
-
-    private File getAaptBinaryFile() throws AndrolibException {
-        try {
-            if (getAaptVersion() == 2) {
-                return AaptManager.getAapt2();
-            }
-            return AaptManager.getAapt1();
-        } catch (BrutException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private int getAaptVersion() {
-        return Config.get().isAapt2() ? 2 : 1;
-    }
-
-    public void close() throws IOException {
-        if (mFramework != null) {
-            mFramework.close();
-        }
-    }
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/Framework.java b/apktool/androlib/src/main/java/brut/androlib/res/Framework.java
deleted file mode 100644
index fbcb064..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/Framework.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package brut.androlib.res;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-import static brut.androlib.Config.get;
-
-import com.apkide.common.ApplicationProvider;
-import com.apkide.common.IOUtils;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.util.Objects;
-import java.util.zip.CRC32;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.CantFindFrameworkResException;
-import brut.androlib.res.decoder.ARSCDecoder;
-
-public class Framework {
-    private File mFrameworkDirectory = null;
-    public void installFramework(File frameFile) throws AndrolibException {
-        installFramework(frameFile, get().frameworkTag);
-    }
-
-    public void installFramework(File frameFile, String tag)
-            throws AndrolibException {
-        InputStream in = null;
-        ZipOutputStream out = null;
-        try {
-            ZipFile zip = new ZipFile(frameFile);
-            ZipEntry entry = zip.getEntry("resources.arsc");
-
-            if (entry == null) {
-                throw new AndrolibException("Can't find resources.arsc file");
-            }
-
-            in = zip.getInputStream(entry);
-            byte[] data = IOUtils.readBytes(in);
-
-            ARSCDecoder.ARSCData arsc = ARSCDecoder.decode(new ByteArrayInputStream(data), true, true);
-            publicizeResources(data, arsc.getFlagsOffsets());
-
-            File outFile = new File(getFrameworkDirectory(), arsc
-                    .getOnePackage().getId()
-                    + (tag == null ? "" : '-' + tag)
-                    + ".apk");
-
-            out = new ZipOutputStream(Files.newOutputStream(outFile.toPath()));
-            out.setMethod(ZipOutputStream.STORED);
-            CRC32 crc = new CRC32();
-            crc.update(data);
-            entry = new ZipEntry("resources.arsc");
-            entry.setSize(data.length);
-            entry.setMethod(ZipOutputStream.STORED);
-            entry.setCrc(crc.getValue());
-            out.putNextEntry(entry);
-            out.write(data);
-            out.closeEntry();
-
-            //Write fake AndroidManifest.xml file to support original aapt
-            entry = zip.getEntry("AndroidManifest.xml");
-            if (entry != null) {
-                in = zip.getInputStream(entry);
-                byte[] manifest = IOUtils.readBytes(in);
-                CRC32 manifestCrc = new CRC32();
-                manifestCrc.update(manifest);
-                entry.setSize(manifest.length);
-                entry.setCompressedSize(-1);
-                entry.setCrc(manifestCrc.getValue());
-                out.putNextEntry(entry);
-                out.write(manifest);
-                out.closeEntry();
-            }
-
-            zip.close();
-            LOGGER.info("Framework installed to: " + outFile);
-        } catch (IOException ex) {
-            throw new AndrolibException(ex);
-        } finally {
-            IOUtils.safeClose(in,out);
-        }
-    }
-
-    public void listFrameworkDirectory() throws AndrolibException {
-        File dir = getFrameworkDirectory();
-        if (dir == null) {
-            LOGGER.error("No framework directory found. Nothing to list.");
-            return;
-        }
-
-        for (File file : Objects.requireNonNull(dir.listFiles())) {
-            if (file.isFile() && file.getName().endsWith(".apk")) {
-                LOGGER.info(file.getName());
-            }
-        }
-    }
-
-    public void publicizeResources(File arscFile) throws AndrolibException {
-        byte[] data = new byte[(int) arscFile.length()];
-
-        try(InputStream in = Files.newInputStream(arscFile.toPath());
-            OutputStream out = Files.newOutputStream(arscFile.toPath())) {
-            //noinspection ResultOfMethodCallIgnored
-            in.read(data);
-            publicizeResources(data);
-            out.write(data);
-        } catch (IOException ex){
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void publicizeResources(byte[] arsc) throws AndrolibException {
-        publicizeResources(arsc, ARSCDecoder.decode(new ByteArrayInputStream(arsc), true, true).getFlagsOffsets());
-    }
-
-    public void publicizeResources(byte[] arsc, ARSCDecoder.FlagsOffset[] flagsOffsets) {
-        for (ARSCDecoder.FlagsOffset flags : flagsOffsets) {
-            int offset = flags.offset + 3;
-            int end = offset + 4 * flags.count;
-            while (offset < end) {
-                arsc[offset] |= (byte) 0x40;
-                offset += 4;
-            }
-        }
-    }
-
-    public File getFrameworkDirectory() throws AndrolibException {
-        if (mFrameworkDirectory != null) {
-            return mFrameworkDirectory;
-        }
-
-        String path;
-
-        // use default framework path or specified on the command line
-        path = get().frameworkDirectory;
-
-        File dir = new File(path);
-
-        if (!dir.isDirectory() && dir.isFile()) {
-            throw new AndrolibException("--frame-path is set to a file, not a directory.");
-        }
-
-        if (dir.getParentFile() != null && dir.getParentFile().isFile()) {
-            throw new AndrolibException("Please remove file at " + dir.getParentFile());
-        }
-
-        if (! dir.exists()) {
-            if (! dir.mkdirs()) {
-                if (get().frameworkDirectory != null) {
-                    LOGGER.error("Can't create Framework directory: " + dir);
-                }
-                throw new AndrolibException(String.format(
-                        "Can't create directory: (%s). Pass a writable path with --frame-path {DIR}. ", dir
-                ));
-            }
-        }
-
-        if (get().frameworkDirectory == null) {
-            if (! dir.canWrite()) {
-                LOGGER.error(String.format("WARNING: Could not write to (%1$s), using %2$s instead...",
-                        dir.getAbsolutePath(), System.getProperty("java.io.tmpdir")));
-                LOGGER.error("Please be aware this is a volatile directory and frameworks could go missing, " +
-                        "please utilize --frame-path if the default storage directory is unavailable");
-
-                dir = ApplicationProvider.get().getTempDirectory();
-            }
-        }
-
-        mFrameworkDirectory = dir;
-        return dir;
-    }
-
-    public File getFrameworkApk(int id, String frameTag)
-            throws AndrolibException {
-        File dir = getFrameworkDirectory();
-        File apk;
-
-        if (frameTag != null) {
-            apk = new File(dir, String.valueOf(id) + '-' + frameTag + ".apk");
-            if (apk.exists()) {
-                return apk;
-            }
-        }
-
-        apk = new File(dir, id + ".apk");
-        if (apk.exists()) {
-            return apk;
-        }
-
-        if (id == 1) {
-            try (InputStream in = getAndroidFrameworkResourcesAsStream();
-                 OutputStream out = Files.newOutputStream(apk.toPath())) {
-                IOUtils.copyBytes(in,out);
-                return apk;
-            } catch (IOException ex) {
-                throw new AndrolibException(ex);
-            }
-        }
-
-        throw new CantFindFrameworkResException(id);
-    }
-
-    public void emptyFrameworkDirectory() throws AndrolibException {
-        File dir = getFrameworkDirectory();
-        File apk;
-
-        apk = new File(dir, "1.apk");
-
-        if (! apk.exists()) {
-            LOGGER.warning("Can't empty framework directory, no file found at: " + apk.getAbsolutePath());
-        } else {
-            try {
-                if (apk.exists() && Objects.requireNonNull(dir.listFiles()).length > 1 && ! get().forceDeleteFramework) {
-                    LOGGER.warning("More than default framework detected. Please run command with `--force` parameter to wipe framework directory.");
-                } else {
-                    for (File file : Objects.requireNonNull(dir.listFiles())) {
-                        if (file.isFile() && file.getName().endsWith(".apk")) {
-                            LOGGER.info("Removing " + file.getName() + " framework file...");
-                            //noinspection ResultOfMethodCallIgnored
-                            file.delete();
-                        }
-                    }
-                }
-            } catch (NullPointerException e) {
-                throw new AndrolibException(e);
-            }
-        }
-    }
-
-    private InputStream getAndroidFrameworkResourcesAsStream() {
-        try {
-            return new FileInputStream(ApplicationProvider.get().foundAndroidFrameworkFile());
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
deleted file mode 100644
index 8b3e80b..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import androidx.annotation.NonNull;
-
-
-public class ResConfigFlags {
-    public final short mcc;
-    public final short mnc;
-
-    public final char[] language;
-    public final char[] region;
-
-    public final byte orientation;
-    public final byte touchscreen;
-    public final int density;
-
-    public final byte keyboard;
-    public final byte navigation;
-    public final byte inputFlags;
-
-    public final short screenWidth;
-    public final short screenHeight;
-
-    public final short sdkVersion;
-
-    public final byte screenLayout;
-    public final byte uiMode;
-    public final short smallestScreenWidthDp;
-
-    public final short screenWidthDp;
-    public final short screenHeightDp;
-
-    private final char[] localeScript;
-    private final char[] localeVariant;
-
-    private final byte screenLayout2;
-    private final byte colorMode;
-
-    public final boolean isInvalid;
-
-    private final String mQualifiers;
-
-    private final int size;
-
-    public ResConfigFlags() {
-        mcc = 0;
-        mnc = 0;
-        language = new char[] { '\00', '\00' };
-        region = new char[] { '\00', '\00' };
-        orientation = ORIENTATION_ANY;
-        touchscreen = TOUCHSCREEN_ANY;
-        density = DENSITY_DEFAULT;
-        keyboard = KEYBOARD_ANY;
-        navigation = NAVIGATION_ANY;
-        inputFlags = KEYSHIDDEN_ANY | NAVHIDDEN_ANY;
-        screenWidth = 0;
-        screenHeight = 0;
-        sdkVersion = 0;
-        screenLayout = SCREENLONG_ANY | SCREENSIZE_ANY;
-        uiMode = UI_MODE_TYPE_ANY | UI_MODE_NIGHT_ANY;
-        smallestScreenWidthDp = 0;
-        screenWidthDp = 0;
-        screenHeightDp = 0;
-        localeScript = null;
-        localeVariant = null;
-        screenLayout2 = 0;
-        colorMode = COLOR_WIDE_UNDEFINED;
-        isInvalid = false;
-        mQualifiers = "";
-        size = 0;
-    }
-
-    public ResConfigFlags(short mcc, short mnc, char[] language,
-                          char[] region, byte orientation,
-                          byte touchscreen, int density, byte keyboard, byte navigation,
-                          byte inputFlags, short screenWidth, short screenHeight,
-                          short sdkVersion, byte screenLayout, byte uiMode,
-                          short smallestScreenWidthDp, short screenWidthDp,
-                          short screenHeightDp, char[] localeScript, char[] localeVariant,
-                          byte screenLayout2, byte colorMode, boolean isInvalid, int size) {
-        if (orientation < 0 || orientation > 3) {
-            LOGGER.warning("Invalid orientation value: " + orientation);
-            orientation = 0;
-            isInvalid = true;
-        }
-        if (touchscreen < 0 || touchscreen > 3) {
-            LOGGER.warning("Invalid touchscreen value: " + touchscreen);
-            touchscreen = 0;
-            isInvalid = true;
-        }
-        if (density < -1) {
-            LOGGER.warning("Invalid density value: " + density);
-            density = 0;
-            isInvalid = true;
-        }
-        if (keyboard < 0 || keyboard > 3) {
-            LOGGER.warning("Invalid keyboard value: " + keyboard);
-            keyboard = 0;
-            isInvalid = true;
-        }
-        if (navigation < 0 || navigation > 4) {
-            LOGGER.warning("Invalid navigation value: " + navigation);
-            navigation = 0;
-            isInvalid = true;
-        }
-
-        if (localeScript != null && localeScript.length != 0) {
-            if (localeScript[0] == '\00') {
-                localeScript = null;
-            }
-        } else {
-            localeScript = null;
-        }
-
-        if (localeVariant != null && localeVariant.length != 0) {
-            if (localeVariant[0] == '\00') {
-                localeVariant = null;
-            }
-        }  else {
-            localeVariant = null;
-        }
-
-        this.mcc = mcc;
-        this.mnc = mnc;
-        this.language = language;
-        this.region = region;
-        this.orientation = orientation;
-        this.touchscreen = touchscreen;
-        this.density = density;
-        this.keyboard = keyboard;
-        this.navigation = navigation;
-        this.inputFlags = inputFlags;
-        this.screenWidth = screenWidth;
-        this.screenHeight = screenHeight;
-        this.sdkVersion = sdkVersion;
-        this.screenLayout = screenLayout;
-        this.uiMode = uiMode;
-        this.smallestScreenWidthDp = smallestScreenWidthDp;
-        this.screenWidthDp = screenWidthDp;
-        this.screenHeightDp = screenHeightDp;
-        this.localeScript = localeScript;
-        this.localeVariant = localeVariant;
-        this.screenLayout2 = screenLayout2;
-        this.colorMode = colorMode;
-        this.isInvalid = isInvalid;
-        this.size = size;
-        mQualifiers = generateQualifiers();
-    }
-
-    public String getQualifiers() {
-        return mQualifiers;
-    }
-
-    private String generateQualifiers() {
-        StringBuilder ret = new StringBuilder();
-        if (mcc != 0) {
-            ret.append("-mcc").append(String.format("%03d", mcc));
-            if (mnc != MNC_ZERO) {
-                if (mnc != 0) {
-                    ret.append("-mnc");
-                    if (size <= 32) {
-                        if (mnc > 0 && mnc < 10) {
-                            ret.append(String.format("%02d", mnc));
-                        } else {
-                            ret.append(String.format("%03d", mnc));
-                        }
-                    } else {
-                        ret.append(mnc);
-                    }
-                }
-            } else {
-                ret.append("-mnc00");
-            }
-        } else {
-            if (mnc != 0) {
-                ret.append("-mnc").append(mnc);
-            }
-        }
-        ret.append(getLocaleString());
-
-        switch (screenLayout & MASK_LAYOUTDIR) {
-            case SCREENLAYOUT_LAYOUTDIR_RTL:
-                ret.append("-ldrtl");
-                break;
-            case SCREENLAYOUT_LAYOUTDIR_LTR:
-                ret.append("-ldltr");
-                break;
-        }
-        if (smallestScreenWidthDp != 0) {
-            ret.append("-sw").append(smallestScreenWidthDp).append("dp");
-        }
-        if (screenWidthDp != 0) {
-            ret.append("-w").append(screenWidthDp).append("dp");
-        }
-        if (screenHeightDp != 0) {
-            ret.append("-h").append(screenHeightDp).append("dp");
-        }
-        switch (screenLayout & MASK_SCREENSIZE) {
-            case SCREENSIZE_SMALL:
-                ret.append("-small");
-                break;
-            case SCREENSIZE_NORMAL:
-                ret.append("-normal");
-                break;
-            case SCREENSIZE_LARGE:
-                ret.append("-large");
-                break;
-            case SCREENSIZE_XLARGE:
-                ret.append("-xlarge");
-                break;
-        }
-        switch (screenLayout & MASK_SCREENLONG) {
-            case SCREENLONG_YES:
-                ret.append("-long");
-                break;
-            case SCREENLONG_NO:
-                ret.append("-notlong");
-                break;
-        }
-        switch (screenLayout2 & MASK_SCREENROUND) {
-            case SCREENLAYOUT_ROUND_NO:
-                ret.append("-notround");
-                break;
-            case SCREENLAYOUT_ROUND_YES:
-                ret.append("-round");
-                break;
-        }
-        switch (colorMode & COLOR_HDR_MASK) {
-            case COLOR_HDR_YES:
-                ret.append("-highdr");
-                break;
-            case COLOR_HDR_NO:
-                ret.append("-lowdr");
-                break;
-        }
-        switch (colorMode & COLOR_WIDE_MASK) {
-            case COLOR_WIDE_YES:
-                ret.append("-widecg");
-                break;
-            case COLOR_WIDE_NO:
-                ret.append("-nowidecg");
-                break;
-        }
-        switch (orientation) {
-            case ORIENTATION_PORT:
-                ret.append("-port");
-                break;
-            case ORIENTATION_LAND:
-                ret.append("-land");
-                break;
-            case ORIENTATION_SQUARE:
-                ret.append("-square");
-                break;
-        }
-        switch (uiMode & MASK_UI_MODE_TYPE) {
-            case UI_MODE_TYPE_CAR:
-                ret.append("-car");
-                break;
-            case UI_MODE_TYPE_DESK:
-                ret.append("-desk");
-                break;
-            case UI_MODE_TYPE_TELEVISION:
-                ret.append("-television");
-                break;
-            case UI_MODE_TYPE_SMALLUI:
-                ret.append("-smallui");
-                break;
-            case UI_MODE_TYPE_MEDIUMUI:
-                ret.append("-mediumui");
-                break;
-            case UI_MODE_TYPE_LARGEUI:
-                ret.append("-largeui");
-                break;
-            case UI_MODE_TYPE_GODZILLAUI:
-                ret.append("-godzillaui");
-                break;
-            case UI_MODE_TYPE_HUGEUI:
-                ret.append("-hugeui");
-                break;
-            case UI_MODE_TYPE_APPLIANCE:
-                ret.append("-appliance");
-                break;
-            case UI_MODE_TYPE_WATCH:
-                ret.append("-watch");
-                break;
-            case UI_MODE_TYPE_VR_HEADSET:
-                ret.append("-vrheadset");
-                break;
-        }
-        switch (uiMode & MASK_UI_MODE_NIGHT) {
-            case UI_MODE_NIGHT_YES:
-                ret.append("-night");
-                break;
-            case UI_MODE_NIGHT_NO:
-                ret.append("-notnight");
-                break;
-        }
-        switch (density) {
-            case DENSITY_DEFAULT:
-                break;
-            case DENSITY_LOW:
-                ret.append("-ldpi");
-                break;
-            case DENSITY_MEDIUM:
-                ret.append("-mdpi");
-                break;
-            case DENSITY_HIGH:
-                ret.append("-hdpi");
-                break;
-            case DENSITY_TV:
-                ret.append("-tvdpi");
-                break;
-            case DENSITY_XHIGH:
-                ret.append("-xhdpi");
-                break;
-            case DENSITY_XXHIGH:
-                ret.append("-xxhdpi");
-                break;
-            case DENSITY_XXXHIGH:
-                ret.append("-xxxhdpi");
-                break;
-            case DENSITY_ANY:
-                ret.append("-anydpi");
-                break;
-            case DENSITY_NONE:
-                ret.append("-nodpi");
-                break;
-            default:
-                ret.append('-').append(density).append("dpi");
-        }
-        switch (touchscreen) {
-            case TOUCHSCREEN_NOTOUCH:
-                ret.append("-notouch");
-                break;
-            case TOUCHSCREEN_STYLUS:
-                ret.append("-stylus");
-                break;
-            case TOUCHSCREEN_FINGER:
-                ret.append("-finger");
-                break;
-        }
-        switch (inputFlags & MASK_KEYSHIDDEN) {
-            case KEYSHIDDEN_NO:
-                ret.append("-keysexposed");
-                break;
-            case KEYSHIDDEN_YES:
-                ret.append("-keyshidden");
-                break;
-            case KEYSHIDDEN_SOFT:
-                ret.append("-keyssoft");
-                break;
-        }
-        switch (keyboard) {
-            case KEYBOARD_NOKEYS:
-                ret.append("-nokeys");
-                break;
-            case KEYBOARD_QWERTY:
-                ret.append("-qwerty");
-                break;
-            case KEYBOARD_12KEY:
-                ret.append("-12key");
-                break;
-        }
-        switch (inputFlags & MASK_NAVHIDDEN) {
-            case NAVHIDDEN_NO:
-                ret.append("-navexposed");
-                break;
-            case NAVHIDDEN_YES:
-                ret.append("-navhidden");
-                break;
-        }
-        switch (navigation) {
-            case NAVIGATION_NONAV:
-                ret.append("-nonav");
-                break;
-            case NAVIGATION_DPAD:
-                ret.append("-dpad");
-                break;
-            case NAVIGATION_TRACKBALL:
-                ret.append("-trackball");
-                break;
-            case NAVIGATION_WHEEL:
-                ret.append("-wheel");
-                break;
-        }
-        if (screenWidth != 0 && screenHeight != 0) {
-            if (screenWidth > screenHeight) {
-                ret.append(String.format("-%dx%d", screenWidth, screenHeight));
-            } else {
-                ret.append(String.format("-%dx%d", screenHeight, screenWidth));
-            }
-        }
-        if (sdkVersion > 0 && sdkVersion >= getNaturalSdkVersionRequirement()) {
-            ret.append("-v").append(sdkVersion);
-        }
-        if (isInvalid) {
-            ret.append("-ERR").append(sErrCounter++);
-        }
-
-        return ret.toString();
-    }
-
-    private short getNaturalSdkVersionRequirement() {
-        if ((uiMode & MASK_UI_MODE_TYPE) == UI_MODE_TYPE_VR_HEADSET || (colorMode & COLOR_WIDE_MASK) != 0 || ((colorMode & COLOR_HDR_MASK) != 0)) {
-            return SDK_OREO;
-        }
-        if ((screenLayout2 & MASK_SCREENROUND) != 0) {
-            return SDK_MNC;
-        }
-        if (density == DENSITY_ANY) {
-            return SDK_LOLLIPOP;
-        }
-        if (smallestScreenWidthDp != 0 || screenWidthDp != 0 || screenHeightDp != 0) {
-            return SDK_HONEYCOMB_MR2;
-        }
-        if ((uiMode & (MASK_UI_MODE_TYPE | MASK_UI_MODE_NIGHT)) != UI_MODE_NIGHT_ANY) {
-            return SDK_FROYO;
-        }
-        if ((screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != SCREENSIZE_ANY || density != DENSITY_DEFAULT) {
-            return SDK_DONUT;
-        }
-        return 0;
-    }
-
-    private String getLocaleString() {
-        StringBuilder sb = new StringBuilder();
-
-        // check for old style non BCP47 tags
-        // allows values-xx-rXX, values-xx, values-xxx-rXX
-        // denies values-xxx, anything else
-        if (localeVariant == null && localeScript == null && (region[0] != '\00' || language[0] != '\00') &&
-                region.length != 3) {
-            sb.append("-").append(language);
-            if (region[0] != '\00') {
-                sb.append("-r").append(region);
-            }
-        } else { // BCP47
-            if (language[0] == '\00' && region[0] == '\00') {
-                return sb.toString(); // early return, no language or region
-            }
-            sb.append("-b+");
-            if (language[0] != '\00') {
-                sb.append(language);
-            }
-            if (localeScript != null && localeScript.length == 4) {
-                sb.append("+").append(localeScript);
-            }
-            if ((region.length == 2 || region.length == 3) && region[0] != '\00') {
-                sb.append("+").append(region);
-            }
-            if (localeVariant != null && localeVariant.length >= 5) {
-                sb.append("+").append(toUpper(localeVariant));
-            }
-        }
-        return sb.toString();
-    }
-
-    private String toUpper(char[] character) {
-        StringBuilder sb = new StringBuilder();
-        for (char ch: character) {
-            sb.append(Character.toUpperCase(ch));
-        }
-        return sb.toString();
-    }
-
-
-    @NonNull
-    @Override
-    public String toString() {
-        return !getQualifiers().equals("") ? getQualifiers() : "[DEFAULT]";
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ResConfigFlags other = (ResConfigFlags) obj;
-        return this.mQualifiers.equals(other.mQualifiers);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 17;
-        hash = 31 * hash + this.mQualifiers.hashCode();
-        return hash;
-    }
-
-    // TODO: Dirty static hack. This counter should be a part of ResPackage,
-    // but it would be hard right now and this feature is very rarely used.
-    private static int sErrCounter = 0;
-
-    public final static byte SDK_BASE = 1;
-    public final static byte SDK_BASE_1_1 = 2;
-    public final static byte SDK_CUPCAKE = 3;
-    public final static byte SDK_DONUT = 4;
-    public final static byte SDK_ECLAIR = 5;
-    public final static byte SDK_ECLAIR_0_1 = 6;
-    public final static byte SDK_ECLAIR_MR1 = 7;
-    public final static byte SDK_FROYO = 8;
-    public final static byte SDK_GINGERBREAD = 9;
-    public final static byte SDK_GINGERBREAD_MR1 = 10;
-    public final static byte SDK_HONEYCOMB = 11;
-    public final static byte SDK_HONEYCOMB_MR1 = 12;
-    public final static byte SDK_HONEYCOMB_MR2 = 13;
-    public final static byte SDK_ICE_CREAM_SANDWICH = 14;
-    public final static byte SDK_ICE_CREAM_SANDWICH_MR1 = 15;
-    public final static byte SDK_JELLY_BEAN = 16;
-    public final static byte SDK_JELLY_BEAN_MR1 = 17;
-    public final static byte SDK_JELLY_BEAN_MR2 = 18;
-    public final static byte SDK_KITKAT = 19;
-    public final static byte SDK_LOLLIPOP = 21;
-    public final static byte SDK_LOLLIPOP_MR1 = 22;
-    public final static byte SDK_MNC = 23;
-    public final static byte SDK_NOUGAT = 24;
-    public final static byte SDK_NOUGAT_MR1 = 25;
-    public final static byte SDK_OREO = 26;
-    public final static byte SDK_OREO_MR1 = 27;
-    public final static byte SDK_P = 28;
-    public final static byte SDK_Q = 29;
-    public final static byte SDK_R = 30;
-    public final static byte SDK_S = 31;
-    public final static byte SDK_S_V2 = 32;
-    public final static byte SDK_TIRAMISU = 33;
-
-    // AOSP has this as 10,000 for dev purposes.
-    // platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d
-    public final static int SDK_DEVELOPMENT = 10000;
-
-    public final static byte ORIENTATION_ANY = 0;
-    public final static byte ORIENTATION_PORT = 1;
-    public final static byte ORIENTATION_LAND = 2;
-    public final static byte ORIENTATION_SQUARE = 3;
-
-    public final static byte TOUCHSCREEN_ANY = 0;
-    public final static byte TOUCHSCREEN_NOTOUCH = 1;
-    public final static byte TOUCHSCREEN_STYLUS = 2;
-    public final static byte TOUCHSCREEN_FINGER = 3;
-
-    public final static int DENSITY_DEFAULT = 0;
-    public final static int DENSITY_LOW = 120;
-    public final static int DENSITY_MEDIUM = 160;
-    public final static int DENSITY_400 = 190;
-    public final static int DENSITY_TV = 213;
-    public final static int DENSITY_HIGH = 240;
-    public final static int DENSITY_XHIGH = 320;
-    public final static int DENSITY_XXHIGH = 480;
-    public final static int DENSITY_XXXHIGH = 640;
-    public final static int DENSITY_ANY = 0xFFFE;
-    public final static int DENSITY_NONE = 0xFFFF;
-
-    public final static int MNC_ZERO = -1;
-
-    public final static short MASK_LAYOUTDIR = 0xc0;
-    public final static short SCREENLAYOUT_LAYOUTDIR_ANY = 0x00;
-    public final static short SCREENLAYOUT_LAYOUTDIR_LTR = 0x40;
-    public final static short SCREENLAYOUT_LAYOUTDIR_RTL = 0x80;
-    public final static short SCREENLAYOUT_LAYOUTDIR_SHIFT = 0x06;
-
-    public final static short MASK_SCREENROUND = 0x03;
-    public final static short SCREENLAYOUT_ROUND_ANY = 0;
-    public final static short SCREENLAYOUT_ROUND_NO = 0x1;
-    public final static short SCREENLAYOUT_ROUND_YES = 0x2;
-
-    public final static byte KEYBOARD_ANY = 0;
-    public final static byte KEYBOARD_NOKEYS = 1;
-    public final static byte KEYBOARD_QWERTY = 2;
-    public final static byte KEYBOARD_12KEY = 3;
-
-    public final static byte NAVIGATION_ANY = 0;
-    public final static byte NAVIGATION_NONAV = 1;
-    public final static byte NAVIGATION_DPAD = 2;
-    public final static byte NAVIGATION_TRACKBALL = 3;
-    public final static byte NAVIGATION_WHEEL = 4;
-
-    public final static byte MASK_KEYSHIDDEN = 0x3;
-    public final static byte KEYSHIDDEN_ANY = 0x0;
-    public final static byte KEYSHIDDEN_NO = 0x1;
-    public final static byte KEYSHIDDEN_YES = 0x2;
-    public final static byte KEYSHIDDEN_SOFT = 0x3;
-
-    public final static byte MASK_NAVHIDDEN = 0xc;
-    public final static byte NAVHIDDEN_ANY = 0x0;
-    public final static byte NAVHIDDEN_NO = 0x4;
-    public final static byte NAVHIDDEN_YES = 0x8;
-
-    public final static byte MASK_SCREENSIZE = 0x0f;
-    public final static byte SCREENSIZE_ANY = 0x00;
-    public final static byte SCREENSIZE_SMALL = 0x01;
-    public final static byte SCREENSIZE_NORMAL = 0x02;
-    public final static byte SCREENSIZE_LARGE = 0x03;
-    public final static byte SCREENSIZE_XLARGE = 0x04;
-
-    public final static byte MASK_SCREENLONG = 0x30;
-    public final static byte SCREENLONG_ANY = 0x00;
-    public final static byte SCREENLONG_NO = 0x10;
-    public final static byte SCREENLONG_YES = 0x20;
-
-    public final static byte MASK_UI_MODE_TYPE = 0x0f;
-    public final static byte UI_MODE_TYPE_ANY = 0x00;
-    public final static byte UI_MODE_TYPE_NORMAL = 0x01;
-    public final static byte UI_MODE_TYPE_DESK = 0x02;
-    public final static byte UI_MODE_TYPE_CAR = 0x03;
-    public final static byte UI_MODE_TYPE_TELEVISION = 0x04;
-    public final static byte UI_MODE_TYPE_APPLIANCE = 0x05;
-    public final static byte UI_MODE_TYPE_WATCH = 0x06;
-    public final static byte UI_MODE_TYPE_VR_HEADSET = 0x07;
-
-    // start - miui
-    public final static byte UI_MODE_TYPE_GODZILLAUI = 0x0b;
-    public final static byte UI_MODE_TYPE_SMALLUI = 0x0c;
-    public final static byte UI_MODE_TYPE_MEDIUMUI = 0x0d;
-    public final static byte UI_MODE_TYPE_LARGEUI = 0x0e;
-    public final static byte UI_MODE_TYPE_HUGEUI = 0x0f;
-    // end - miui
-
-    public final static byte MASK_UI_MODE_NIGHT = 0x30;
-    public final static byte UI_MODE_NIGHT_ANY = 0x00;
-    public final static byte UI_MODE_NIGHT_NO = 0x10;
-    public final static byte UI_MODE_NIGHT_YES = 0x20;
-
-    public final static byte COLOR_HDR_MASK = 0xC;
-    public final static byte COLOR_HDR_NO = 0x4;
-    public final static byte COLOR_HDR_SHIFT = 0x2;
-    public final static byte COLOR_HDR_UNDEFINED = 0x0;
-    public final static byte COLOR_HDR_YES = 0x8;
-
-    public final static byte COLOR_UNDEFINED = 0x0;
-
-    public final static byte COLOR_WIDE_UNDEFINED = 0x0;
-    public final static byte COLOR_WIDE_NO = 0x1;
-    public final static byte COLOR_WIDE_YES = 0x2;
-    public final static byte COLOR_WIDE_MASK = 0x3;
-
-   }
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResID.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResID.java
deleted file mode 100644
index 783ece1..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResID.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import androidx.annotation.NonNull;
-
-public class ResID {
-    public final int package_;
-    public final int type;
-    public final int entry;
-
-    public final int id;
-
-    public ResID(int package_, int type, int entry) {
-        this(package_, type, entry, (package_ << 24) + (type << 16) + entry);
-    }
-
-    public ResID(int id) {
-        this((id >> 24) & 0xff, (id >> 16) & 0x000000ff, id & 0x0000ffff, id);
-    }
-
-    public ResID(int package_, int type, int entry, int id) {
-        this.package_ = (package_ == 0) ? 2 : package_;
-        this.type = type;
-        this.entry = entry;
-        this.id = id;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return String.format("0x%08x", id);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 17;
-        hash = 31 * hash + this.id;
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ResID other = (ResID) obj;
-        return this.id == other.id;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResPackage.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResPackage.java
deleted file mode 100644
index 63482e2..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResPackage.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-import brut.androlib.res.data.value.ResFileValue;
-import brut.androlib.res.data.value.ResValueFactory;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.util.Duo;
-
-public class ResPackage {
-    private final ResTable mResTable;
-    private final int mId;
-    private final String mName;
-    private final Map<ResID, ResResSpec> mResSpecs = new LinkedHashMap<>();
-    private final Map<ResConfigFlags, ResType> mConfigs = new LinkedHashMap<>();
-    private final Map<String, ResTypeSpec> mTypes = new LinkedHashMap<>();
-    private final Set<ResID> mSynthesizedRes = new HashSet<>();
-
-    private ResValueFactory mValueFactory;
-
-    public ResPackage(ResTable resTable, int id, String name) {
-        this.mResTable = resTable;
-        this.mId = id;
-        this.mName = name;
-    }
-
-    public List<ResResSpec> listResSpecs() {
-        return new ArrayList<>(mResSpecs.values());
-    }
-
-    public boolean hasResSpec(ResID resID) {
-        return mResSpecs.containsKey(resID);
-    }
-
-    public ResResSpec getResSpec(ResID resID) throws UndefinedResObjectException {
-        ResResSpec spec = mResSpecs.get(resID);
-        if (spec == null) {
-            throw new UndefinedResObjectException("resource spec: " + resID.toString());
-        }
-        return spec;
-    }
-
-    public int getResSpecCount() {
-        return mResSpecs.size();
-    }
-
-    public ResType getOrCreateConfig(ResConfigFlags flags) {
-        ResType config = mConfigs.get(flags);
-        if (config == null) {
-            config = new ResType(flags);
-            mConfigs.put(flags, config);
-        }
-        return config;
-    }
-
-    public ResTypeSpec getType(String typeName) throws AndrolibException {
-        ResTypeSpec type = mTypes.get(typeName);
-        if (type == null) {
-            throw new UndefinedResObjectException("type: " + typeName);
-        }
-        return type;
-    }
-
-    public Set<ResResource> listFiles() {
-        Set<ResResource> ret = new HashSet<>();
-        for (ResResSpec spec : mResSpecs.values()) {
-            for (ResResource res : spec.listResources()) {
-                if (res.getValue() instanceof ResFileValue) {
-                    ret.add(res);
-                }
-            }
-        }
-        return ret;
-    }
-
-    public Collection<ResValuesFile> listValuesFiles() {
-        Map<Duo<ResTypeSpec, ResType>, ResValuesFile> ret = new HashMap<>();
-        for (ResResSpec spec : mResSpecs.values()) {
-            for (ResResource res : spec.listResources()) {
-                if (res.getValue() instanceof ResValuesXmlSerializable) {
-                    ResTypeSpec type = res.getResSpec().getType();
-                    ResType config = res.getConfig();
-                    Duo<ResTypeSpec, ResType> key = new Duo<>(type, config);
-                    ResValuesFile values = ret.get(key);
-                    if (values == null) {
-                        values = new ResValuesFile(this, type, config);
-                        ret.put(key, values);
-                    }
-                    values.addResource(res);
-                }
-            }
-        }
-        return ret.values();
-    }
-
-    public ResTable getResTable() {
-        return mResTable;
-    }
-
-    public int getId() {
-        return mId;
-    }
-
-    public String getName() {
-        return mName;
-    }
-
-    boolean isSynthesized(ResID resId) {
-        return mSynthesizedRes.contains(resId);
-    }
-
-    public void removeResSpec(ResResSpec spec) {
-        mResSpecs.remove(spec.getId());
-    }
-
-    public void addResSpec(ResResSpec spec) throws AndrolibException {
-        if (mResSpecs.put(spec.getId(), spec) != null) {
-            throw new AndrolibException("Multiple resource specs: " + spec);
-        }
-    }
-
-    public void addType(ResTypeSpec type) {
-        if (mTypes.containsKey(type.getName())) {
-            LOGGER.warning("Multiple types detected! " + type + " ignored!");
-        } else {
-            mTypes.put(type.getName(), type);
-        }
-    }
-
-    public void addSynthesizedRes(int resId) {
-        mSynthesizedRes.add(new ResID(resId));
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return mName;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ResPackage other = (ResPackage) obj;
-        if (!Objects.equals(this.mResTable, other.mResTable)) {
-            return false;
-        }
-        return this.mId == other.mId;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 17;
-        hash = 31 * hash + (this.mResTable != null ? this.mResTable.hashCode() : 0);
-        hash = 31 * hash + this.mId;
-        return hash;
-    }
-
-    public ResValueFactory getValueFactory() {
-        if (mValueFactory == null) {
-            mValueFactory = new ResValueFactory(this);
-        }
-        return mValueFactory;
-    }
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResResSpec.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResResSpec.java
deleted file mode 100644
index 6561c58..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResResSpec.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import androidx.annotation.NonNull;
-
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-
-public class ResResSpec {
-    private final ResID mId;
-    private final String mName;
-    private final ResPackage mPackage;
-    private final ResTypeSpec mType;
-    private final Map<ResConfigFlags, ResResource> mResources = new LinkedHashMap<>();
-    private static final Set<String> EMPTY_RESOURCE_NAMES = Set.of("0_resource_name_obfuscated", "(name removed)");
-
-    public ResResSpec(ResID id, String name, ResPackage pkg, ResTypeSpec type) {
-        this.mId = id;
-        String cleanName;
-
-        name = EMPTY_RESOURCE_NAMES.contains(name) ? null : name;
-
-        ResResSpec resResSpec = type.getResSpecUnsafe(name);
-        if (resResSpec != null) {
-            cleanName = String.format("APKTOOL_DUPLICATE_%s_%s", type, id.toString());
-        } else {
-            cleanName = ((name == null || name.isEmpty()) ? ("APKTOOL_DUMMYVAL_" + id.toString()) : name);
-        }
-
-        this.mName = cleanName;
-        this.mPackage = pkg;
-        this.mType = type;
-    }
-
-    public Set<ResResource> listResources() {
-        return new LinkedHashSet<>(mResources.values());
-    }
-
-    public ResResource getResource(ResType config) throws AndrolibException {
-        return getResource(config.getFlags());
-    }
-
-    public ResResource getResource(ResConfigFlags config) throws AndrolibException {
-        ResResource res = mResources.get(config);
-        if (res == null) {
-            throw new UndefinedResObjectException(String.format("resource: spec=%s, config=%s", this, config));
-        }
-        return res;
-    }
-
-    public ResResource getDefaultResource() throws AndrolibException {
-        return getResource(new ResConfigFlags());
-    }
-
-    public boolean hasDefaultResource() {
-        return mResources.containsKey(new ResConfigFlags());
-    }
-
-    public String getFullName(ResPackage relativeToPackage, boolean excludeType) {
-        return getFullName(getPackage().equals(relativeToPackage), excludeType);
-    }
-
-    public String getFullName(boolean excludePackage, boolean excludeType) {
-        return (excludePackage ? "" : getPackage().getName() + ":")
-                + (excludeType ? "" : getType().getName() + "/") + getName();
-    }
-
-    public ResID getId() {
-        return mId;
-    }
-
-    public String getName() {
-        return mName.replace("\"", "q");
-    }
-
-    public ResPackage getPackage() {
-        return mPackage;
-    }
-
-    public ResTypeSpec getType() {
-        return mType;
-    }
-
-    public boolean isDummyResSpec() {
-        return getName().startsWith("APKTOOL_DUMMY_");
-    }
-
-    public void addResource(ResResource res) throws AndrolibException {
-        addResource(res, false);
-    }
-
-    public void addResource(ResResource res, boolean overwrite) throws AndrolibException {
-        ResConfigFlags flags = res.getConfig().getFlags();
-        if (mResources.put(flags, res) != null && !overwrite) {
-            throw new AndrolibException(String.format("Multiple resources: spec=%s, config=%s", this, flags));
-        }
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return mId.toString() + " " + mType.toString() + "/" + mName;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResResource.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResResource.java
deleted file mode 100644
index 2138476..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResResource.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import androidx.annotation.NonNull;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.value.ResValue;
-
-public class ResResource {
-    private final ResType mConfig;
-    private final ResResSpec mResSpec;
-    private final ResValue mValue;
-
-    public ResResource(ResType config, ResResSpec spec, ResValue value) {
-        this.mConfig = config;
-        this.mResSpec = spec;
-        this.mValue = value;
-    }
-
-    public String getFilePath() {
-        return mResSpec.getType().getName() + mConfig.getFlags().getQualifiers() + "/" + mResSpec.getName();
-    }
-
-    public ResType getConfig() {
-        return mConfig;
-    }
-
-    public ResResSpec getResSpec() {
-        return mResSpec;
-    }
-
-    public ResValue getValue() {
-        return mValue;
-    }
-
-    public void replace(ResValue value) throws AndrolibException {
-        ResResource res = new ResResource(mConfig, mResSpec, value);
-        mConfig.addResource(res, true);
-        mResSpec.addResource(res, true);
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return getFilePath();
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResTable.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResTable.java
deleted file mode 100644
index 8453632..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResTable.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import com.google.common.base.Strings;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-import brut.androlib.meta.MetaInfo;
-import brut.androlib.meta.PackageInfo;
-import brut.androlib.meta.UsesFramework;
-import brut.androlib.meta.VersionInfo;
-import brut.androlib.res.AndrolibResources;
-import brut.androlib.res.data.value.ResValue;
-import brut.androlib.res.xml.ResXmlPatcher;
-
-public class ResTable {
-    private final AndrolibResources mAndRes;
-
-    private final Map<Integer, ResPackage> mPackagesById = new HashMap<>();
-    private final Map<String, ResPackage> mPackagesByName = new HashMap<>();
-    private final Set<ResPackage> mMainPackages = new LinkedHashSet<>();
-    private final Set<ResPackage> mFramePackages = new LinkedHashSet<>();
-
-    private String mPackageRenamed;
-    private String mPackageOriginal;
-    private int mPackageId;
-    private boolean mAnalysisMode = false;
-    private boolean mSharedLibrary = false;
-    private boolean mSparseResources = false;
-
-    private final Map<String, String> mSdkInfo = new LinkedHashMap<>();
-    private final VersionInfo mVersionInfo = new VersionInfo();
-
-    public ResTable() {
-        mAndRes = null;
-    }
-
-    public ResTable(AndrolibResources andRes) {
-        mAndRes = andRes;
-    }
-
-    public ResResSpec getResSpec(int resID) throws AndrolibException {
-        // The pkgId is 0x00. That means a shared library is using its
-        // own resource, so lie to the caller replacing with its own
-        // packageId
-        if (resID >> 24 == 0) {
-            int pkgId = (mPackageId == 0 ? 2 : mPackageId);
-            resID = (0xFF000000 & (pkgId << 24)) | resID;
-        }
-        return getResSpec(new ResID(resID));
-    }
-
-    public ResResSpec getResSpec(ResID resID) throws AndrolibException {
-        return getPackage(resID.package_).getResSpec(resID);
-    }
-
-    public Set<ResPackage> listMainPackages() {
-        return mMainPackages;
-    }
-
-    public Set<ResPackage> listFramePackages() {
-        return mFramePackages;
-    }
-
-    public ResPackage getPackage(int id) throws AndrolibException {
-        ResPackage pkg = mPackagesById.get(id);
-        if (pkg != null) {
-            return pkg;
-        }
-        if (mAndRes != null) {
-            return mAndRes.loadFrameworkPkg(this, id);
-        }
-        throw new UndefinedResObjectException(String.format("package: id=%d", id));
-    }
-
-    public ResPackage getHighestSpecPackage() throws AndrolibException {
-        int id = 0;
-        int value = 0;
-        for (ResPackage resPackage : mPackagesById.values()) {
-            if (resPackage.getResSpecCount() > value && !resPackage.getName().equalsIgnoreCase("android")) {
-                value = resPackage.getResSpecCount();
-                id = resPackage.getId();
-            }
-        }
-        // if id is still 0, we only have one pkgId which is "android" -> 1
-        return (id == 0) ? getPackage(1) : getPackage(id);
-    }
-
-    public ResPackage getCurrentResPackage() throws AndrolibException {
-        ResPackage pkg = mPackagesById.get(mPackageId);
-
-        if (pkg != null) {
-            return pkg;
-        } else {
-            if (mMainPackages.size() == 1) {
-                return mMainPackages.iterator().next();
-            }
-            return getHighestSpecPackage();
-        }
-    }
-
-    public ResPackage getPackage(String name) throws AndrolibException {
-        ResPackage pkg = mPackagesByName.get(name);
-        if (pkg == null) {
-            throw new UndefinedResObjectException("package: name=" + name);
-        }
-        return pkg;
-    }
-
-    public ResValue getValue(String package_, String type, String name) throws AndrolibException {
-        return getPackage(package_).getType(type).getResSpec(name).getDefaultResource().getValue();
-    }
-
-    public void addPackage(ResPackage pkg, boolean main) throws AndrolibException {
-        Integer id = pkg.getId();
-        if (mPackagesById.containsKey(id)) {
-            throw new AndrolibException("Multiple packages: id=" + id);
-        }
-        String name = pkg.getName();
-        if (mPackagesByName.containsKey(name)) {
-            throw new AndrolibException("Multiple packages: name=" + name);
-        }
-
-        mPackagesById.put(id, pkg);
-        mPackagesByName.put(name, pkg);
-        if (main) {
-            mMainPackages.add(pkg);
-        } else {
-            mFramePackages.add(pkg);
-        }
-    }
-
-    public void setAnalysisMode(boolean mode) {
-        mAnalysisMode = mode;
-    }
-
-    public void setPackageRenamed(String pkg) {
-        mPackageRenamed = pkg;
-    }
-
-    public void setPackageOriginal(String pkg) {
-        mPackageOriginal = pkg;
-    }
-
-    public void setPackageId(int id) {
-        mPackageId = id;
-    }
-
-    public void setSharedLibrary(boolean flag) {
-        mSharedLibrary = flag;
-    }
-
-    public void setSparseResources(boolean flag) {
-        mSparseResources = flag;
-    }
-
-    public void clearSdkInfo() {
-        mSdkInfo.clear();
-    }
-
-    public void addSdkInfo(String key, String value) {
-        mSdkInfo.put(key, value);
-    }
-
-    public void setVersionName(String versionName) {
-        mVersionInfo.versionName = versionName;
-    }
-
-    public void setVersionCode(String versionCode) {
-        mVersionInfo.versionCode = versionCode;
-    }
-
-    public VersionInfo getVersionInfo() {
-        return mVersionInfo;
-    }
-
-    public Map<String, String> getSdkInfo() {
-        return mSdkInfo;
-    }
-
-    public boolean getAnalysisMode() {
-        return mAnalysisMode;
-    }
-
-    public String getPackageRenamed() {
-        return mPackageRenamed;
-    }
-
-    public String getPackageOriginal() {
-        return mPackageOriginal;
-    }
-
-    public int getPackageId() {
-        return mPackageId;
-    }
-
-    public boolean getSharedLibrary() {
-        return mSharedLibrary;
-    }
-
-    public boolean getSparseResources() {
-        return mSparseResources;
-    }
-
-    public boolean isFrameworkApk() {
-        for (ResPackage pkg : listMainPackages()) {
-            if (pkg.getId() > 0 && pkg.getId() < 64) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void initMetaInfo(MetaInfo meta, File outDir) throws AndrolibException {
-        meta.isFrameworkApk = isFrameworkApk();
-        if (!listFramePackages().isEmpty()) {
-            meta.usesFramework = getUsesFramework();
-        }
-        if (!getSdkInfo().isEmpty()) {
-            initSdkInfo(outDir);
-            meta.sdkInfo = getSdkInfo();
-        }
-        meta.packageInfo = getPackageInfo();
-        meta.versionInfo = getVersionInfoWithName(outDir);
-        meta.sharedLibrary = getSharedLibrary();
-        meta.sparseResources = getSparseResources();
-    }
-
-    private UsesFramework getUsesFramework() {
-        Set<ResPackage> pkgs = listFramePackages();
-
-        Integer[] ids = new Integer[pkgs.size()];
-        int i = 0;
-        for (ResPackage pkg : pkgs) {
-            ids[i++] = pkg.getId();
-        }
-        Arrays.sort(ids);
-
-        UsesFramework info = new UsesFramework();
-        info.ids = Arrays.asList(ids);
-
-        return info;
-    }
-
-    private void initSdkInfo(File outDir) {
-        Map<String, String> info = mSdkInfo;
-        String refValue;
-        if (info.get("minSdkVersion") != null) {
-            refValue = ResXmlPatcher.pullValueFromIntegers(outDir, info.get("minSdkVersion"));
-            if (refValue != null) {
-                info.put("minSdkVersion", refValue);
-            }
-        }
-        if (info.get("targetSdkVersion") != null) {
-            refValue = ResXmlPatcher.pullValueFromIntegers(outDir, info.get("targetSdkVersion"));
-            if (refValue != null) {
-                info.put("targetSdkVersion", refValue);
-            }
-        }
-        if (info.get("maxSdkVersion") != null) {
-            refValue = ResXmlPatcher.pullValueFromIntegers(outDir, info.get("maxSdkVersion"));
-            if (refValue != null) {
-                info.put("maxSdkVersion", refValue);
-            }
-        }
-    }
-
-    private PackageInfo getPackageInfo() throws AndrolibException {
-        String renamed = getPackageRenamed();
-        String original = getPackageOriginal();
-
-        int id = getPackageId();
-        try {
-            id = getPackage(renamed).getId();
-        } catch (UndefinedResObjectException ignored) {}
-
-        if (Strings.isNullOrEmpty(original)) {
-            return null;
-        }
-
-        PackageInfo info  = new PackageInfo();
-
-        // only put rename-manifest-package into apktool.yml, if the change will be required
-        if (!renamed.equalsIgnoreCase(original)) {
-            info.renameManifestPackage = renamed;
-        }
-        info.forcedPackageId = String.valueOf(id);
-        return info;
-    }
-
-    private VersionInfo getVersionInfoWithName(File outDir) {
-        VersionInfo info = getVersionInfo();
-        String refValue = ResXmlPatcher.pullValueFromStrings(outDir, info.versionName);
-        if (refValue != null) {
-            info.versionName = refValue;
-        }
-        return info;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResType.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResType.java
deleted file mode 100644
index ccaf24d..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import androidx.annotation.NonNull;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-
-public class ResType {
-    private final ResConfigFlags mFlags;
-    private final Map<ResResSpec, ResResource> mResources = new LinkedHashMap<>();
-
-    public ResType(ResConfigFlags flags) {
-        this.mFlags = flags;
-    }
-
-    public ResResource getResource(ResResSpec spec) throws AndrolibException {
-        ResResource res = mResources.get(spec);
-        if (res == null) {
-            throw new UndefinedResObjectException(String.format("resource: spec=%s, config=%s", spec, this));
-        }
-        return res;
-    }
-
-    public ResConfigFlags getFlags() {
-        return mFlags;
-    }
-
-    public void addResource(ResResource res) throws AndrolibException {
-        addResource(res, false);
-    }
-
-    public void addResource(ResResource res, boolean overwrite) throws AndrolibException {
-        ResResSpec spec = res.getResSpec();
-        if (mResources.put(spec, res) != null && !overwrite) {
-            throw new AndrolibException(String.format("Multiple resources: spec=%s, config=%s", spec, this));
-        }
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return mFlags.toString();
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResTypeSpec.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResTypeSpec.java
deleted file mode 100644
index c6e334b..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResTypeSpec.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import androidx.annotation.NonNull;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-
-public final class ResTypeSpec {
-
-    public static final String RES_TYPE_NAME_ARRAY = "array";
-    public static final String RES_TYPE_NAME_PLURALS = "plurals";
-    public static final String RES_TYPE_NAME_STYLES = "style";
-    public static final String RES_TYPE_NAME_ATTR = "attr";
-
-    private final String mName;
-    private final Map<String, ResResSpec> mResSpecs = new LinkedHashMap<>();
-
-    private final ResTable mResTable;
-    private final ResPackage mPackage;
-
-    private final int mId;
-    private final int mEntryCount;
-
-    public ResTypeSpec(String name, ResTable resTable, ResPackage package_, int id, int entryCount) {
-        this.mName = name;
-        this.mResTable = resTable;
-        this.mPackage = package_;
-        this.mId = id;
-        this.mEntryCount = entryCount;
-    }
-
-    public String getName() {
-        return mName;
-    }
-
-    public int getId() {
-        return mId;
-    }
-
-    public boolean isString() {
-        return mName.equalsIgnoreCase("string");
-    }
-
-    public ResResSpec getResSpec(String name) throws AndrolibException {
-        ResResSpec spec = getResSpecUnsafe(name);
-        if (spec == null) {
-            throw new UndefinedResObjectException(String.format("resource spec: %s/%s", getName(), name));
-        }
-        return spec;
-    }
-
-    public ResResSpec getResSpecUnsafe(String name) {
-        return mResSpecs.get(name);
-    }
-
-    public void removeResSpec(ResResSpec spec) {
-        mResSpecs.remove(spec.getName());
-    }
-
-    public void addResSpec(ResResSpec spec) throws AndrolibException {
-        if (mResSpecs.put(spec.getName(), spec) != null) {
-            throw new AndrolibException(String.format("Multiple res specs: %s/%s", getName(), spec.getName()));
-        }
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return mName;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java
deleted file mode 100644
index f95c3d7..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class ResUnknownFiles {
-
-    private final Map<String, String> mUnknownFiles = new LinkedHashMap<>();
-
-    public void addUnknownFileInfo(String file, String value) {
-        mUnknownFiles.put(file, value);
-    }
-
-    public Map<String, String> getUnknownFiles() {
-        return mUnknownFiles;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/ResValuesFile.java b/apktool/androlib/src/main/java/brut/androlib/res/data/ResValuesFile.java
deleted file mode 100644
index dc860fb..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/ResValuesFile.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data;
-
-import java.util.LinkedHashSet;
-import java.util.Objects;
-import java.util.Set;
-
-public class ResValuesFile {
-    private final ResPackage mPackage;
-    private final ResTypeSpec mType;
-    private final ResType mConfig;
-    private final Set<ResResource> mResources = new LinkedHashSet<>();
-
-    public ResValuesFile(ResPackage pkg, ResTypeSpec type, ResType config) {
-        this.mPackage = pkg;
-        this.mType = type;
-        this.mConfig = config;
-    }
-
-    public String getPath() {
-        return "values" + mConfig.getFlags().getQualifiers() + "/"
-                + mType.getName() + (mType.getName().endsWith("s") ? "" : "s")
-                + ".xml";
-    }
-
-    public Set<ResResource> listResources() {
-        return mResources;
-    }
-
-    public ResTypeSpec getType() {
-        return mType;
-    }
-
-    public boolean isSynthesized(ResResource res) {
-        return mPackage.isSynthesized(res.getResSpec().getId());
-    }
-
-    public void addResource(ResResource res) {
-        mResources.add(res);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ResValuesFile other = (ResValuesFile) obj;
-        if (!Objects.equals(this.mType, other.mType)) {
-            return false;
-        }
-        return Objects.equals(this.mConfig, other.mConfig);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 17;
-        hash = 31 * hash + (this.mType != null ? this.mType.hashCode() : 0);
-        hash = 31 * hash + (this.mConfig != null ? this.mConfig.hashCode() : 0);
-        return hash;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
deleted file mode 100644
index 382e799..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.util.Duo;
-
-public class ResArrayValue extends ResBagValue implements
-        ResValuesXmlSerializable {
-
-    ResArrayValue(ResReferenceValue parent, Duo<Integer, ResScalarValue>[] items) {
-        super(parent);
-
-        mItems = new ResScalarValue[items.length];
-        for (int i = 0; i < items.length; i++) {
-            mItems[i] = items[i].m2;
-        }
-    }
-
-    public ResArrayValue(ResReferenceValue parent, ResScalarValue[] items) {
-        super(parent);
-        mItems = items;
-    }
-
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer,
-                                        ResResource res) throws IOException, AndrolibException {
-        String type = getType();
-        type = (type == null ? "" : type + "-") + "array";
-        serializer.startTag(null, type);
-        serializer.attribute(null, "name", res.getResSpec().getName());
-
-        // lets check if we need to add formatted="false" to this array
-        for (ResScalarValue item : mItems) {
-            if (item.hasMultipleNonPositionalSubstitutions()) {
-                serializer.attribute(null, "formatted", "false");
-                break;
-            }
-        }
-
-        // add <item>'s
-        for (ResScalarValue mItem : mItems) {
-            serializer.startTag(null, "item");
-            serializer.text(mItem.encodeAsResXmlNonEscapedItemValue());
-            serializer.endTag(null, "item");
-        }
-        serializer.endTag(null, type);
-    }
-
-    public String getType() throws AndrolibException {
-        if (mItems.length == 0) {
-            return null;
-        }
-        String type = mItems[0].getType();
-        for (ResScalarValue mItem : mItems) {
-            if (mItem.encodeAsResXmlItemValue().startsWith("@string")) {
-                return "string";
-            } else if (mItem.encodeAsResXmlItemValue().startsWith("@drawable")) {
-                return null;
-            } else if (mItem.encodeAsResXmlItemValue().startsWith("@integer")) {
-                return "integer";
-            } else if (!"string".equals(type) && !"integer".equals(type)) {
-                return null;
-            } else if (!type.equals(mItem.getType())) {
-                return null;
-            }
-        }
-        if (!Arrays.asList(AllowedArrayTypes).contains(type)) {
-            return "string";
-        }
-        return type;
-    }
-
-    private final ResScalarValue[] mItems;
-    private final String[] AllowedArrayTypes = {"string", "integer"};
-
-    public static final int BAG_KEY_ARRAY_START = 0x02000000;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResAttr.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResAttr.java
deleted file mode 100644
index a307365..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResAttr.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResPackage;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.util.Duo;
-
-public class ResAttr extends ResBagValue implements ResValuesXmlSerializable {
-    ResAttr(ResReferenceValue parentVal, int type, Integer min, Integer max,
-            Boolean l10n) {
-        super(parentVal);
-        mType = type;
-        mMin = min;
-        mMax = max;
-        mL10n = l10n;
-    }
-
-    public String convertToResXmlFormat(ResScalarValue value) throws AndrolibException {
-        return null;
-    }
-
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer, ResResource res)
-        throws IOException, AndrolibException {
-        String type = getTypeAsString();
-
-        serializer.startTag(null, "attr");
-        serializer.attribute(null, "name", res.getResSpec().getName());
-        if (type != null) {
-            serializer.attribute(null, "format", type);
-        }
-        if (mMin != null) {
-            serializer.attribute(null, "min", mMin.toString());
-        }
-        if (mMax != null) {
-            serializer.attribute(null, "max", mMax.toString());
-        }
-        if (mL10n != null && mL10n) {
-            serializer.attribute(null, "localization", "suggested");
-        }
-        serializeBody(serializer, res);
-        serializer.endTag(null, "attr");
-    }
-
-    public static ResAttr factory(ResReferenceValue parent,
-                                  Duo<Integer, ResScalarValue>[] items, ResValueFactory factory,
-                                  ResPackage pkg) throws AndrolibException {
-
-        int type = ((ResIntValue) items[0].m2).getValue();
-        int scalarType = type & 0xffff;
-        Integer min = null, max = null;
-        Boolean l10n = null;
-        int i;
-        for (i = 1; i < items.length; i++) {
-            switch (items[i].m1) {
-                case BAG_KEY_ATTR_MIN:
-                    min = ((ResIntValue) items[i].m2).getValue();
-                    continue;
-                case BAG_KEY_ATTR_MAX:
-                    max = ((ResIntValue) items[i].m2).getValue();
-                    continue;
-                case BAG_KEY_ATTR_L10N:
-                    l10n = ((ResIntValue) items[i].m2).getValue() != 0;
-                    continue;
-            }
-            break;
-        }
-
-        if (i == items.length) {
-            return new ResAttr(parent, scalarType, min, max, l10n);
-        }
-        Duo<ResReferenceValue, ResIntValue>[] attrItems = new Duo[items.length - i];
-        int j = 0;
-        for (; i < items.length; i++) {
-            int resId = items[i].m1;
-            pkg.addSynthesizedRes(resId);
-            attrItems[j++] = new Duo<>(factory.newReference(resId, null), (ResIntValue) items[i].m2);
-        }
-        switch (type & 0xff0000) {
-            case TYPE_ENUM:
-                return new ResEnumAttr(parent, scalarType, min, max, l10n, attrItems);
-            case TYPE_FLAGS:
-                return new ResFlagsAttr(parent, scalarType, min, max, l10n, attrItems);
-        }
-
-        throw new AndrolibException("Could not decode attr value");
-    }
-
-    protected void serializeBody(XmlSerializer serializer, ResResource res) throws AndrolibException, IOException {
-    }
-
-    protected String getTypeAsString() {
-        String s = "";
-        if ((mType & TYPE_REFERENCE) != 0) {
-            s += "|reference";
-        }
-        if ((mType & TYPE_STRING) != 0) {
-            s += "|string";
-        }
-        if ((mType & TYPE_INT) != 0) {
-            s += "|integer";
-        }
-        if ((mType & TYPE_BOOL) != 0) {
-            s += "|boolean";
-        }
-        if ((mType & TYPE_COLOR) != 0) {
-            s += "|color";
-        }
-        if ((mType & TYPE_FLOAT) != 0) {
-            s += "|float";
-        }
-        if ((mType & TYPE_DIMEN) != 0) {
-            s += "|dimension";
-        }
-        if ((mType & TYPE_FRACTION) != 0) {
-            s += "|fraction";
-        }
-        if (s.isEmpty()) {
-            return null;
-        }
-        return s.substring(1);
-    }
-
-    private final int mType;
-    private final Integer mMin;
-    private final Integer mMax;
-    private final Boolean mL10n;
-
-    public static final int BAG_KEY_ATTR_TYPE = 0x01000000;
-    private static final int BAG_KEY_ATTR_MIN = 0x01000001;
-    private static final int BAG_KEY_ATTR_MAX = 0x01000002;
-    private static final int BAG_KEY_ATTR_L10N = 0x01000003;
-
-    private final static int TYPE_REFERENCE = 0x01;
-    private final static int TYPE_STRING = 0x02;
-    private final static int TYPE_INT = 0x04;
-    private final static int TYPE_BOOL = 0x08;
-    private final static int TYPE_COLOR = 0x10;
-    private final static int TYPE_FLOAT = 0x20;
-    private final static int TYPE_DIMEN = 0x40;
-    private final static int TYPE_FRACTION = 0x80;
-    private final static int TYPE_ANY_STRING = 0xee;
-
-    private static final int TYPE_ENUM = 0x00010000;
-    private static final int TYPE_FLAGS = 0x00020000;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResBagValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResBagValue.java
deleted file mode 100644
index f30cb28..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResBagValue.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.util.Duo;
-
-public class ResBagValue extends ResValue implements ResValuesXmlSerializable {
-    protected final ResReferenceValue mParent;
-
-    public ResBagValue(ResReferenceValue parent) {
-        this.mParent = parent;
-    }
-
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer,
-                                        ResResource res) throws IOException, AndrolibException {
-        String type = res.getResSpec().getType().getName();
-        if ("style".equals(type)) {
-            new ResStyleValue(mParent, new Duo[0], null)
-                    .serializeToResValuesXml(serializer, res);
-            return;
-        }
-        if ("array".equals(type)) {
-            new ResArrayValue(mParent, new Duo[0]).serializeToResValuesXml(
-                    serializer, res);
-            return;
-        }
-        if ("plurals".equals(type)) {
-            new ResPluralsValue(mParent, new Duo[0]).serializeToResValuesXml(
-                    serializer, res);
-            return;
-        }
-
-        serializer.startTag(null, "item");
-        serializer.attribute(null, "type", type);
-        serializer.attribute(null, "name", res.getResSpec().getName());
-        serializer.endTag(null, "item");
-    }
-
-    public ResReferenceValue getParent() {
-        return mParent;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java
deleted file mode 100644
index 831d422..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-public class ResBoolValue extends ResScalarValue {
-    private final boolean mValue;
-
-    public ResBoolValue(boolean value, int rawIntValue, String rawValue) {
-        super("bool", rawIntValue, rawValue);
-        this.mValue = value;
-    }
-
-    public boolean getValue() {
-        return mValue;
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        return mValue ? "true" : "false";
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResColorValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResColorValue.java
deleted file mode 100644
index bbee5ff..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResColorValue.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-public class ResColorValue extends ResIntValue {
-    public ResColorValue(int value, String rawValue) {
-        super(value, rawValue, "color");
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        return String.format("#%08x", mValue);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java
deleted file mode 100644
index 90bf0b3..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import brut.androlib.res.util.TypedValue;
-
-public class ResDimenValue extends ResIntValue {
-    public ResDimenValue(int value, String rawValue) {
-        super(value, rawValue, "dimen");
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        return TypedValue.coerceToString(TypedValue.TYPE_DIMENSION, mValue);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java
deleted file mode 100644
index 7ece13d..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-public class ResEmptyValue extends ResScalarValue {
-    protected final int mValue;
-    protected int type;
-
-    public ResEmptyValue(int value, String rawValue, int type) {
-        this(value, rawValue, "integer");
-        this.type = type;
-    }
-
-    public ResEmptyValue(int value, String rawValue, String type) {
-        super(type, value, rawValue);
-        if (value != 1)
-            throw new UnsupportedOperationException();
-        this.mValue = value;
-    }
-
-    public int getValue() {
-        return mValue;
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        return "@empty";
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java
deleted file mode 100644
index dc42158..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResSpec;
-import brut.androlib.res.data.ResResource;
-import brut.util.Duo;
-
-public class ResEnumAttr extends ResAttr {
-    ResEnumAttr(ResReferenceValue parent, int type, Integer min, Integer max,
-                Boolean l10n, Duo<ResReferenceValue, ResIntValue>[] items) {
-        super(parent, type, min, max, l10n);
-        mItems = items;
-    }
-
-    @Override
-    public String convertToResXmlFormat(ResScalarValue value)
-            throws AndrolibException {
-        if (value instanceof ResIntValue) {
-            String ret = decodeValue(((ResIntValue) value).getValue());
-            if (ret != null) {
-                return ret;
-            }
-        }
-        return super.convertToResXmlFormat(value);
-    }
-
-    @Override
-    protected void serializeBody(XmlSerializer serializer, ResResource res)
-            throws AndrolibException, IOException {
-        for (Duo<ResReferenceValue, ResIntValue> duo : mItems) {
-            int intVal = duo.m2.getValue();
-            ResResSpec m1Referent = duo.m1.getReferent();
-
-            serializer.startTag(null, "enum");
-            serializer.attribute(null, "name",
-                    m1Referent != null ? m1Referent.getName() : "@null"
-            );
-            serializer.attribute(null, "value", String.valueOf(intVal));
-            serializer.endTag(null, "enum");
-        }
-    }
-
-    private String decodeValue(int value) throws AndrolibException {
-        String value2 = mItemsCache.get(value);
-        if (value2 == null) {
-            ResReferenceValue ref = null;
-            for (Duo<ResReferenceValue, ResIntValue> duo : mItems) {
-                if (duo.m2.getValue() == value) {
-                    ref = duo.m1;
-                    break;
-                }
-            }
-            if (ref != null && !ref.referentIsNull()) {
-                value2 = ref.getReferent().getName();
-                mItemsCache.put(value, value2);
-            }
-        }
-        return value2;
-    }
-
-    private final Duo<ResReferenceValue, ResIntValue>[] mItems;
-    private final Map<Integer, String> mItemsCache = new HashMap<>();
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFileValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFileValue.java
deleted file mode 100644
index 6a5a845..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFileValue.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import androidx.annotation.NonNull;
-
-import brut.androlib.err.AndrolibException;
-
-public class ResFileValue extends ResIntBasedValue {
-    private final String mPath;
-
-    public ResFileValue(String path, int rawIntValue) {
-        super(rawIntValue);
-        this.mPath = path;
-    }
-
-    public String getStrippedPath() throws AndrolibException {
-        if (mPath.startsWith("res/")) {
-            return mPath.substring(4);
-        }
-        if (mPath.startsWith("r/") || mPath.startsWith("R/")) {
-            return mPath.substring(2);
-        }
-        throw new AndrolibException("File path does not start with \"res/\" or \"r/\": " + mPath);
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return mPath;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java
deleted file mode 100644
index 92cb750..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResource;
-import brut.util.Duo;
-
-public class ResFlagsAttr extends ResAttr {
-    ResFlagsAttr(ResReferenceValue parent, int type, Integer min, Integer max,
-                 Boolean l10n, Duo<ResReferenceValue, ResIntValue>[] items) {
-        super(parent, type, min, max, l10n);
-
-        mItems = new FlagItem[items.length];
-        for (int i = 0; i < items.length; i++) {
-            mItems[i] = new FlagItem(items[i].m1, items[i].m2.getValue());
-        }
-    }
-
-    @Override
-    public String convertToResXmlFormat(ResScalarValue value)
-            throws AndrolibException {
-        if(value instanceof ResReferenceValue) {
-            return value.encodeAsResXml();
-        }
-        if (!(value instanceof ResIntValue)) {
-            return super.convertToResXmlFormat(value);
-        }
-        loadFlags();
-        int intVal = ((ResIntValue) value).getValue();
-
-        if (intVal == 0) {
-            return renderFlags(mZeroFlags);
-        }
-
-        FlagItem[] flagItems = new FlagItem[mFlags.length];
-        int[] flags = new int[mFlags.length];
-        int flagsCount = 0;
-        for (FlagItem flagItem : mFlags) {
-            int flag = flagItem.flag;
-
-            if ((intVal & flag) != flag) {
-                continue;
-            }
-
-            if (!isSubpartOf(flag, flags)) {
-                flags[flagsCount] = flag;
-                flagItems[flagsCount++] = flagItem;
-            }
-        }
-        return renderFlags(Arrays.copyOf(flagItems, flagsCount));
-    }
-
-    @Override
-    protected void serializeBody(XmlSerializer serializer, ResResource res)
-            throws AndrolibException, IOException {
-        for (FlagItem item : mItems) {
-            serializer.startTag(null, "flag");
-            serializer.attribute(null, "name", item.getValue());
-            serializer.attribute(null, "value",
-                String.format("0x%08x", item.flag));
-            serializer.endTag(null, "flag");
-        }
-    }
-
-    private boolean isSubpartOf(int flag, int[] flags) {
-        for (int j : flags) {
-            if ((j & flag) == flag) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private String renderFlags(FlagItem[] flags) throws AndrolibException {
-        StringBuilder ret = new StringBuilder();
-        for (FlagItem flag : flags) {
-            ret.append("|").append(flag.getValue());
-        }
-        if (ret.length() == 0) {
-            return ret.toString();
-        }
-        return ret.substring(1);
-    }
-
-    private void loadFlags() {
-        if (mFlags != null) {
-            return;
-        }
-
-        FlagItem[] zeroFlags = new FlagItem[mItems.length];
-        int zeroFlagsCount = 0;
-        FlagItem[] flags = new FlagItem[mItems.length];
-        int flagsCount = 0;
-
-        for (FlagItem item : mItems) {
-            if (item.flag == 0) {
-                zeroFlags[zeroFlagsCount++] = item;
-            } else {
-                flags[flagsCount++] = item;
-            }
-        }
-
-        mZeroFlags = Arrays.copyOf(zeroFlags, zeroFlagsCount);
-        mFlags = Arrays.copyOf(flags, flagsCount);
-
-        Arrays.sort(mFlags, (o1, o2) -> Integer.compare(Integer.bitCount(o2.flag), Integer.bitCount(o1.flag)));
-    }
-
-    private final FlagItem[] mItems;
-
-    private FlagItem[] mZeroFlags;
-    private FlagItem[] mFlags;
-
-    private static class FlagItem {
-        public final ResReferenceValue ref;
-        public final int flag;
-        public String value;
-
-        public FlagItem(ResReferenceValue ref, int flag) {
-            this.ref = ref;
-            this.flag = flag;
-        }
-
-        public String getValue() throws AndrolibException {
-            if (value == null) {
-                if (ref.referentIsNull()) {
-                    return "@null";
-                }
-                value = ref.getReferent().getName();
-            }
-            return value;
-        }
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java
deleted file mode 100644
index b61f2cc..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-public class ResFloatValue extends ResScalarValue {
-    private final float mValue;
-
-    public ResFloatValue(float value, int rawIntValue, String rawValue) {
-        super("float", rawIntValue, rawValue);
-        this.mValue = value;
-    }
-
-    public float getValue() {
-        return mValue;
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        return String.valueOf(mValue);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java
deleted file mode 100644
index 375ae53..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import brut.androlib.res.util.TypedValue;
-
-public class ResFractionValue extends ResIntValue {
-    public ResFractionValue(int value, String rawValue) {
-        super(value, rawValue, "fraction");
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        return TypedValue.coerceToString(TypedValue.TYPE_FRACTION, mValue);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIdValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIdValue.java
deleted file mode 100644
index c84e2e2..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIdValue.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-
-public class ResIdValue extends ResValue implements ResValuesXmlSerializable {
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer, ResResource res) throws IOException {
-        serializer.startTag(null, "item");
-        serializer.attribute(null, "type", res.getResSpec().getType().getName());
-        serializer.attribute(null, "name", res.getResSpec().getName());
-        serializer.endTag(null, "item");
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIntBasedValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIntBasedValue.java
deleted file mode 100644
index de8557e..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIntBasedValue.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-public class ResIntBasedValue extends ResValue {
-    private final int mRawIntValue;
-
-    protected ResIntBasedValue(int rawIntValue) {
-        mRawIntValue = rawIntValue;
-    }
-
-    public int getRawIntValue() {
-        return mRawIntValue;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIntValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIntValue.java
deleted file mode 100644
index cd49204..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResIntValue.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.util.TypedValue;
-
-public class ResIntValue extends ResScalarValue {
-    protected final int mValue;
-    private int type;
-
-    public ResIntValue(int value, String rawValue, int type) {
-        this(value, rawValue, "integer");
-        this.type = type;
-    }
-
-    public ResIntValue(int value, String rawValue, String type) {
-        super(type, value, rawValue);
-        this.mValue = value;
-    }
-
-    public int getValue() {
-        return mValue;
-    }
-
-    @Override
-    protected String encodeAsResXml() throws AndrolibException {
-        return TypedValue.coerceToString(type, mValue);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
deleted file mode 100644
index d1f6826..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.androlib.res.xml.ResXmlEncoders;
-import brut.util.Duo;
-
-public class ResPluralsValue extends ResBagValue implements
-        ResValuesXmlSerializable {
-    ResPluralsValue(ResReferenceValue parent,
-                    Duo<Integer, ResScalarValue>[] items) {
-        super(parent);
-
-        mItems = new ResScalarValue[6];
-        for (Duo<Integer, ResScalarValue> item : items) {
-            mItems[item.m1 - BAG_KEY_PLURALS_START] = item.m2;
-        }
-    }
-
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer,
-                                        ResResource res) throws IOException, AndrolibException {
-        serializer.startTag(null, "plurals");
-        serializer.attribute(null, "name", res.getResSpec().getName());
-        for (int i = 0; i < mItems.length; i++) {
-            ResScalarValue item = mItems[i];
-            if (item == null) {
-                continue;
-            }
-
-            serializer.startTag(null, "item");
-            serializer.attribute(null, "quantity", QUANTITY_MAP[i]);
-            serializer.text(ResXmlEncoders.enumerateNonPositionalSubstitutionsIfRequired(item.encodeAsResXmlNonEscapedItemValue()));
-            serializer.endTag(null, "item");
-        }
-        serializer.endTag(null, "plurals");
-    }
-
-    private final ResScalarValue[] mItems;
-
-    public static final int BAG_KEY_PLURALS_START = 0x01000004;
-    public static final int BAG_KEY_PLURALS_END = 0x01000009;
-    private static final String[] QUANTITY_MAP = new String[] { "other", "zero", "one", "two", "few", "many" };
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java
deleted file mode 100644
index 8fd3c0d..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-import brut.androlib.res.data.ResPackage;
-import brut.androlib.res.data.ResResSpec;
-
-public class ResReferenceValue extends ResIntValue {
-    private final ResPackage mPackage;
-    private final boolean mTheme;
-
-    public ResReferenceValue(ResPackage package_, int value, String rawValue) {
-        this(package_, value, rawValue, false);
-    }
-
-    public ResReferenceValue(ResPackage package_, int value, String rawValue,
-                             boolean theme) {
-        super(value, rawValue, "reference");
-        mPackage = package_;
-        mTheme = theme;
-    }
-
-    @Override
-    protected String encodeAsResXml() throws AndrolibException {
-        if (isNull()) {
-            return "@null";
-        }
-
-        ResResSpec spec = getReferent();
-        if (spec == null) {
-            return "@null";
-        }
-        boolean newId = spec.hasDefaultResource() && spec.getDefaultResource().getValue() instanceof ResIdValue;
-
-        // generate the beginning to fix @android
-        String mStart = (mTheme ? '?' : '@') + (newId ? "+" : "");
-
-        return mStart + spec.getFullName(mPackage, mTheme && spec.getType().getName().equals("attr"));
-    }
-
-    public ResResSpec getReferent() throws AndrolibException {
-        try {
-            return mPackage.getResTable().getResSpec(getValue());
-        } catch (UndefinedResObjectException ex) {
-            return null;
-        }
-    }
-
-    public boolean isNull() {
-        return mValue == 0;
-    }
-
-    public boolean referentIsNull() throws AndrolibException {
-        return getReferent() == null;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
deleted file mode 100644
index f2c985a..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.androlib.res.xml.ResXmlEncodable;
-import brut.androlib.res.xml.ResXmlEncoders;
-
-public abstract class ResScalarValue extends ResIntBasedValue implements
-        ResXmlEncodable, ResValuesXmlSerializable {
-    protected final String mType;
-    protected final String mRawValue;
-
-    protected ResScalarValue(String type, int rawIntValue, String rawValue) {
-        super(rawIntValue);
-        mType = type;
-        mRawValue = rawValue;
-    }
-
-    @Override
-    public String encodeAsResXmlAttr() throws AndrolibException {
-        if (mRawValue != null) {
-            return mRawValue;
-        }
-        return encodeAsResXml();
-    }
-
-    public String encodeAsResXmlItemValue() throws AndrolibException {
-        return encodeAsResXmlValue();
-    }
-
-    @Override
-    public String encodeAsResXmlValue() throws AndrolibException {
-        if (mRawValue != null) {
-            return mRawValue;
-        }
-        return encodeAsResXml();
-    }
-
-    public String encodeAsResXmlNonEscapedItemValue() throws AndrolibException {
-        return encodeAsResXmlValue().replace("&amp;", "&").replace("&lt;","<");
-    }
-
-    public boolean hasMultipleNonPositionalSubstitutions() {
-        return ResXmlEncoders.hasMultipleNonPositionalSubstitutions(mRawValue);
-    }
-
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer,
-                                        ResResource res) throws IOException, AndrolibException {
-        String type = res.getResSpec().getType().getName();
-        boolean item = !"reference".equals(mType) && !type.equals(mType);
-
-        String body = encodeAsResXmlValue();
-
-        // check for resource reference
-        if (!type.equalsIgnoreCase("color")) {
-            if (body.contains("@")) {
-                if (!res.getFilePath().contains("string")) {
-                    item = true;
-                }
-            }
-        }
-
-        // Dummy attributes should be <item> with type attribute
-        if (res.getResSpec().isDummyResSpec()) {
-            item = true;
-        }
-
-        // Android does not allow values (false) for ids.xml anymore
-        // https://issuetracker.google.com/issues/80475496
-        // But it decodes as a ResBoolean, which makes no sense. So force it to empty
-        if (type.equalsIgnoreCase("id") && !body.isEmpty()) {
-            body = "";
-        }
-
-        // check for using attrib as node or item
-        String tagName = item ? "item" : type;
-
-        serializer.startTag(null, tagName);
-        if (item) {
-            serializer.attribute(null, "type", type);
-        }
-        serializer.attribute(null, "name", res.getResSpec().getName());
-
-        serializeExtraXmlAttrs(serializer, res);
-
-        if (!body.isEmpty()) {
-            serializer.ignorableWhitespace(body);
-        }
-
-        serializer.endTag(null, tagName);
-    }
-
-    public String getType() {
-        return mType;
-    }
-
-    protected void serializeExtraXmlAttrs(XmlSerializer serializer,
-                                          ResResource res) throws IOException {
-    }
-
-    protected abstract String encodeAsResXml() throws AndrolibException;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResStringValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResStringValue.java
deleted file mode 100644
index 21bab23..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResStringValue.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResXmlEncoders;
-
-public class ResStringValue extends ResScalarValue {
-
-    public ResStringValue(String value, int rawValue) {
-        this(value, rawValue, "string");
-    }
-
-    public ResStringValue(String value, int rawValue, String type) {
-        super(type, rawValue, value);
-    }
-
-    @Override
-    public String encodeAsResXmlAttr() {
-        return checkIfStringIsNumeric(ResXmlEncoders.encodeAsResXmlAttr(mRawValue));
-    }
-
-    @Override
-    public String encodeAsResXmlItemValue() {
-        return ResXmlEncoders.enumerateNonPositionalSubstitutionsIfRequired(ResXmlEncoders.encodeAsXmlValue(mRawValue));
-    }
-
-    @Override
-    public String encodeAsResXmlValue() {
-        return ResXmlEncoders.encodeAsXmlValue(mRawValue);
-    }
-
-    @Override
-    protected String encodeAsResXml() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected void serializeExtraXmlAttrs(XmlSerializer serializer, ResResource res) throws IOException {
-        if (ResXmlEncoders.hasMultipleNonPositionalSubstitutions(mRawValue)) {
-            serializer.attribute(null, "formatted", "false");
-        }
-    }
-
-    private String checkIfStringIsNumeric(String val) {
-        if (val == null || val.isEmpty()) {
-            return val;
-        }
-        return allDigits.matcher(val).matches() ? "\\ " + val : val;
-    }
-
-    private static final Pattern allDigits = Pattern.compile("\\d{9,}");
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
deleted file mode 100644
index 7c33389..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResSpec;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
-import brut.util.Duo;
-
-public class ResStyleValue extends ResBagValue implements
-        ResValuesXmlSerializable {
-    ResStyleValue(ResReferenceValue parent,
-                  Duo<Integer, ResScalarValue>[] items, ResValueFactory factory) {
-        super(parent);
-
-        mItems = new Duo[items.length];
-        for (int i = 0; i < items.length; i++) {
-            mItems[i] = new Duo<>(
-                factory.newReference(items[i].m1, null), items[i].m2);
-        }
-    }
-
-    @Override
-    public void serializeToResValuesXml(XmlSerializer serializer,
-                                        ResResource res) throws IOException, AndrolibException {
-        serializer.startTag(null, "style");
-        serializer.attribute(null, "name", res.getResSpec().getName());
-        if (!mParent.isNull() && !mParent.referentIsNull()) {
-            serializer.attribute(null, "parent", mParent.encodeAsResXmlAttr());
-        } else if (res.getResSpec().getName().indexOf('.') != -1) {
-            serializer.attribute(null, "parent", "");
-        }
-        for (Duo<ResReferenceValue, ResScalarValue> mItem : mItems) {
-            ResResSpec spec = mItem.m1.getReferent();
-
-            if (spec == null) {
-                LOGGER.info(String.format("null reference: m1=0x%08x(%s), m2=0x%08x(%s)",
-                    mItem.m1.getRawIntValue(), mItem.m1.getType(), mItem.m2.getRawIntValue(), mItem.m2.getType()));
-                continue;
-            }
-
-            String name;
-            String value = null;
-
-            ResValue resource = spec.getDefaultResource().getValue();
-            if (resource instanceof ResReferenceValue) {
-                continue;
-            } else if (resource instanceof ResAttr) {
-                ResAttr attr = (ResAttr) resource;
-                value = attr.convertToResXmlFormat(mItem.m2);
-                name = spec.getFullName(res.getResSpec().getPackage(), true);
-            } else {
-                name = "@" + spec.getFullName(res.getResSpec().getPackage(), false);
-            }
-
-            if (value == null) {
-                value = mItem.m2.encodeAsResXmlValue();
-            }
-
-            if (value == null) {
-                continue;
-            }
-
-            serializer.startTag(null, "item");
-            serializer.attribute(null, "name", name);
-            serializer.text(value);
-            serializer.endTag(null, "item");
-        }
-        serializer.endTag(null, "style");
-    }
-
-    private final Duo<ResReferenceValue, ResScalarValue>[] mItems;
-
-    }
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResValue.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResValue.java
deleted file mode 100644
index 1d12f49..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResValue.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-public class ResValue {
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java b/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
deleted file mode 100644
index a72ebca..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.data.value;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResPackage;
-import brut.androlib.res.data.ResTypeSpec;
-import brut.androlib.res.util.TypedValue;
-import brut.util.Duo;
-
-public class ResValueFactory {
-    private final ResPackage mPackage;
-
-    public ResValueFactory(ResPackage package_) {
-        this.mPackage = package_;
-    }
-
-    public ResScalarValue factory(int type, int value, String rawValue) throws AndrolibException {
-        switch (type) {
-            case TypedValue.TYPE_NULL:
-                if (value == TypedValue.DATA_NULL_UNDEFINED) { // Special case $empty as explicitly defined empty value
-                    return new ResStringValue(null, value);
-                } else if (value == TypedValue.DATA_NULL_EMPTY) {
-                    return new ResEmptyValue(value, rawValue, type);
-                }
-                return new ResReferenceValue(mPackage, 0, null);
-            case TypedValue.TYPE_REFERENCE:
-                return newReference(value, null);
-            case TypedValue.TYPE_ATTRIBUTE:
-            case TypedValue.TYPE_DYNAMIC_ATTRIBUTE:
-                return newReference(value, rawValue, true);
-            case TypedValue.TYPE_STRING:
-                return new ResStringValue(rawValue, value);
-            case TypedValue.TYPE_FLOAT:
-                return new ResFloatValue(Float.intBitsToFloat(value), value, rawValue);
-            case TypedValue.TYPE_DIMENSION:
-                return new ResDimenValue(value, rawValue);
-            case TypedValue.TYPE_FRACTION:
-                return new ResFractionValue(value, rawValue);
-            case TypedValue.TYPE_INT_BOOLEAN:
-                return new ResBoolValue(value != 0, value, rawValue);
-            case TypedValue.TYPE_DYNAMIC_REFERENCE:
-                return newReference(value, rawValue);
-        }
-
-        if (type >= TypedValue.TYPE_FIRST_COLOR_INT && type <= TypedValue.TYPE_LAST_COLOR_INT) {
-            return new ResColorValue(value, rawValue);
-        }
-        if (type >= TypedValue.TYPE_FIRST_INT && type <= TypedValue.TYPE_LAST_INT) {
-            return new ResIntValue(value, rawValue, type);
-        }
-
-        throw new AndrolibException("Invalid value type: " + type);
-    }
-
-    public ResIntBasedValue factory(String value, int rawValue) {
-        if (value == null) {
-            return new ResFileValue("", rawValue);
-        }
-        if (value.startsWith("res/")) {
-            return new ResFileValue(value, rawValue);
-        }
-        if (value.startsWith("r/") || value.startsWith("R/")) { //AndroResGuard
-            return new ResFileValue(value, rawValue);
-        }
-        return new ResStringValue(value, rawValue);
-    }
-
-    public ResBagValue bagFactory(int parent, Duo<Integer, ResScalarValue>[] items, ResTypeSpec resTypeSpec) throws AndrolibException {
-        ResReferenceValue parentVal = newReference(parent, null);
-
-        if (items.length == 0) {
-            return new ResBagValue(parentVal);
-        }
-        int key = items[0].m1;
-        if (key == ResAttr.BAG_KEY_ATTR_TYPE) {
-            return ResAttr.factory(parentVal, items, this, mPackage);
-        }
-
-        String resTypeName = resTypeSpec.getName();
-
-        // Android O Preview added an unknown enum for c. This is hardcoded as 0 for now.
-        if (ResTypeSpec.RES_TYPE_NAME_ARRAY.equals(resTypeName)
-                || key == ResArrayValue.BAG_KEY_ARRAY_START || key == 0) {
-            return new ResArrayValue(parentVal, items);
-        }
-
-        if (ResTypeSpec.RES_TYPE_NAME_PLURALS.equals(resTypeName) ||
-                (key >= ResPluralsValue.BAG_KEY_PLURALS_START && key <= ResPluralsValue.BAG_KEY_PLURALS_END)) {
-            return new ResPluralsValue(parentVal, items);
-        }
-
-        if (ResTypeSpec.RES_TYPE_NAME_ATTR.equals(resTypeName)) {
-            return new ResAttr(parentVal, 0, null, null, null);
-        }
-        
-        if (resTypeName.startsWith(ResTypeSpec.RES_TYPE_NAME_STYLES)) {
-            return new ResStyleValue(parentVal, items, this);
-        }
-
-        throw new AndrolibException("unsupported res type name for bags. Found: " + resTypeName);
-    }
-
-    public ResReferenceValue newReference(int resID, String rawValue) {
-        return newReference(resID, rawValue, false);
-    }
-
-    public ResReferenceValue newReference(int resID, String rawValue, boolean theme) {
-        return new ResReferenceValue(mPackage, resID, rawValue, theme);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
deleted file mode 100644
index 53b027b..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import android.annotation.SuppressLint;
-
-import com.apkide.common.CountingInputStream;
-import com.google.common.io.LittleEndianDataInputStream;
-
-import java.io.DataInput;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResConfigFlags;
-import brut.androlib.res.data.ResID;
-import brut.androlib.res.data.ResPackage;
-import brut.androlib.res.data.ResResSpec;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.data.ResTable;
-import brut.androlib.res.data.ResType;
-import brut.androlib.res.data.ResTypeSpec;
-import brut.androlib.res.data.value.ResBagValue;
-import brut.androlib.res.data.value.ResFileValue;
-import brut.androlib.res.data.value.ResIntBasedValue;
-import brut.androlib.res.data.value.ResReferenceValue;
-import brut.androlib.res.data.value.ResScalarValue;
-import brut.androlib.res.data.value.ResStringValue;
-import brut.androlib.res.data.value.ResValue;
-import brut.androlib.res.data.value.ResValueFactory;
-import brut.androlib.res.util.TypedValue;
-import brut.util.Duo;
-import brut.util.ExtDataInput;
-
-public class ARSCDecoder {
-    public static ARSCData decode(InputStream arscStream, boolean findFlagsOffsets, boolean keepBroken)
-            throws AndrolibException {
-        return decode(arscStream, findFlagsOffsets, keepBroken, new ResTable());
-    }
-
-    public static ARSCData decode(InputStream arscStream, boolean findFlagsOffsets, boolean keepBroken,
-                                  ResTable resTable)
-            throws AndrolibException {
-        try {
-            ARSCDecoder decoder = new ARSCDecoder(arscStream, resTable, findFlagsOffsets, keepBroken);
-            ResPackage[] pkgs = decoder.readTableHeader();
-            return new ARSCData(pkgs, decoder.mFlagsOffsets == null
-                    ? null
-                    : decoder.mFlagsOffsets.toArray(new FlagsOffset[0]), resTable);
-        } catch (IOException ex) {
-            throw new AndrolibException("Could not decode arsc file", ex);
-        }
-    }
-
-    private ARSCDecoder(InputStream arscStream, ResTable resTable, boolean storeFlagsOffsets, boolean keepBroken) {
-        arscStream = mCountIn = new CountingInputStream(arscStream);
-        if (storeFlagsOffsets) {
-            mFlagsOffsets = new ArrayList<>();
-        } else {
-            mFlagsOffsets = null;
-        }
-        // We need to explicitly cast to DataInput as otherwise the constructor is ambiguous.
-        // We choose DataInput instead of InputStream as ExtDataInput wraps an InputStream in
-        // a DataInputStream which is big-endian and ignores the little-endian behavior.
-        mIn = new ExtDataInput((DataInput) new LittleEndianDataInputStream(arscStream));
-        mResTable = resTable;
-        mKeepBroken = keepBroken;
-    }
-
-    private ResPackage[] readTableHeader() throws IOException, AndrolibException {
-        nextChunkCheckType(Header.TYPE_TABLE);
-        int packageCount = mIn.readInt();
-
-        mTableStrings = StringBlock.read(mIn);
-        ResPackage[] packages = new ResPackage[packageCount];
-
-        nextChunk();
-        for (int i = 0; i < packageCount; i++) {
-            mTypeIdOffset = 0;
-            packages[i] = readTablePackage();
-        }
-        return packages;
-    }
-
-    private ResPackage readTablePackage() throws IOException, AndrolibException {
-        checkChunkType(Header.XML_TYPE_PACKAGE);
-        int id = mIn.readInt();
-
-        if (id == 0) {
-            // This means we are dealing with a Library Package, we should just temporarily
-            // set the packageId to the next available id . This will be set at runtime regardless, but
-            // for Apktool's use we need a non-zero packageId.
-            // AOSP indicates 0x02 is next, as 0x01 is system and 0x7F is private.
-            id = 2;
-            if (mResTable.getPackageOriginal() == null && mResTable.getPackageRenamed() == null) {
-                mResTable.setSharedLibrary(true);
-            }
-        }
-
-        String name = mIn.readNullEndedString(128, true);
-        /* typeStrings */
-        mIn.skipInt();
-        /* lastPublicType */
-        mIn.skipInt();
-        /* keyStrings */
-        mIn.skipInt();
-        /* lastPublicKey */
-        mIn.skipInt();
-
-        // TypeIdOffset was added platform_frameworks_base/@f90f2f8dc36e7243b85e0b6a7fd5a590893c827e
-        // which is only in split/new applications.
-        int splitHeaderSize = (2 + 2 + 4 + 4 + (2 * 128) + (4 * 5)); // short, short, int, int, char[128], int * 4
-        if (mHeader.headerSize == splitHeaderSize) {
-            mTypeIdOffset = mIn.readInt();
-        }
-
-        if (mTypeIdOffset > 0) {
-            LOGGER.warning("Please report this application to Apktool for a fix: https://github.com/iBotPeaches/Apktool/issues/1728");
-        }
-
-        mTypeNames = StringBlock.read(mIn);
-        mSpecNames = StringBlock.read(mIn);
-
-        mResId = id << 24;
-        mPkg = new ResPackage(mResTable, id, name);
-
-        nextChunk();
-        boolean flag = true;
-        while (flag) {
-            switch (mHeader.type) {
-                case Header.XML_TYPE_SPEC_TYPE:
-                    readTableTypeSpec();
-                    break;
-                case Header.XML_TYPE_LIBRARY:
-                    readLibraryType();
-                    break;
-                case Header.XML_TYPE_OVERLAY:
-                    readOverlaySpec();
-                    break;
-                case Header.XML_TYPE_OVERLAY_POLICY:
-                    readOverlayPolicySpec();
-                    break;
-                case Header.XML_TYPE_STAGED_ALIAS:
-                    readStagedAliasSpec();
-                    break;
-                default:
-                    flag = false;
-                    break;
-            }
-        }
-
-        return mPkg;
-    }
-
-    private void readLibraryType() throws AndrolibException, IOException {
-        checkChunkType(Header.XML_TYPE_LIBRARY);
-        int libraryCount = mIn.readInt();
-
-        int packageId;
-        String packageName;
-
-        for (int i = 0; i < libraryCount; i++) {
-            packageId = mIn.readInt();
-            packageName = mIn.readNullEndedString(128, true);
-            LOGGER.info(String.format("Decoding Shared Library (%s), pkgId: %d", packageName, packageId));
-        }
-
-        while (nextChunk().type == Header.XML_TYPE_TYPE) {
-            readTableTypeSpec();
-        }
-    }
-
-    private void readStagedAliasSpec() throws IOException {
-        int count = mIn.readInt();
-
-        for (int i = 0; i < count; i++) {
-            LOGGER.info(String.format("Skipping staged alias stagedId (%h) finalId: %h", mIn.readInt(), mIn.readInt()));
-        }
-
-        nextChunk();
-    }
-
-    private void readOverlaySpec() throws AndrolibException, IOException {
-        checkChunkType(Header.XML_TYPE_OVERLAY);
-        String name = mIn.readNullEndedString(256, true);
-        String actor = mIn.readNullEndedString(256, true);
-        LOGGER.info(String.format("Overlay name: \"%s\", actor: \"%s\")", name, actor));
-
-        nextChunk();
-    }
-
-    private void readOverlayPolicySpec() throws AndrolibException, IOException {
-        checkChunkType(Header.XML_TYPE_OVERLAY_POLICY);
-        /* policyFlags */
-        mIn.skipInt();
-        int count = mIn.readInt();
-
-        for (int i = 0; i < count; i++) {
-            LOGGER.info(String.format("Skipping overlay (%h)", mIn.readInt()));
-        }
-
-        nextChunk();
-    }
-
-    private void readTableTypeSpec() throws AndrolibException, IOException {
-        mTypeSpec = readSingleTableTypeSpec();
-        addTypeSpec(mTypeSpec);
-
-        int type = nextChunk().type;
-        ResTypeSpec resTypeSpec;
-
-        while (type == Header.XML_TYPE_SPEC_TYPE) {
-            resTypeSpec = readSingleTableTypeSpec();
-            addTypeSpec(resTypeSpec);
-            type = nextChunk().type;
-
-            // We've detected sparse resources, lets record this so we can rebuild in that same format (sparse/not)
-            // with aapt2. aapt1 will ignore this.
-            if (!mResTable.getSparseResources()) {
-                mResTable.setSparseResources(true);
-            }
-        }
-
-        while (type == Header.XML_TYPE_TYPE) {
-            readTableType();
-
-            // skip "TYPE 8 chunks" and/or padding data at the end of this chunk
-            if (mCountIn.getCount() < mHeader.endPosition) {
-                LOGGER.warning("Unknown data detected. Skipping: " + (mHeader.endPosition - mCountIn.getCount()) + " byte(s)");
-                mCountIn.skip(mHeader.endPosition - mCountIn.getCount());
-            }
-
-            type = nextChunk().type;
-
-            addMissingResSpecs();
-        }
-    }
-
-    private ResTypeSpec readSingleTableTypeSpec() throws AndrolibException, IOException {
-        checkChunkType(Header.XML_TYPE_SPEC_TYPE);
-        int id = mIn.readUnsignedByte();
-        mIn.skipBytes(3);
-        int entryCount = mIn.readInt();
-
-        if (mFlagsOffsets != null) {
-            mFlagsOffsets.add(new FlagsOffset(mCountIn.getCount(), entryCount));
-        }
-
-        /* flags */
-        mIn.skipBytes(entryCount * 4);
-        mTypeSpec = new ResTypeSpec(mTypeNames.getString(id - 1), mResTable, mPkg, id, entryCount);
-        mPkg.addType(mTypeSpec);
-        return mTypeSpec;
-    }
-
-    private ResType readTableType() throws IOException, AndrolibException {
-        checkChunkType(Header.XML_TYPE_TYPE);
-        int typeId = mIn.readUnsignedByte() - mTypeIdOffset;
-        if (mResTypeSpecs.containsKey(typeId)) {
-            mResId = (0xff000000 & mResId) | Objects.requireNonNull(mResTypeSpecs.get(typeId)).getId() << 16;
-            mTypeSpec = mResTypeSpecs.get(typeId);
-        }
-
-        int typeFlags = mIn.readByte();
-        /* reserved */
-        mIn.skipBytes(2);
-        int entryCount = mIn.readInt();
-        int entriesStart = mIn.readInt();
-        mMissingResSpecMap = new LinkedHashMap<>();
-
-        ResConfigFlags flags = readConfigFlags();
-        int position = (mHeader.startPosition + entriesStart) - (entryCount * 4);
-
-        // For some APKs there is a disconnect between the reported size of Configs
-        // If we find a mismatch skip those bytes.
-        if (position != mCountIn.getCount()) {
-            LOGGER.warning("Invalid data detected. Skipping: " + (position - mCountIn.getCount()) + " byte(s)");
-            mIn.skipBytes(position - mCountIn.getCount());
-        }
-
-        if ((typeFlags & 0x01) != 0) {
-            LOGGER.info("Sparse type flags detected: " + mTypeSpec.getName());
-        }
-
-        HashMap<Integer, Integer> entryOffsetMap = new LinkedHashMap<>();
-        for (int i = 0; i < entryCount; i++) {
-            if ((typeFlags & 0x01) != 0) {
-                entryOffsetMap.put(mIn.readUnsignedShort(), mIn.readUnsignedShort());
-            } else {
-                entryOffsetMap.put(i, mIn.readInt());
-            }
-        }
-
-        if (flags.isInvalid) {
-            String resName = mTypeSpec.getName() + flags.getQualifiers();
-            if (mKeepBroken) {
-                LOGGER.warning("Invalid config flags detected: " + resName);
-            } else {
-                LOGGER.warning("Invalid config flags detected. Dropping resources: " + resName);
-            }
-        }
-
-        mType = flags.isInvalid && !mKeepBroken ? null : mPkg.getOrCreateConfig(flags);
-
-        for (int i : entryOffsetMap.keySet()) {
-            int offset = entryOffsetMap.get(i);
-            if (offset == -1) {
-                continue;
-            }
-            mMissingResSpecMap.put(i, false);
-            mResId = (mResId & 0xffff0000) | i;
-            readEntry(readEntryData());
-        }
-
-        return mType;
-    }
-
-
-    private EntryData readEntryData() throws IOException, AndrolibException {
-        short size = mIn.readShort();
-        if (size < 0) {
-            throw new AndrolibException("Entry size is under 0 bytes.");
-        }
-
-        short flags = mIn.readShort();
-        int specNamesId = mIn.readInt();
-        ResValue value = (flags & ENTRY_FLAG_COMPLEX) == 0 ? readValue() : readComplexEntry();
-        EntryData entryData = new EntryData();
-        entryData.mFlags = flags;
-        entryData.mSpecNamesId = specNamesId;
-        entryData.mValue = value;
-        return entryData;
-    }
-
-    private void readEntry(EntryData entryData) throws AndrolibException {
-        int specNamesId = entryData.mSpecNamesId;
-        ResValue value = entryData.mValue;
-
-        if (mTypeSpec.isString() && value instanceof ResFileValue) {
-            value = new ResStringValue(value.toString(), ((ResFileValue) value).getRawIntValue());
-        }
-        if (mType == null) {
-            return;
-        }
-
-        ResID resId = new ResID(mResId);
-        ResResSpec spec;
-        if (mPkg.hasResSpec(resId)) {
-            spec = mPkg.getResSpec(resId);
-
-            if (spec.isDummyResSpec()) {
-                removeResSpec(spec);
-
-                spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), mPkg, mTypeSpec);
-                mPkg.addResSpec(spec);
-                mTypeSpec.addResSpec(spec);
-            }
-        } else {
-            spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), mPkg, mTypeSpec);
-            mPkg.addResSpec(spec);
-            mTypeSpec.addResSpec(spec);
-        }
-        ResResource res = new ResResource(mType, spec, value);
-
-        try {
-            mType.addResource(res);
-            spec.addResource(res);
-        } catch (AndrolibException ex) {
-            if (mKeepBroken) {
-                mType.addResource(res, true);
-                spec.addResource(res, true);
-                LOGGER.warning(String.format("Duplicate Resource Detected. Ignoring duplicate: %s", res));
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-    private ResBagValue readComplexEntry() throws IOException, AndrolibException {
-        int parent = mIn.readInt();
-        int count = mIn.readInt();
-
-        ResValueFactory factory = mPkg.getValueFactory();
-        Duo<Integer, ResScalarValue>[] items = new Duo[count];
-        ResIntBasedValue resValue;
-        int resId;
-
-        for (int i = 0; i < count; i++) {
-            resId = mIn.readInt();
-            resValue = readValue();
-
-            if (!(resValue instanceof ResScalarValue)) {
-                resValue = new ResStringValue(resValue.toString(), resValue.getRawIntValue());
-            }
-            items[i] = new Duo<>(resId, (ResScalarValue) resValue);
-        }
-
-        return factory.bagFactory(parent, items, mTypeSpec);
-    }
-
-    private ResIntBasedValue readValue() throws IOException, AndrolibException {
-        /* size */
-        mIn.skipCheckShort((short) 8);
-        /* zero */
-        mIn.skipCheckByte((byte) 0);
-        byte type = mIn.readByte();
-        int data = mIn.readInt();
-
-        return type == TypedValue.TYPE_STRING
-                ? mPkg.getValueFactory().factory(mTableStrings.getHTML(data), data)
-                : mPkg.getValueFactory().factory(type, data, null);
-    }
-
-    @SuppressLint("DefaultLocale")
-    private ResConfigFlags readConfigFlags() throws IOException, AndrolibException {
-        int size = mIn.readInt();
-        int read = 8;
-
-        if (size < 8) {
-            throw new AndrolibException("Config size < 8");
-        }
-
-        boolean isInvalid = false;
-
-        short mcc = mIn.readShort();
-        short mnc = mIn.readShort();
-
-
-        char[] language = new char[0];
-        char[] country = new char[0];
-        if (size >= 12) {
-            language = this.unpackLanguageOrRegion(mIn.readByte(), mIn.readByte(), 'a');
-            country = this.unpackLanguageOrRegion(mIn.readByte(), mIn.readByte(), '0');
-            read = 12;
-        }
-
-        byte orientation = 0;
-        byte touchscreen = 0;
-        if (size >= 14) {
-            orientation = mIn.readByte();
-            touchscreen = mIn.readByte();
-            read = 14;
-        }
-
-        int density = 0;
-        if (size >= 16) {
-            density = mIn.readUnsignedShort();
-            read = 16;
-        }
-        byte keyboard = 0;
-        byte navigation = 0;
-        byte inputFlags = 0;
-        if (size >= 20) {
-            keyboard = mIn.readByte();
-            navigation = mIn.readByte();
-            inputFlags = mIn.readByte();
-            mIn.skipBytes(1); // inputPad0
-            read = 20;
-        }
-
-        short screenWidth = 0;
-        short screenHeight = 0;
-        short sdkVersion = 0;
-        if (size >= 28) {
-            screenWidth = mIn.readShort();
-            screenHeight = mIn.readShort();
-            sdkVersion = mIn.readShort();
-            mIn.skipBytes(2); // minorVersion
-            read = 28;
-        }
-
-        byte screenLayout = 0;
-        byte uiMode = 0;
-        short smallestScreenWidthDp = 0;
-        if (size >= 32) {
-            screenLayout = mIn.readByte();
-            uiMode = mIn.readByte();
-            smallestScreenWidthDp = mIn.readShort();
-            read = 32;
-        }
-
-        short screenWidthDp = 0;
-        short screenHeightDp = 0;
-        if (size >= 36) {
-            screenWidthDp = mIn.readShort();
-            screenHeightDp = mIn.readShort();
-            read = 36;
-        }
-
-        char[] localeScript = null;
-        char[] localeVariant = null;
-        if (size >= 48) {
-            localeScript = readScriptOrVariantChar(4).toCharArray();
-            localeVariant = readScriptOrVariantChar(8).toCharArray();
-            read = 48;
-        }
-
-        byte screenLayout2 = 0;
-        byte colorMode = 0;
-        if (size >= 52) {
-            screenLayout2 = mIn.readByte();
-            colorMode = mIn.readByte();
-            mIn.skipBytes(2); // reserved padding
-            read = 52;
-        }
-
-        if (size >= 56) {
-            mIn.skipBytes(4);
-            read = 56;
-        }
-
-        int exceedingSize = size - KNOWN_CONFIG_BYTES;
-        if (exceedingSize > 0) {
-            byte[] buf = new byte[exceedingSize];
-            read += exceedingSize;
-            mIn.readFully(buf);
-            BigInteger exceedingBI = new BigInteger(1, buf);
-
-            if (exceedingBI.equals(BigInteger.ZERO)) {
-                LOGGER.info(String
-                        .format("Config flags size > %d, but exceeding bytes are all zero, so it should be ok.",
-                                KNOWN_CONFIG_BYTES));
-            } else {
-                LOGGER.warning(String.format("Config flags size > %d. Size = %d. Exceeding bytes: 0x%X.",
-                        KNOWN_CONFIG_BYTES, size, exceedingBI));
-                isInvalid = true;
-            }
-        }
-
-        int remainingSize = size - read;
-        if (remainingSize > 0) {
-            mIn.skipBytes(remainingSize);
-        }
-
-        return new ResConfigFlags(mcc, mnc, language, country,
-                orientation, touchscreen, density, keyboard, navigation,
-                inputFlags, screenWidth, screenHeight, sdkVersion,
-                screenLayout, uiMode, smallestScreenWidthDp, screenWidthDp,
-                screenHeightDp, localeScript, localeVariant, screenLayout2,
-                colorMode, isInvalid, size);
-    }
-
-    private char[] unpackLanguageOrRegion(byte in0, byte in1, char base) {
-        // check high bit, if so we have a packed 3 letter code
-        if (((in0 >> 7) & 1) == 1) {
-            int first = in1 & 0x1F;
-            int second = ((in1 & 0xE0) >> 5) + ((in0 & 0x03) << 3);
-            int third = (in0 & 0x7C) >> 2;
-
-            // since this function handles languages & regions, we add the value(s) to the base char
-            // which is usually 'a' or '0' depending on language or region.
-            return new char[]{(char) (first + base), (char) (second + base), (char) (third + base)};
-        }
-        return new char[]{(char) in0, (char) in1};
-    }
-
-    private String readScriptOrVariantChar(int length) throws IOException {
-        StringBuilder string = new StringBuilder(16);
-
-        while (length-- != 0) {
-            short ch = mIn.readByte();
-            if (ch == 0) {
-                break;
-            }
-            string.append((char) ch);
-        }
-        mIn.skipBytes(length);
-
-        return string.toString();
-    }
-
-    private void addTypeSpec(ResTypeSpec resTypeSpec) {
-        mResTypeSpecs.put(resTypeSpec.getId(), resTypeSpec);
-    }
-
-    private void addMissingResSpecs() throws AndrolibException {
-        int resId = mResId & 0xffff0000;
-
-        for (int i : mMissingResSpecMap.keySet()) {
-            if (Boolean.TRUE.equals(mMissingResSpecMap.get(i))) continue;
-
-            ResResSpec spec = new ResResSpec(new ResID(resId | i), "APKTOOL_DUMMY_" + Integer.toHexString(i), mPkg, mTypeSpec);
-
-            // If we already have this resID don't add it again.
-            if (!mPkg.hasResSpec(new ResID(resId | i))) {
-                mPkg.addResSpec(spec);
-                mTypeSpec.addResSpec(spec);
-
-                if (mType == null) {
-                    mType = mPkg.getOrCreateConfig(new ResConfigFlags());
-                }
-
-                // We are going to make dummy attributes a null reference (@null) now instead of a boolean false.
-                // This is because aapt2 is much more strict when it comes to what we can put in an application.
-                ResValue value = new ResReferenceValue(mPkg, 0, "");
-
-                ResResource res = new ResResource(mType, spec, value);
-                mType.addResource(res);
-                spec.addResource(res);
-            }
-        }
-    }
-
-    private void removeResSpec(ResResSpec spec) {
-        if (mPkg.hasResSpec(spec.getId())) {
-            mPkg.removeResSpec(spec);
-            mTypeSpec.removeResSpec(spec);
-        }
-    }
-
-    private Header nextChunk() throws IOException {
-        return mHeader = Header.read(mIn, mCountIn);
-    }
-
-    private void checkChunkType(int expectedType) throws AndrolibException {
-        if (mHeader.type != expectedType) {
-            throw new AndrolibException(String.format("Invalid chunk type: expected=0x%08x, got=0x%08x",
-                    expectedType, mHeader.type));
-        }
-    }
-
-    private void nextChunkCheckType(int expectedType) throws IOException, AndrolibException {
-        nextChunk();
-        checkChunkType(expectedType);
-    }
-
-    private final ExtDataInput mIn;
-    private final ResTable mResTable;
-    private final CountingInputStream mCountIn;
-    private final List<FlagsOffset> mFlagsOffsets;
-    private final boolean mKeepBroken;
-
-    private Header mHeader;
-    private StringBlock mTableStrings;
-    private StringBlock mTypeNames;
-    private StringBlock mSpecNames;
-    private ResPackage mPkg;
-    private ResTypeSpec mTypeSpec;
-    private ResType mType;
-    private int mResId;
-    private int mTypeIdOffset = 0;
-    private HashMap<Integer, Boolean> mMissingResSpecMap;
-    private final HashMap<Integer, ResTypeSpec> mResTypeSpecs = new HashMap<>();
-
-    private final static short ENTRY_FLAG_COMPLEX = 0x0001;
-    private final static short ENTRY_FLAG_PUBLIC = 0x0002;
-    private final static short ENTRY_FLAG_WEAK = 0x0004;
-
-    public static class Header {
-        public final short type;
-        public final int headerSize;
-        public final int chunkSize;
-        public final int startPosition;
-        public final int endPosition;
-
-        public Header(short type, int headerSize, int chunkSize, int headerStart) {
-            this.type = type;
-            this.headerSize = headerSize;
-            this.chunkSize = chunkSize;
-            this.startPosition = headerStart;
-            this.endPosition = headerStart + chunkSize;
-        }
-
-        public static Header read(ExtDataInput in, CountingInputStream countIn) throws IOException {
-            short type;
-            int start = countIn.getCount();
-            try {
-                type = in.readShort();
-            } catch (EOFException ex) {
-                return new Header(TYPE_NONE, 0, 0, countIn.getCount());
-            }
-            return new Header(type, in.readShort(), in.readInt(), start);
-        }
-
-        public final static short TYPE_NONE = -1;
-        public final static short TYPE_STRING_POOL = 0x0001;
-        public final static short TYPE_TABLE = 0x0002;
-        public final static short TYPE_XML = 0x0003;
-
-        public final static short XML_TYPE_PACKAGE = 0x0200;
-        public final static short XML_TYPE_TYPE = 0x0201;
-        public final static short XML_TYPE_SPEC_TYPE = 0x0202;
-        public final static short XML_TYPE_LIBRARY = 0x0203;
-        public final static short XML_TYPE_OVERLAY = 0x0204;
-        public final static short XML_TYPE_OVERLAY_POLICY = 0x0205;
-        public final static short XML_TYPE_STAGED_ALIAS = 0x0206;
-    }
-
-    public static class FlagsOffset {
-        public final int offset;
-        public final int count;
-
-        public FlagsOffset(int offset, int count) {
-            this.offset = offset;
-            this.count = count;
-        }
-    }
-
-    private static class EntryData {
-        public short mFlags;
-        public int mSpecNamesId;
-        public ResValue mValue;
-    }
-
-    private static final int KNOWN_CONFIG_BYTES = 56;
-
-    public static class ARSCData {
-
-        public ARSCData(ResPackage[] packages, FlagsOffset[] flagsOffsets, ResTable resTable) {
-            mPackages = packages;
-            mFlagsOffsets = flagsOffsets;
-            mResTable = resTable;
-        }
-
-        public FlagsOffset[] getFlagsOffsets() {
-            return mFlagsOffsets;
-        }
-
-        public ResPackage[] getPackages() {
-            return mPackages;
-        }
-
-        public ResPackage getOnePackage() throws AndrolibException {
-            if (mPackages.length == 0) {
-                throw new AndrolibException("Arsc file contains zero packages");
-            } else if (mPackages.length != 1) {
-                int id = findPackageWithMostResSpecs();
-                LOGGER.info("Arsc file contains multiple packages. Using package "
-                        + mPackages[id].getName() + " as default.");
-
-                return mPackages[id];
-            }
-            return mPackages[0];
-        }
-
-        public int findPackageWithMostResSpecs() {
-            int count = mPackages[0].getResSpecCount();
-            int id = 0;
-
-            for (int i = 0; i < mPackages.length; i++) {
-                if (mPackages[i].getResSpecCount() >= count) {
-                    count = mPackages[i].getResSpecCount();
-                    id = i;
-                }
-            }
-            return id;
-        }
-
-        public ResTable getResTable() {
-            return mResTable;
-        }
-
-        private final ResPackage[] mPackages;
-        private final FlagsOffset[] mFlagsOffsets;
-        private final ResTable mResTable;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
deleted file mode 100644
index 6b8ab81..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
+++ /dev/null
@@ -1,997 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import com.apkide.common.AppLog;
-import com.google.common.io.LittleEndianDataInputStream;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResID;
-import brut.androlib.res.util.TypedValue;
-import brut.androlib.res.xml.ResXmlEncoders;
-import brut.util.ExtDataInput;
-
-/**
- * Binary xml files parser.
- * <p>
- * Parser has only two states: (1) Operational state, which parser
- * obtains after first successful call to next() and retains until
- * open(), close(), or failed call to next(). (2) Closed state, which
- * parser obtains after open(), close(), or failed call to next(). In
- * this state methods return invalid values or throw exceptions.
- * <p>
- * TODO: * check all methods in closed state
- */
-public class AXmlResourceParser implements XmlResourceParser {
-
-    public AXmlResourceParser() {
-        resetEventInfo();
-    }
-
-    public AXmlResourceParser(InputStream stream) {
-        this();
-        open(stream);
-    }
-
-    public AndrolibException getFirstError() {
-        return mFirstError;
-    }
-
-    public ResAttrDecoder getAttrDecoder() {
-        return mAttrDecoder;
-    }
-
-    public void setAttrDecoder(ResAttrDecoder attrDecoder) {
-        mAttrDecoder = attrDecoder;
-    }
-
-    public void open(InputStream stream) {
-        close();
-        if (stream != null) {
-            // We need to explicitly cast to DataInput as otherwise the constructor is ambiguous.
-            // We choose DataInput instead of InputStream as ExtDataInput wraps an InputStream in
-            // a DataInputStream which is big-endian and ignores the little-endian behavior.
-            m_reader = new ExtDataInput((DataInput) new LittleEndianDataInputStream(stream));
-        }
-    }
-
-    @Override
-    public void close() {
-        if (!m_operational) {
-            return;
-        }
-        m_operational = false;
-        m_reader = null;
-        m_strings = null;
-        m_resourceIDs = null;
-        m_namespaces.reset();
-        resetEventInfo();
-    }
-
-    // ///////////////////////////////// iteration
-    @Override
-    public int next() throws XmlPullParserException, IOException {
-        if (m_reader == null) {
-            throw new XmlPullParserException("Parser is not opened.", this, null);
-        }
-        try {
-            doNext();
-            return m_event;
-        } catch (IOException e) {
-            close();
-            throw e;
-        }
-    }
-
-    @Override
-    public int nextToken() throws XmlPullParserException, IOException {
-        return next();
-    }
-
-    @Override
-    public int nextTag() throws XmlPullParserException, IOException {
-        int eventType = next();
-        if (eventType == TEXT && isWhitespace()) {
-            eventType = next();
-        }
-        if (eventType != START_TAG && eventType != END_TAG) {
-            throw new XmlPullParserException("Expected start or end tag.", this, null);
-        }
-        return eventType;
-    }
-
-    @Override
-    public String nextText() throws XmlPullParserException, IOException {
-        if (getEventType() != START_TAG) {
-            throw new XmlPullParserException("Parser must be on START_TAG to read next text.", this, null);
-        }
-        int eventType = next();
-        if (eventType == TEXT) {
-            String result = getText();
-            eventType = next();
-            if (eventType != END_TAG) {
-                throw new XmlPullParserException("Event TEXT must be immediately followed by END_TAG.", this, null);
-            }
-            return result;
-        } else if (eventType == END_TAG) {
-            return "";
-        } else {
-            throw new XmlPullParserException("Parser must be on START_TAG or TEXT to read text.", this, null);
-        }
-    }
-
-    @Override
-    public void require(int type, String namespace, String name)
-            throws XmlPullParserException, IOException {
-        if (type != getEventType() || (namespace != null && !namespace.equals(getNamespace()))
-                || (name != null && !name.equals(getName()))) {
-            throw new XmlPullParserException(TYPES[type] + " is expected.", this, null);
-        }
-    }
-
-    @Override
-    public int getDepth() {
-        return m_namespaces.getDepth() - 1;
-    }
-
-    @Override
-    public int getEventType() {
-        return m_event;
-    }
-
-    @Override
-    public int getLineNumber() {
-        return m_lineNumber;
-    }
-
-    @Override
-    public String getName() {
-        if (m_name == -1 || (m_event != START_TAG && m_event != END_TAG)) {
-            return null;
-        }
-        return m_strings.getString(m_name);
-    }
-
-    @Override
-    public String getText() {
-        if (m_name == -1 || m_event != TEXT) {
-            return null;
-        }
-        return m_strings.getString(m_name);
-    }
-
-    @Override
-    public char[] getTextCharacters(int[] holderForStartAndLength) {
-        String text = getText();
-        if (text == null) {
-            return null;
-        }
-        holderForStartAndLength[0] = 0;
-        holderForStartAndLength[1] = text.length();
-        char[] chars = new char[text.length()];
-        text.getChars(0, text.length(), chars, 0);
-        return chars;
-    }
-
-    @Override
-    public String getNamespace() {
-        return m_strings.getString(m_namespaceUri);
-    }
-
-    @Override
-    public String getPrefix() {
-        int prefix = m_namespaces.findPrefix(m_namespaceUri);
-        return m_strings.getString(prefix);
-    }
-
-    @Override
-    public String getPositionDescription() {
-        return "XML line #" + getLineNumber();
-    }
-
-    @Override
-    public int getNamespaceCount(int depth) {
-        return m_namespaces.getAccumulatedCount(depth);
-    }
-
-    @Override
-    public String getNamespacePrefix(int pos) {
-        int prefix = m_namespaces.getPrefix(pos);
-        return m_strings.getString(prefix);
-    }
-
-    @Override
-    public String getNamespaceUri(int pos) {
-        int uri = m_namespaces.getUri(pos);
-        return m_strings.getString(uri);
-    }
-
-    // ///////////////////////////////// attributes
-    @Override
-    public String getClassAttribute() {
-        if (m_classAttribute == -1) {
-            return null;
-        }
-        int offset = getAttributeOffset(m_classAttribute);
-        int value = m_attributes[offset + ATTRIBUTE_IX_VALUE_STRING];
-        return m_strings.getString(value);
-    }
-
-    @Override
-    public String getIdAttribute() {
-        if (m_idAttribute == -1) {
-            return null;
-        }
-        int offset = getAttributeOffset(m_idAttribute);
-        int value = m_attributes[offset + ATTRIBUTE_IX_VALUE_STRING];
-        return m_strings.getString(value);
-    }
-
-    @Override
-    public int getIdAttributeResourceValue(int defaultValue) {
-        if (m_idAttribute == -1) {
-            return defaultValue;
-        }
-        int offset = getAttributeOffset(m_idAttribute);
-        int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
-        if (valueType != TypedValue.TYPE_REFERENCE) {
-            return defaultValue;
-        }
-        return m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-    }
-
-    @Override
-    public int getStyleAttribute() {
-        if (m_styleAttribute == -1) {
-            return 0;
-        }
-        int offset = getAttributeOffset(m_styleAttribute);
-        return m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-    }
-
-    @Override
-    public int getAttributeCount() {
-        if (m_event != START_TAG) {
-            return -1;
-        }
-        return m_attributes.length / ATTRIBUTE_LENGTH;
-    }
-
-    @Override
-    public String getAttributeNamespace(int index) {
-        int offset = getAttributeOffset(index);
-        int namespace = m_attributes[offset + ATTRIBUTE_IX_NAMESPACE_URI];
-        if (namespace == -1) {
-            return "";
-        }
-
-        // Minifiers like removing the namespace, so we will default to default namespace
-        // unless the pkgId of the resource is private. We will grab the non-standard one.
-        String value = m_strings.getString(namespace);
-
-        if (value==null ||value.length() == 0) {
-            ResID resourceId = new ResID(getAttributeNameResource(index));
-            if (resourceId.package_ == PRIVATE_PKG_ID) {
-                value = getNonDefaultNamespaceUri(offset);
-            } else {
-                value = android_ns;
-            }
-        }
-
-        return value;
-    }
-
-    private String getNonDefaultNamespaceUri(int offset) {
-        String prefix = m_strings.getString(m_namespaces.getPrefix(offset));
-        if (prefix != null) {
-            return  m_strings.getString(m_namespaces.getUri(offset));
-        }
-
-        // If we are here. There is some clever obfuscation going on. Our reference points to the namespace are gone.
-        // Normally we could take the index * attributeCount to get an offset.
-        // That would point to the URI in the StringBlock table, but that is empty.
-        // We have the namespaces that can't be touched in the opening tag.
-        // Though no known way to correlate them at this time.
-        // So return the res-auto namespace.
-        return "http://schemas.android.com/apk/res-auto";
-    }
-
-    @Override
-    public String getAttributePrefix(int index) {
-        int offset = getAttributeOffset(index);
-        int uri = m_attributes[offset + ATTRIBUTE_IX_NAMESPACE_URI];
-        int prefix = m_namespaces.findPrefix(uri);
-        if (prefix == -1) {
-            return "";
-        }
-        return m_strings.getString(prefix);
-    }
-
-    @Override
-    public String getAttributeName(int index) {
-        int offset = getAttributeOffset(index);
-        int name = m_attributes[offset + ATTRIBUTE_IX_NAME];
-        if (name == -1) {
-            return "";
-        }
-
-        String value = m_strings.getString(name);
-        String namespace = getAttributeNamespace(index);
-
-        // If attribute name is lacking or a private namespace emerges,
-        // retrieve the exact attribute name by its id.
-        if (value == null || value.length() == 0) {
-            try {
-                value = mAttrDecoder.decodeManifestAttr(getAttributeNameResource(index));
-                if (value == null) {
-                    value = "";
-                }
-            } catch (AndrolibException e) {
-                value = "";
-            }
-        } else if (! namespace.equals(android_ns)) {
-            try {
-                String obfuscatedName = mAttrDecoder.decodeManifestAttr(getAttributeNameResource(index));
-                if (! (obfuscatedName == null || obfuscatedName.equals(value))) {
-                    value = obfuscatedName;
-                }
-            } catch (AndrolibException ignored) {}
-        }
-        return value;
-    }
-
-    @Override
-    public int getAttributeNameResource(int index) {
-        int offset = getAttributeOffset(index);
-        int name = m_attributes[offset + ATTRIBUTE_IX_NAME];
-        if (m_resourceIDs == null || name < 0 || name >= m_resourceIDs.length) {
-            return 0;
-        }
-        return m_resourceIDs[name];
-    }
-
-    @Override
-    public int getAttributeValueType(int index) {
-        int offset = getAttributeOffset(index);
-        return m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
-    }
-
-    @Override
-    public int getAttributeValueData(int index) {
-        int offset = getAttributeOffset(index);
-        return m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-    }
-
-    @Override
-    public String getAttributeValue(int index) {
-        int offset = getAttributeOffset(index);
-        int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
-        int valueData = m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-        int valueRaw = m_attributes[offset + ATTRIBUTE_IX_VALUE_STRING];
-
-        if (mAttrDecoder != null) {
-            try {
-                String value = valueRaw == -1 ? null : ResXmlEncoders.escapeXmlChars(m_strings.getString(valueRaw));
-                String obfuscatedValue = mAttrDecoder.decodeManifestAttr(valueData);
-
-                if (! (value == null || obfuscatedValue == null)) {
-                    int slashPos = value.lastIndexOf("/");
-
-                    if (slashPos != -1) {
-                        // Handle a value with a format of "@yyy/xxx"
-                        String dir = value.substring(0, slashPos);
-                        value = dir + "/"+ obfuscatedValue;
-                    } else if (! value.equals(obfuscatedValue)) {
-                        value = obfuscatedValue;
-                    }
-                }
-
-                return mAttrDecoder.decode(
-                    valueType,
-                    valueData,
-                    value,
-                    getAttributeNameResource(index)
-                );
-            } catch (AndrolibException ex) {
-                setFirstError(ex);
-                AppLog.e(ex);
-                LOGGER.warning(String.format("Could not decode attr value, using undecoded value "
-                                + "instead: ns=%s, name=%s, value=0x%08x",
-                        getAttributePrefix(index),
-                        getAttributeName(index),
-                        valueData));
-            }
-        }
-        return TypedValue.coerceToString(valueType, valueData);
-    }
-
-    @Override
-    public boolean getAttributeBooleanValue(int index, boolean defaultValue) {
-        return getAttributeIntValue(index, defaultValue ? 1 : 0) != 0;
-    }
-
-    @Override
-    public float getAttributeFloatValue(int index, float defaultValue) {
-        int offset = getAttributeOffset(index);
-        int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
-        if (valueType == TypedValue.TYPE_FLOAT) {
-            int valueData = m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-            return Float.intBitsToFloat(valueData);
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public int getAttributeIntValue(int index, int defaultValue) {
-        int offset = getAttributeOffset(index);
-        int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
-        if (valueType >= TypedValue.TYPE_FIRST_INT && valueType <= TypedValue.TYPE_LAST_INT) {
-            return m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public int getAttributeUnsignedIntValue(int index, int defaultValue) {
-        return getAttributeIntValue(index, defaultValue);
-    }
-
-    @Override
-    public int getAttributeResourceValue(int index, int defaultValue) {
-        int offset = getAttributeOffset(index);
-        int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
-        if (valueType == TypedValue.TYPE_REFERENCE) {
-            return m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public String getAttributeValue(String namespace, String attribute) {
-        int index = findAttribute(namespace, attribute);
-        if (index == -1) {
-            return "";
-        }
-        return getAttributeValue(index);
-    }
-
-    @Override
-    public boolean getAttributeBooleanValue(String namespace, String attribute, boolean defaultValue) {
-        int index = findAttribute(namespace, attribute);
-        if (index == -1) {
-            return defaultValue;
-        }
-        return getAttributeBooleanValue(index, defaultValue);
-    }
-
-    @Override
-    public float getAttributeFloatValue(String namespace, String attribute, float defaultValue) {
-        int index = findAttribute(namespace, attribute);
-        if (index == -1) {
-            return defaultValue;
-        }
-        return getAttributeFloatValue(index, defaultValue);
-    }
-
-    @Override
-    public int getAttributeIntValue(String namespace, String attribute, int defaultValue) {
-        int index = findAttribute(namespace, attribute);
-        if (index == -1) {
-            return defaultValue;
-        }
-        return getAttributeIntValue(index, defaultValue);
-    }
-
-    @Override
-    public int getAttributeUnsignedIntValue(String namespace, String attribute, int defaultValue) {
-        int index = findAttribute(namespace, attribute);
-        if (index == -1) {
-            return defaultValue;
-        }
-        return getAttributeUnsignedIntValue(index, defaultValue);
-    }
-
-    @Override
-    public int getAttributeResourceValue(String namespace, String attribute, int defaultValue) {
-        int index = findAttribute(namespace, attribute);
-        if (index == -1) {
-            return defaultValue;
-        }
-        return getAttributeResourceValue(index, defaultValue);
-    }
-
-    @Override
-    public int getAttributeListValue(int index, String[] options, int defaultValue) {
-        // TODO implement
-        return 0;
-    }
-
-    @Override
-    public int getAttributeListValue(String namespace, String attribute, String[] options, int defaultValue) {
-        // TODO implement
-        return 0;
-    }
-
-    @Override
-    public String getAttributeType(int index) {
-        return "CDATA";
-    }
-
-    @Override
-    public boolean isAttributeDefault(int index) {
-        return false;
-    }
-
-    // ///////////////////////////////// dummies
-    @Override
-    public void setInput(InputStream stream, String inputEncoding) {
-        open(stream);
-    }
-
-    @Override
-    public void setInput(Reader reader) throws XmlPullParserException {
-        throw new XmlPullParserException(E_NOT_SUPPORTED);
-    }
-
-    @Override
-    public String getInputEncoding() {
-        return null;
-    }
-
-    @Override
-    public int getColumnNumber() {
-        return -1;
-    }
-
-    @Override
-    public boolean isEmptyElementTag() {
-        return false;
-    }
-
-    @Override
-    public boolean isWhitespace() {
-        return false;
-    }
-
-    @Override
-    public void defineEntityReplacementText(String entityName, String replacementText)
-            throws XmlPullParserException {
-        throw new XmlPullParserException(E_NOT_SUPPORTED);
-    }
-
-    @Override
-    public String getNamespace(String prefix) {
-        throw new RuntimeException(E_NOT_SUPPORTED);
-    }
-
-    @Override
-    public Object getProperty(String name) {
-        return null;
-    }
-
-    @Override
-    public void setProperty(String name, Object value)
-            throws XmlPullParserException {
-        throw new XmlPullParserException(E_NOT_SUPPORTED);
-    }
-
-    @Override
-    public boolean getFeature(String feature) {
-        return false;
-    }
-
-    @Override
-    public void setFeature(String name, boolean value)
-            throws XmlPullParserException {
-        throw new XmlPullParserException(E_NOT_SUPPORTED);
-    }
-
-    // /////////////////////////////////////////// implementation
-    /**
-     * Namespace stack, holds prefix+uri pairs, as well as depth information.
-     * All information is stored in one int[] array. Array consists of depth
-     * frames: Data=DepthFrame*; DepthFrame=Count+[Prefix+Uri]*+Count;
-     * Count='count of Prefix+Uri pairs'; Yes, count is stored twice, to enable
-     * bottom-up traversal. increaseDepth adds depth frame, decreaseDepth
-     * removes it. push/pop operations operate only in current depth frame.
-     * decreaseDepth removes any remaining (not pop'ed) namespace pairs. findXXX
-     * methods search all depth frames starting from the last namespace pair of
-     * current depth frame. All functions that operate with int, use -1 as
-     * 'invalid value'.
-     * <p>
-     * !! functions expect 'prefix'+'uri' pairs, not 'uri'+'prefix' !!
-     *
-     */
-    private static final class NamespaceStack {
-
-        public NamespaceStack() {
-            m_data = new int[32];
-        }
-
-        public void reset() {
-            m_dataLength = 0;
-            m_depth = 0;
-        }
-
-        public int getCurrentCount() {
-            if (m_dataLength == 0) {
-                return 0;
-            }
-            int offset = m_dataLength - 1;
-            return m_data[offset];
-        }
-
-        public int getAccumulatedCount(int depth) {
-            if (m_dataLength == 0 || depth < 0) {
-                return 0;
-            }
-            if (depth > m_depth) {
-                depth = m_depth;
-            }
-            int accumulatedCount = 0;
-            int offset = 0;
-            for (; depth != 0; --depth) {
-                int count = m_data[offset];
-                accumulatedCount += count;
-                offset += (2 + count * 2);
-            }
-            return accumulatedCount;
-        }
-
-        public void push(int prefix, int uri) {
-            if (m_depth == 0) {
-                increaseDepth();
-            }
-            ensureDataCapacity(2);
-            int offset = m_dataLength - 1;
-            int count = m_data[offset];
-            m_data[offset - 1 - count * 2] = count + 1;
-            m_data[offset] = prefix;
-            m_data[offset + 1] = uri;
-            m_data[offset + 2] = count + 1;
-            m_dataLength += 2;
-        }
-
-        public boolean pop() {
-            if (m_dataLength == 0) {
-                return false;
-            }
-            int offset = m_dataLength - 1;
-            int count = m_data[offset];
-            if (count == 0) {
-                return false;
-            }
-            count -= 1;
-            offset -= 2;
-            m_data[offset] = count;
-            offset -= (1 + count * 2);
-            m_data[offset] = count;
-            m_dataLength -= 2;
-            return true;
-        }
-
-        public int getPrefix(int index) {
-            return get(index, true);
-        }
-
-        public int getUri(int index) {
-            return get(index, false);
-        }
-
-        public int findPrefix(int uri) {
-            return find(uri, false);
-        }
-
-        public int getDepth() {
-            return m_depth;
-        }
-
-        public void increaseDepth() {
-            ensureDataCapacity(2);
-            int offset = m_dataLength;
-            m_data[offset] = 0;
-            m_data[offset + 1] = 0;
-            m_dataLength += 2;
-            m_depth += 1;
-        }
-
-        public void decreaseDepth() {
-            if (m_dataLength == 0) {
-                return;
-            }
-            int offset = m_dataLength - 1;
-            int count = m_data[offset];
-            if ((offset - 1 - count * 2) == 0) {
-                return;
-            }
-            m_dataLength -= 2 + count * 2;
-            m_depth -= 1;
-        }
-
-        private void ensureDataCapacity(int capacity) {
-            int available = (m_data.length - m_dataLength);
-            if (available > capacity) {
-                return;
-            }
-            int newLength = (m_data.length + available) * 2;
-            int[] newData = new int[newLength];
-            System.arraycopy(m_data, 0, newData, 0, m_dataLength);
-            m_data = newData;
-        }
-
-        private int find(int prefixOrUri, boolean prefix) {
-            if (m_dataLength == 0) {
-                return -1;
-            }
-            int offset = m_dataLength - 1;
-            for (int i = m_depth; i != 0; --i) {
-                int count = m_data[offset];
-                offset -= 2;
-                for (; count != 0; --count) {
-                    if (prefix) {
-                        if (m_data[offset] == prefixOrUri) {
-                            return m_data[offset + 1];
-                        }
-                    } else {
-                        if (m_data[offset + 1] == prefixOrUri) {
-                            return m_data[offset];
-                        }
-                    }
-                    offset -= 2;
-                }
-            }
-            return -1;
-        }
-
-        private int get(int index, boolean prefix) {
-            if (m_dataLength == 0 || index < 0) {
-                return -1;
-            }
-            int offset = 0;
-            for (int i = m_depth; i != 0; --i) {
-                int count = m_data[offset];
-                if (index >= count) {
-                    index -= count;
-                    offset += (2 + count * 2);
-                    continue;
-                }
-                offset += (1 + index * 2);
-                if (!prefix) {
-                    offset += 1;
-                }
-                return m_data[offset];
-            }
-            return -1;
-        }
-
-        private int[] m_data;
-        private int m_dataLength;
-        private int m_depth;
-    }
-
-    private int getAttributeOffset(int index) {
-        if (m_event != START_TAG) {
-            throw new IndexOutOfBoundsException("Current event is not START_TAG.");
-        }
-        int offset = index * ATTRIBUTE_LENGTH;
-        if (offset >= m_attributes.length) {
-            throw new IndexOutOfBoundsException("Invalid attribute index (" + index + ").");
-        }
-        return offset;
-    }
-
-    private int findAttribute(String namespace, String attribute) {
-        if (m_strings == null || attribute == null) {
-            return -1;
-        }
-        int name = m_strings.find(attribute);
-        if (name == -1) {
-            return -1;
-        }
-        int uri = (namespace != null) ? m_strings.find(namespace) : -1;
-        for (int o = 0; o != m_attributes.length; o += ATTRIBUTE_LENGTH) {
-            if (name == m_attributes[o + ATTRIBUTE_IX_NAME]
-                    && (uri == -1 || uri == m_attributes[o + ATTRIBUTE_IX_NAMESPACE_URI])) {
-                return o / ATTRIBUTE_LENGTH;
-            }
-        }
-        return -1;
-    }
-
-    private void resetEventInfo() {
-        m_event = -1;
-        m_lineNumber = -1;
-        m_name = -1;
-        m_namespaceUri = -1;
-        m_attributes = null;
-        m_idAttribute = -1;
-        m_classAttribute = -1;
-        m_styleAttribute = -1;
-    }
-
-    private void doNext() throws IOException {
-        // Delayed initialization.
-        if (m_strings == null) {
-            m_reader.skipCheckInt(CHUNK_AXML_FILE, CHUNK_AXML_FILE_BROKEN);
-
-            /*
-             * chunkSize
-             */
-            m_reader.skipInt();
-            m_strings = StringBlock.read(m_reader);
-            m_namespaces.increaseDepth();
-            m_operational = true;
-        }
-
-        if (m_event == END_DOCUMENT) {
-            return;
-        }
-
-        int event = m_event;
-        resetEventInfo();
-
-        while (true) {
-            if (m_decreaseDepth) {
-                m_decreaseDepth = false;
-                m_namespaces.decreaseDepth();
-            }
-
-            // Fake END_DOCUMENT event.
-            if (event == END_TAG && m_namespaces.getDepth() == 1 && m_namespaces.getCurrentCount() == 0) {
-                m_event = END_DOCUMENT;
-                break;
-            }
-
-            int chunkType;
-            if (event == START_DOCUMENT) {
-                // Fake event, see CHUNK_XML_START_TAG handler.
-                chunkType = CHUNK_XML_START_TAG;
-            } else {
-                chunkType = m_reader.readInt();
-            }
-
-            if (chunkType == CHUNK_RESOURCEIDS) {
-                int chunkSize = m_reader.readInt();
-                if (chunkSize < 8 || (chunkSize % 4) != 0) {
-                    throw new IOException("Invalid resource ids size (" + chunkSize + ").");
-                }
-                m_resourceIDs = m_reader.readIntArray(chunkSize / 4 - 2);
-                continue;
-            }
-
-            if (chunkType < CHUNK_XML_FIRST || chunkType > CHUNK_XML_LAST) {
-                throw new IOException("Invalid chunk type (" + chunkType + ").");
-            }
-
-            // Fake START_DOCUMENT event.
-            if (chunkType == CHUNK_XML_START_TAG && event == -1) {
-                m_event = START_DOCUMENT;
-                break;
-            }
-
-            // Common header.
-            /* chunkSize */m_reader.skipInt();
-            int lineNumber = m_reader.readInt();
-            /* 0xFFFFFFFF */m_reader.skipInt();
-
-            if (chunkType == CHUNK_XML_START_NAMESPACE || chunkType == CHUNK_XML_END_NAMESPACE) {
-                if (chunkType == CHUNK_XML_START_NAMESPACE) {
-                    int prefix = m_reader.readInt();
-                    int uri = m_reader.readInt();
-                    m_namespaces.push(prefix, uri);
-                } else {
-                    /* prefix */m_reader.skipInt();
-                    /* uri */m_reader.skipInt();
-                    m_namespaces.pop();
-                }
-                continue;
-            }
-
-            m_lineNumber = lineNumber;
-
-            if (chunkType == CHUNK_XML_START_TAG) {
-                m_namespaceUri = m_reader.readInt();
-                m_name = m_reader.readInt();
-                /* flags? */m_reader.skipInt();
-                int attributeCount = m_reader.readInt();
-                m_idAttribute = (attributeCount >>> 16) - 1;
-                attributeCount &= 0xFFFF;
-                m_classAttribute = m_reader.readInt();
-                m_styleAttribute = (m_classAttribute >>> 16) - 1;
-                m_classAttribute = (m_classAttribute & 0xFFFF) - 1;
-                m_attributes = m_reader.readIntArray(attributeCount * ATTRIBUTE_LENGTH);
-                for (int i = ATTRIBUTE_IX_VALUE_TYPE; i < m_attributes.length; ) {
-                    m_attributes[i] = (m_attributes[i] >>> 24);
-                    i += ATTRIBUTE_LENGTH;
-                }
-                m_namespaces.increaseDepth();
-                m_event = START_TAG;
-                break;
-            }
-
-            if (chunkType == CHUNK_XML_END_TAG) {
-                m_namespaceUri = m_reader.readInt();
-                m_name = m_reader.readInt();
-                m_event = END_TAG;
-                m_decreaseDepth = true;
-                break;
-            }
-
-            if (chunkType == CHUNK_XML_TEXT) {
-                m_name = m_reader.readInt();
-                /* ? */m_reader.skipInt();
-                /* ? */m_reader.skipInt();
-                m_event = TEXT;
-                break;
-            }
-        }
-    }
-
-    private void setFirstError(AndrolibException error) {
-        if (mFirstError == null) {
-            mFirstError = error;
-        }
-    }
-
-    // ///////////////////////////////// data
-    /*
-     * All values are essentially indices, e.g. m_name is an index of name in
-     * m_strings.
-     */
-    private ExtDataInput m_reader;
-    private ResAttrDecoder mAttrDecoder;
-    private AndrolibException mFirstError;
-
-    private boolean m_operational = false;
-    private StringBlock m_strings;
-    private int[] m_resourceIDs;
-    private final NamespaceStack m_namespaces = new NamespaceStack();
-    private final String android_ns = "http://schemas.android.com/apk/res/android";
-    private boolean m_decreaseDepth;
-    private int m_event;
-    private int m_lineNumber;
-    private int m_name;
-    private int m_namespaceUri;
-    private int[] m_attributes;
-    private int m_idAttribute;
-    private int m_classAttribute;
-    private int m_styleAttribute;
-
-    private static final String E_NOT_SUPPORTED = "Method is not supported.";
-    private static final int ATTRIBUTE_IX_NAMESPACE_URI = 0,
-            ATTRIBUTE_IX_NAME = 1, ATTRIBUTE_IX_VALUE_STRING = 2,
-            ATTRIBUTE_IX_VALUE_TYPE = 3, ATTRIBUTE_IX_VALUE_DATA = 4,
-            ATTRIBUTE_LENGTH = 5;
-
-    private static final int CHUNK_AXML_FILE = 0x00080003, CHUNK_AXML_FILE_BROKEN = 0x00080001,
-            CHUNK_RESOURCEIDS = 0x00080180, CHUNK_XML_FIRST = 0x00100100,
-            CHUNK_XML_START_NAMESPACE = 0x00100100,
-            CHUNK_XML_END_NAMESPACE = 0x00100101,
-            CHUNK_XML_START_TAG = 0x00100102, CHUNK_XML_END_TAG = 0x00100103,
-            CHUNK_XML_TEXT = 0x00100104, CHUNK_XML_LAST = 0x00100104;
-
-    private static final int PRIVATE_PKG_ID = 0x7F;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/AndroidManifestResourceParser.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/AndroidManifestResourceParser.java
deleted file mode 100644
index 1ecfaf3..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/AndroidManifestResourceParser.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import java.util.regex.Pattern;
-
-import brut.androlib.res.util.TypedValue;
-
-/**
- * AXmlResourceParser specifically for parsing encoded AndroidManifest.xml.
- */
-public class AndroidManifestResourceParser extends AXmlResourceParser {
-
-    /**
-     * Pattern for matching numeric string meta-data values. aapt automatically infers the
-     * type for a manifest meta-data value based on the string in the unencoded XML. However,
-     * some apps intentionally coerce integers to be strings by prepending an escaped space.
-     * For details/discussion, see <a href="https://stackoverflow.com/questions/2154945/how-to-force-a-meta-data-value-to-type-string">...</a>
-     * With aapt1, the escaped space is dropped when encoded. For aapt2, the escaped space is preserved.
-     */
-    private static final Pattern PATTERN_NUMERIC_STRING = Pattern.compile("\\s?\\d+");
-
-    @Override
-    public String getAttributeValue(int index) {
-        String value = super.getAttributeValue(index);
-        if (value == null) {
-            return "";
-        }
-
-        if (!isNumericStringMetadataAttributeValue(index, value)) {
-            return value;
-        }
-
-        // Patch the numeric string value by prefixing it with an escaped space.
-        // Otherwise, when the decoded app is rebuilt, aapt will incorrectly encode
-        // the value as an int or float (depending on aapt version), breaking the original
-        // app functionality.
-        return "\\ " + value.trim();
-    }
-
-    private boolean isNumericStringMetadataAttributeValue(int index, String value) {
-        return "meta-data".equalsIgnoreCase(super.getName())
-            && "value".equalsIgnoreCase(super.getAttributeName(index))
-            && super.getAttributeValueType(index) == TypedValue.TYPE_STRING
-            && PATTERN_NUMERIC_STRING.matcher(value).matches();
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java
deleted file mode 100644
index 3a25495..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-
-import com.apkide.common.IOUtils;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.CantFind9PatchChunkException;
-import brut.util.ExtDataInput;
-
-public class Res9patchStreamDecoder implements ResStreamDecoder {
-    @Override
-    public void decode(InputStream in, OutputStream out) throws AndrolibException {
-        try {
-            byte[] data = IOUtils.readBytes(in);
-
-            if (data.length == 0) {
-                return;
-            }
-    
-            Bitmap im= BitmapFactory.decodeByteArray(data,0,data.length);
-            int w = im.getWidth(), h = im.getHeight();
-    
-            Bitmap im2 = Bitmap.createBitmap(w + 2, h + 2, Bitmap.Config.ARGB_8888);
-            Canvas canvas = new Canvas(im2);
-            canvas.drawBitmap(im, 1, 1, null);
-            
-            NinePatch np = getNinePatch(data);
-            drawHLine(im2, h + 1, np.padLeft + 1, w - np.padRight);
-            drawVLine(im2, w + 1, np.padTop + 1, h - np.padBottom);
-
-            int[] xDivs = np.xDivs;
-            if (xDivs.length == 0) {
-                drawHLine(im2, 0, 1, w);
-            } else {
-                for (int i = 0; i < xDivs.length; i += 2) {
-                    drawHLine(im2, 0, xDivs[i] + 1, xDivs[i + 1]);
-                }
-            }
-
-            int[] yDivs = np.yDivs;
-            if (yDivs.length == 0) {
-                drawVLine(im2, 0, 1, h);
-            } else {
-                for (int i = 0; i < yDivs.length; i += 2) {
-                    drawVLine(im2, 0, yDivs[i] + 1, yDivs[i + 1]);
-                }
-            }
-
-            // Some images additionally use Optical Bounds
-            // https://developer.android.com/about/versions/android-4.3.html#OpticalBounds
-            try {
-                OpticalInset oi = getOpticalInset(data);
-
-                for (int i = 0; i < oi.layoutBoundsLeft; i++) {
-                    int x = 1 + i;
-                    im2.setPixel(x, h + 1, OI_COLOR);
-                }
-
-                for (int i = 0; i < oi.layoutBoundsRight; i++) {
-                    int x = w - i;
-                    im2.setPixel(x, h + 1, OI_COLOR);
-                }
-
-                for (int i = 0; i < oi.layoutBoundsTop; i++) {
-                    int y = 1 + i;
-                    im2.setPixel(w + 1, y, OI_COLOR);
-                }
-
-                for (int i = 0; i < oi.layoutBoundsBottom; i++) {
-                    int y = h - i;
-                    im2.setPixel(w + 1, y, OI_COLOR);
-                }
-            } catch (CantFind9PatchChunkException t) {
-                // This chunk might not exist
-            }
-
-            im2.compress(Bitmap.CompressFormat.PNG,0,out);
-        } catch (IOException | NullPointerException ex) {
-            // In my case this was triggered because a .png file was
-            // containing a html document instead of an image.
-            // This could be more verbose and try to MIME ?
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private NinePatch getNinePatch(byte[] data) throws AndrolibException,
-        IOException {
-        ExtDataInput di = new ExtDataInput(new ByteArrayInputStream(data));
-        find9patchChunk(di, NP_CHUNK_TYPE);
-        return NinePatch.decode(di);
-    }
-
-    private OpticalInset getOpticalInset(byte[] data) throws AndrolibException,
-        IOException {
-        ExtDataInput di = new ExtDataInput(new ByteArrayInputStream(data));
-        find9patchChunk(di, OI_CHUNK_TYPE);
-        return OpticalInset.decode(di);
-    }
-
-    private void find9patchChunk(DataInput di, int magic) throws AndrolibException,
-        IOException {
-        di.skipBytes(8);
-        while (true) {
-            int size;
-            try {
-                size = di.readInt();
-            } catch (IOException ex) {
-                throw new CantFind9PatchChunkException("Cant find nine patch chunk", ex);
-            }
-            if (di.readInt() == magic) {
-                return;
-            }
-            di.skipBytes(size + 4);
-        }
-    }
-    
-    private void drawHLine(Bitmap im, int y, int x1, int x2) {
-        for (int x = x1; x <= x2; x++) {
-            im.setPixel(x, y, NP_COLOR);
-        }
-    }
-    
-    private void drawVLine(Bitmap im, int x, int y1, int y2) {
-        for (int y = y1; y <= y2; y++) {
-            im.setPixel(x, y, NP_COLOR);
-        }
-    }
-    private static final int NP_CHUNK_TYPE = 0x6e705463; // npTc
-    private static final int OI_CHUNK_TYPE = 0x6e704c62; // npLb
-    private static final int NP_COLOR = 0xff000000;
-    private static final int OI_COLOR = 0xffff0000;
-
-    private static class NinePatch {
-        public final int padLeft, padRight, padTop, padBottom;
-        public final int[] xDivs, yDivs;
-
-        public NinePatch(int padLeft, int padRight, int padTop, int padBottom,
-                         int[] xDivs, int[] yDivs) {
-            this.padLeft = padLeft;
-            this.padRight = padRight;
-            this.padTop = padTop;
-            this.padBottom = padBottom;
-            this.xDivs = xDivs;
-            this.yDivs = yDivs;
-        }
-
-        public static NinePatch decode(ExtDataInput di) throws IOException {
-            di.skipBytes(1); // wasDeserialized
-            byte numXDivs = di.readByte();
-            byte numYDivs = di.readByte();
-            di.skipBytes(1); // numColors
-            di.skipBytes(8); // xDivs/yDivs offset
-            int padLeft = di.readInt();
-            int padRight = di.readInt();
-            int padTop = di.readInt();
-            int padBottom = di.readInt();
-            di.skipBytes(4); // colorsOffset
-            int[] xDivs = di.readIntArray(numXDivs);
-            int[] yDivs = di.readIntArray(numYDivs);
-
-            return new NinePatch(padLeft, padRight, padTop, padBottom, xDivs, yDivs);
-        }
-    }
-
-    private static class OpticalInset {
-        public final int layoutBoundsLeft, layoutBoundsTop, layoutBoundsRight, layoutBoundsBottom;
-
-        public OpticalInset(int layoutBoundsLeft, int layoutBoundsTop,
-                            int layoutBoundsRight, int layoutBoundsBottom) {
-            this.layoutBoundsLeft = layoutBoundsLeft;
-            this.layoutBoundsTop = layoutBoundsTop;
-            this.layoutBoundsRight = layoutBoundsRight;
-            this.layoutBoundsBottom = layoutBoundsBottom;
-        }
-
-        public static OpticalInset decode(ExtDataInput di) throws IOException {
-            int layoutBoundsLeft = Integer.reverseBytes(di.readInt());
-            int layoutBoundsTop = Integer.reverseBytes(di.readInt());
-            int layoutBoundsRight = Integer.reverseBytes(di.readInt());
-            int layoutBoundsBottom = Integer.reverseBytes(di.readInt());
-            return new OpticalInset(layoutBoundsLeft, layoutBoundsTop,
-                layoutBoundsRight, layoutBoundsBottom);
-        }
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java
deleted file mode 100644
index 302ede5..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.UndefinedResObjectException;
-import brut.androlib.res.data.ResID;
-import brut.androlib.res.data.ResPackage;
-import brut.androlib.res.data.ResResSpec;
-import brut.androlib.res.data.value.ResAttr;
-import brut.androlib.res.data.value.ResScalarValue;
-
-public class ResAttrDecoder {
-    public String decode(int type, int value, String rawValue, int attrResId)
-            throws AndrolibException {
-        ResScalarValue resValue = mCurrentPackage.getValueFactory().factory(
-                type, value, rawValue);
-
-        String decoded = null;
-        if (attrResId > 0) {
-            try {
-                ResAttr attr = (ResAttr) getCurrentPackage().getResTable()
-                        .getResSpec(attrResId).getDefaultResource().getValue();
-
-                decoded = attr.convertToResXmlFormat(resValue);
-            } catch (UndefinedResObjectException | ClassCastException ex) {
-                // ignored
-            }
-        }
-
-        return decoded != null ? decoded : resValue.encodeAsResXmlAttr();
-    }
-
-    public String decodeManifestAttr(int attrResId)
-        throws AndrolibException {
-
-        if (attrResId != 0) {
-            int attrId = attrResId;
-
-            // See also: brut.androlib.res.data.ResTable.getResSpec
-            if (attrId >> 24 == 0) {
-                ResPackage pkg = getCurrentPackage();
-                int packageId = pkg.getId();
-                int pkgId = (packageId == 0 ? 2 : packageId);
-                attrId = (0xFF000000 & (pkgId << 24)) | attrId;
-            }
-
-            // Retrieve the ResSpec in a package by id
-            ResID resId = new ResID(attrId);
-            ResPackage pkg = getCurrentPackage();
-            if (pkg.hasResSpec(resId)) {
-                ResResSpec resResSpec = pkg.getResSpec(resId);
-                if (resResSpec != null) {
-                    return resResSpec.getName();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public ResPackage getCurrentPackage() throws AndrolibException {
-        if (mCurrentPackage == null) {
-            throw new AndrolibException("Current package not set");
-        }
-        return mCurrentPackage;
-    }
-
-    public void setCurrentPackage(ResPackage currentPackage) {
-        mCurrentPackage = currentPackage;
-    }
-
-    private ResPackage mCurrentPackage;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
deleted file mode 100644
index 1aa5506..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import com.apkide.common.AppLog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.CantFind9PatchChunkException;
-import brut.androlib.err.RawXmlEncounteredException;
-import brut.androlib.res.data.ResResource;
-import brut.androlib.res.data.value.ResBoolValue;
-import brut.androlib.res.data.value.ResFileValue;
-import brut.directory.DirUtil;
-import brut.directory.Directory;
-import brut.directory.DirectoryException;
-
-public class ResFileDecoder {
-    private final ResStreamDecoderContainer mDecoders;
-
-    public ResFileDecoder(ResStreamDecoderContainer decoders) {
-        this.mDecoders = decoders;
-    }
-
-    public void decode(ResResource res, Directory inDir, Directory outDir, Map<String, String> resFileMapping)
-            throws AndrolibException {
-
-        ResFileValue fileValue = (ResFileValue) res.getValue();
-        String inFilePath = fileValue.toString();
-        String inFileName = fileValue.getStrippedPath();
-        String outResName = res.getFilePath();
-        String typeName = res.getResSpec().getType().getName();
-
-        String ext = null;
-        String outFileName;
-        int extPos = inFileName.lastIndexOf(".");
-        if (extPos == -1) {
-            outFileName = outResName;
-        } else {
-            ext = inFileName.substring(extPos).toLowerCase();
-            outFileName = outResName + ext;
-        }
-
-        String outFilePath = "res/" + outFileName;
-        if (!inFilePath.equals(outFilePath)) {
-            resFileMapping.put(inFilePath, outFilePath);
-        }
-
-        try {
-            if (typeName.equals("raw")) {
-                decode(inDir, inFilePath, outDir, outFileName, "raw");
-                return;
-            }
-            if (typeName.equals("font") && !".xml".equals(ext)) {
-                decode(inDir, inFilePath, outDir, outFileName, "raw");
-                return;
-            }
-            if (typeName.equals("drawable") || typeName.equals("mipmap")) {
-                if (inFileName.toLowerCase().endsWith(".9" + ext)) {
-                    outFileName = outResName + ".9" + ext;
-
-                    // check for htc .r.9.png
-                    if (inFileName.toLowerCase().endsWith(".r.9" + ext)) {
-                        outFileName = outResName + ".r.9" + ext;
-                    }
-
-                    // check for raw 9patch images
-                    for (String extension : RAW_9PATCH_IMAGE_EXTENSIONS) {
-                        if (inFileName.toLowerCase().endsWith("." + extension)) {
-                            copyRaw(inDir, outDir, inFilePath, outFileName);
-                            return;
-                        }
-                    }
-
-                    // check for xml 9 patches which are just xml files
-                    if (inFileName.toLowerCase().endsWith(".xml")) {
-                        decode(inDir, inFilePath, outDir, outFileName, "xml");
-                        return;
-                    }
-
-                    try {
-                        decode(inDir, inFilePath, outDir, outFileName, "9patch");
-                        return;
-                    } catch (CantFind9PatchChunkException ex) {
-                        AppLog.e(ex);
-                        LOGGER.warning( String.format(
-                            "Cant find 9patch chunk in file: \"%s\". Renaming it to *.png.", inFileName
-                        ));
-                        outDir.removeFile(outFileName);
-                        outFileName = outResName + ext;
-                    }
-                }
-
-                // check for raw image
-                for (String extension : RAW_IMAGE_EXTENSIONS) {
-                    if (inFileName.toLowerCase().endsWith("." + extension)) {
-                        copyRaw(inDir, outDir, inFilePath, outFileName);
-                        return;
-                    }
-                }
-
-                if (!".xml".equals(ext)) {
-                    decode(inDir, inFilePath, outDir, outFileName, "raw");
-                    return;
-                }
-            }
-
-            decode(inDir, inFilePath, outDir, outFileName, "xml");
-        } catch (RawXmlEncounteredException ex) {
-            // If we got an error to decode XML, lets assume the file is in raw format.
-            // This is a large assumption, that might increase runtime, but will save us for situations where
-            // XSD files are AXML`d on aapt1, but left in plaintext in aapt2.
-            decode(inDir, inFilePath, outDir, outFileName, "raw");
-        } catch (AndrolibException ex) {
-            AppLog.e(ex);
-            LOGGER.error(String.format(
-                "Could not decode file, replacing by FALSE value: %s",
-            inFileName));
-            res.replace(new ResBoolValue(false, 0, null));
-        }
-    }
-
-    public void decode(Directory inDir, String inFileName, Directory outDir,
-                       String outFileName, String decoder) throws AndrolibException {
-        try (
-                InputStream in = inDir.getFileInput(inFileName);
-                OutputStream out = outDir.getFileOutput(outFileName)
-        ) {
-            mDecoders.decode(in, out, decoder);
-        } catch (DirectoryException | IOException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void copyRaw(Directory inDir, Directory outDir, String inFilename,
-                        String outFilename) throws AndrolibException {
-        try {
-            DirUtil.copyToDir(inDir, outDir, inFilename, outFilename);
-        } catch (DirectoryException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    public void decodeManifest(Directory inDir, String inFileName,
-                               Directory outDir, String outFileName) throws AndrolibException {
-        try (
-                InputStream in = inDir.getFileInput(inFileName);
-                OutputStream out = outDir.getFileOutput(outFileName)
-        ) {
-            ((XmlPullStreamDecoder) mDecoders.getDecoder("xml")).decodeManifest(in, out);
-        } catch (DirectoryException | IOException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-
-    private final static String[] RAW_IMAGE_EXTENSIONS = new String[] {
-        "m4a", // apple
-        "qmg", // samsung
-    };
-
-    private final static String[] RAW_9PATCH_IMAGE_EXTENSIONS = new String[] {
-        "qmg", // samsung
-        "spi", // samsung
-    };
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java
deleted file mode 100644
index ebf6976..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-
-import com.apkide.common.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import brut.androlib.err.AndrolibException;
-
-public class ResRawStreamDecoder implements ResStreamDecoder {
-    @Override
-    public void decode(InputStream in, OutputStream out)
-            throws AndrolibException {
-        try {
-            IOUtils.copyBytes(in, out);
-        } catch (IOException ex) {
-            throw new AndrolibException("Could not decode raw stream", ex);
-        }
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java
deleted file mode 100644
index 8f6371d..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import brut.androlib.err.AndrolibException;
-
-public interface ResStreamDecoder {
-    void decode(InputStream in, OutputStream out)
-            throws AndrolibException;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java
deleted file mode 100644
index 9df60b6..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import brut.androlib.err.AndrolibException;
-
-public class ResStreamDecoderContainer {
-    private final Map<String, ResStreamDecoder> mDecoders = new HashMap<>();
-
-    public void decode(InputStream in, OutputStream out, String decoderName)
-            throws AndrolibException {
-        getDecoder(decoderName).decode(in, out);
-    }
-
-    public ResStreamDecoder getDecoder(String name) throws AndrolibException {
-        ResStreamDecoder decoder = mDecoders.get(name);
-        if (decoder == null) {
-            throw new AndrolibException("Undefined decoder: " + name);
-        }
-        return decoder;
-    }
-
-    public void setDecoder(String name, ResStreamDecoder decoder) {
-        mDecoders.put(name, decoder);
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/StringBlock.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/StringBlock.java
deleted file mode 100644
index e66b1f7..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/StringBlock.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import com.google.common.annotations.VisibleForTesting;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import brut.androlib.res.xml.ResXmlEncoders;
-import brut.util.ExtDataInput;
-
-public class StringBlock {
-
-    /**
-     * Reads whole (including chunk type) string block from stream. Stream must
-     * be at the chunk type.
-     * @param reader ExtDataInput
-     * @return StringBlock
-     *
-     * @throws IOException Parsing resources.arsc error
-     */
-    public static StringBlock read(ExtDataInput reader) throws IOException {
-        reader.skipCheckChunkTypeInt(CHUNK_STRINGPOOL_TYPE, CHUNK_NULL_TYPE);
-        int chunkSize = reader.readInt();
-
-        // ResStringPool_header
-        int stringCount = reader.readInt();
-        int styleCount = reader.readInt();
-        int flags = reader.readInt();
-        int stringsOffset = reader.readInt();
-        int stylesOffset = reader.readInt();
-
-        StringBlock block = new StringBlock();
-        block.m_isUTF8 = (flags & UTF8_FLAG) != 0;
-        block.m_stringOffsets = reader.readIntArray(stringCount);
-
-        if (styleCount != 0) {
-            block.m_styleOffsets = reader.readIntArray(styleCount);
-        }
-
-        int size = ((stylesOffset == 0) ? chunkSize : stylesOffset) - stringsOffset;
-        block.m_strings = new byte[size];
-        reader.readFully(block.m_strings);
-
-        if (stylesOffset != 0) {
-            size = (chunkSize - stylesOffset);
-            block.m_styles = reader.readIntArray(size / 4);
-
-            // read remaining bytes
-            int remaining = size % 4;
-            if (remaining >= 1) {
-                while (remaining-- > 0) {
-                    reader.readByte();
-                }
-            }
-        }
-
-        return block;
-    }
-
-    /**
-     * Returns raw string (without any styling information) at specified index.
-     * @param index int
-     * @return String
-     */
-    public String getString(int index) {
-        if (index < 0 || m_stringOffsets == null || index >= m_stringOffsets.length) {
-            return null;
-        }
-        int offset = m_stringOffsets[index];
-        int length;
-
-        int[] val;
-        if (m_isUTF8) {
-            val = getUtf8(m_strings, offset);
-            offset = val[0];
-        } else {
-            val = getUtf16(m_strings, offset);
-            offset += val[0];
-        }
-        length = val[1];
-        return decodeString(offset, length);
-    }
-
-    /**
-     * @param index Location (index) of string to process to HTML
-     * @return String Returns string with style tags (html-like).
-     */
-    public String getHTML(int index) {
-        String text = getString(index);
-        if (text == null) {
-            return null;
-        }
-        int[] style = getStyle(index);
-        if (style == null) {
-            return ResXmlEncoders.escapeXmlChars(text);
-        }
-
-        // If the returned style is further in string, than string length. Lets skip it.
-        if (style[1] > text.length()) {
-            return ResXmlEncoders.escapeXmlChars(text);
-        }
-
-        // Convert styles to spans
-        List<StyledString.Span> spans = new ArrayList<>(style.length / 3);
-        for (int i = 0; i < style.length; i += 3) {
-            spans.add(new StyledString.Span(getString(style[i]), style[i + 1], style[i + 2]));
-        }
-        Collections.sort(spans);
-
-        StyledString styledString = new StyledString(text, spans);
-        return styledString.toString();
-    }
-
-    /**
-     * Finds index of the string. Returns -1 if the string was not found.
-     *
-     * @param string String to index location of
-     * @return int (Returns -1 if not found)
-     */
-    public int find(String string) {
-        if (string == null) {
-            return -1;
-        }
-        for (int i = 0; i != m_stringOffsets.length; ++i) {
-            int offset = m_stringOffsets[i];
-            int length = getShort(m_strings, offset);
-            if (length != string.length()) {
-                continue;
-            }
-            int j = 0;
-            for (; j != length; ++j) {
-                offset += 2;
-                if (string.charAt(j) != getShort(m_strings, offset)) {
-                    break;
-                }
-            }
-            if (j == length) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    private StringBlock() {
-    }
-
-    @VisibleForTesting
-    StringBlock(byte[] strings, boolean isUTF8) {
-        m_strings = strings;
-        m_isUTF8 = isUTF8;
-    }
-
-    /**
-     * Returns style information - array of int triplets, where in each triplet:
-     * * first int is index of tag name ('b','i', etc.) * second int is tag
-     * start index in string * third int is tag end index in string
-     */
-    private int[] getStyle(int index) {
-        if (m_styleOffsets == null || m_styles == null|| index >= m_styleOffsets.length) {
-            return null;
-        }
-        int offset = m_styleOffsets[index] / 4;
-        int count = 0;
-        int[] style;
-
-        for (int i = offset; i < m_styles.length; ++i) {
-            if (m_styles[i] == -1) {
-                break;
-            }
-            count += 1;
-        }
-
-        if (count == 0 || (count % 3) != 0) {
-            return null;
-        }
-        style = new int[count];
-
-        for (int i = offset, j = 0; i < m_styles.length;) {
-            if (m_styles[i] == -1) {
-                break;
-            }
-            style[j++] = m_styles[i++];
-        }
-        return style;
-    }
-
-    @VisibleForTesting
-    String decodeString(int offset, int length) {
-        try {
-            final ByteBuffer wrappedBuffer = ByteBuffer.wrap(m_strings, offset, length);
-            return (m_isUTF8 ? UTF8_DECODER : UTF16LE_DECODER).decode(wrappedBuffer).toString();
-        } catch (CharacterCodingException ex) {
-            if (!m_isUTF8) {
-                LOGGER.warning("Failed to decode a string at offset " + offset + " of length " + length);
-                return null;
-            }
-        }
-
-        try {
-            final ByteBuffer wrappedBufferRetry = ByteBuffer.wrap(m_strings, offset, length);
-            // in some places, Android uses 3-byte UTF-8 sequences instead of 4-bytes.
-            // If decoding failed, we try to use CESU-8 decoder, which is closer to what Android actually uses.
-            return CESU8_DECODER.decode(wrappedBufferRetry).toString();
-        } catch (CharacterCodingException e) {
-            LOGGER.warning("Failed to decode a string with CESU-8 decoder.");
-            return null;
-        }
-    }
-
-    private static int getShort(byte[] array, int offset) {
-        return (array[offset + 1] & 0xff) << 8 | array[offset] & 0xff;
-    }
-
-    private static int[] getUtf8(byte[] array, int offset) {
-        int val = array[offset];
-        int length;
-        // We skip the utf16 length of the string
-        if ((val & 0x80) != 0) {
-            offset += 2;
-        } else {
-            offset += 1;
-        }
-        // And we read only the utf-8 encoded length of the string
-        val = array[offset];
-        offset += 1;
-        if ((val & 0x80) != 0) {
-        	int low = (array[offset] & 0xFF);
-        	length = ((val & 0x7F) << 8) + low;
-            offset += 1;
-        } else {
-            length = val;
-        }
-        return new int[] { offset, length};
-    }
-
-    private static int[] getUtf16(byte[] array, int offset) {
-        int val = ((array[offset + 1] & 0xFF) << 8 | array[offset] & 0xFF);
-
-        if ((val & 0x8000) != 0) {
-            int high = (array[offset + 3] & 0xFF) << 8;
-            int low = (array[offset + 2] & 0xFF);
-            int len_value =  ((val & 0x7FFF) << 16) + (high + low);
-            return new int[] {4, len_value * 2};
-
-        }
-        return new int[] {2, val * 2};
-    }
-
-    private int[] m_stringOffsets;
-    private byte[] m_strings;
-    private int[] m_styleOffsets;
-    private int[] m_styles;
-    private boolean m_isUTF8;
-
-    private final CharsetDecoder UTF16LE_DECODER = StandardCharsets.UTF_16LE.newDecoder();
-    private final CharsetDecoder UTF8_DECODER = StandardCharsets.UTF_8.newDecoder();
-    private final CharsetDecoder CESU8_DECODER = Charset.forName("CESU8").newDecoder();
-   
-    // ResChunk_header = header.type (0x0001) + header.headerSize (0x001C)
-    private static final int CHUNK_STRINGPOOL_TYPE = 0x001C0001;
-    private static final int CHUNK_NULL_TYPE = 0x00000000;
-    private static final int UTF8_FLAG = 0x00000100;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/StyledString.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/StyledString.java
deleted file mode 100644
index 4b91b59..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/StyledString.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import androidx.annotation.NonNull;
-
-import com.google.common.base.Splitter;
-import com.google.common.base.Splitter.MapSplitter;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
-
-import java.util.List;
-import java.util.Map;
-
-import brut.androlib.res.xml.ResXmlEncoders;
-
-public class StyledString {
-    private final String mText;
-    private final List<Span> mSpans;
-
-    public StyledString(String text, List<Span> spans) {
-        this.mText = text;
-        this.mSpans = spans;
-    }
-
-    String getText() {
-        return mText;
-    }
-
-    List<Span> getSpans() {
-        return mSpans;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return new Decoder().decode(this);
-    }
-
-    public static class Span implements Comparable<Span> {
-        private static final MapSplitter ATTRIBUTES_SPLITTER =
-            Splitter.on(';').omitEmptyStrings().withKeyValueSeparator(Splitter.on('=').limit(2));
-
-        private final String tag;
-        private final int firstChar;
-        private final int lastChar;
-
-        public Span(String tag, int firstChar, int lastChar) {
-            this.tag = tag;
-            this.firstChar = firstChar;
-            this.lastChar = lastChar;
-        }
-
-        public String getTag() {
-            return tag;
-        }
-
-        public int getFirstChar() {
-            return firstChar;
-        }
-
-        public int getLastChar() {
-            return lastChar;
-        }
-
-        public String getName() {
-            int separatorIdx = tag.indexOf(';');
-            return separatorIdx == -1 ? tag : tag.substring(0, separatorIdx);
-        }
-
-        public Map<String, String> getAttributes() {
-            int separatorIdx = tag.indexOf(';');
-            return separatorIdx == -1 ? null : ATTRIBUTES_SPLITTER.split(
-                tag.substring(separatorIdx + 1, tag.endsWith(";") ? tag.length() - 1 : tag.length())
-            );
-        }
-
-        @Override
-        public int compareTo(Span o) {
-            int res = Integer.compare(firstChar, o.firstChar);
-            if (res != 0) {
-                return res;
-            }
-            res = Integer.compare(lastChar, o.lastChar);
-            if (res != 0) {
-                return -res;
-            }
-            return -tag.compareTo(o.tag);
-        }
-    }
-
-    private static class Decoder {
-        private String text;
-        private StringBuilder xmlValue;
-        private int lastOffset;
-
-        String decode(StyledString styledString) {
-            text = styledString.getText();
-            xmlValue = new StringBuilder(text.length() * 2);
-            lastOffset = 0;
-
-            // recurse top-level tags
-            PeekingIterator<Span> it = Iterators.peekingIterator(styledString.getSpans().iterator());
-            while (it.hasNext()) {
-                decodeIterate(it);
-            }
-
-            // write the remaining encoded raw text
-            if (lastOffset < text.length()) {
-                xmlValue.append(ResXmlEncoders.escapeXmlChars(text.substring(lastOffset)));
-            }
-            return xmlValue.toString();
-        }
-
-        private void decodeIterate(PeekingIterator<Span> it) {
-            Span span = it.next();
-            String name = span.getName();
-            Map<String, String> attributes = span.getAttributes();
-            int spanStart = span.getFirstChar();
-            int spanEnd = span.getLastChar() + 1;
-
-            // write encoded raw text preceding the opening tag
-            if (spanStart > lastOffset) {
-                xmlValue.append(ResXmlEncoders.escapeXmlChars(text.substring(lastOffset, spanStart)));
-            }
-            lastOffset = spanStart;
-
-            // write opening tag
-            xmlValue.append('<').append(name);
-            if (attributes != null) {
-                for (Map.Entry<String, String> attrEntry : attributes.entrySet()) {
-                    xmlValue.append(' ').append(attrEntry.getKey()).append("=\"")
-                            .append(ResXmlEncoders.escapeXmlChars(attrEntry.getValue())).append('"');
-                }
-            }
-            // if an opening tag is followed by a matching closing tag, write as an empty-element tag
-            if (spanStart == spanEnd) {
-                xmlValue.append("/>");
-                return;
-            }
-            xmlValue.append('>');
-
-            // recurse nested tags
-            while (it.hasNext() && it.peek().getFirstChar() < spanEnd) {
-                decodeIterate(it);
-            }
-
-            // write encoded raw text preceding the closing tag
-            if (spanEnd > lastOffset) {
-                xmlValue.append(ResXmlEncoders.escapeXmlChars(text.substring(lastOffset, spanEnd)));
-            }
-            lastOffset = spanEnd;
-
-            // write closing tag
-            xmlValue.append("</").append(name).append('>');
-        }
-    }
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java
deleted file mode 100644
index 2c3a3a5..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.wrapper.XmlPullParserWrapper;
-import org.xmlpull.v1.wrapper.XmlPullWrapperFactory;
-import org.xmlpull.v1.wrapper.XmlSerializerWrapper;
-import org.xmlpull.v1.wrapper.classic.StaticXmlSerializerWrapper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.err.AXmlDecodingException;
-import brut.androlib.err.RawXmlEncounteredException;
-import brut.androlib.res.data.ResTable;
-import brut.androlib.res.util.ExtXmlSerializer;
-
-public class XmlPullStreamDecoder implements ResStreamDecoder {
-    public XmlPullStreamDecoder(XmlPullParser parser,
-                                ExtXmlSerializer serializer) {
-        this.mParser = parser;
-        this.mSerial = serializer;
-    }
-
-    @Override
-    public void decode(InputStream in, OutputStream out)
-            throws AndrolibException {
-        try {
-            XmlPullWrapperFactory factory = XmlPullWrapperFactory.newInstance();
-            XmlPullParserWrapper par = factory.newPullParserWrapper(mParser);
-            final ResTable resTable = ((AXmlResourceParser) mParser).getAttrDecoder().getCurrentPackage().getResTable();
-
-            XmlSerializerWrapper ser = new StaticXmlSerializerWrapper(mSerial, factory) {
-                boolean hideSdkInfo = false;
-                boolean hidePackageInfo = false;
-
-                @Override
-                public void event(XmlPullParser pp)
-                        throws XmlPullParserException, IOException {
-                    int type = pp.getEventType();
-
-                    if (type == XmlPullParser.START_TAG) {
-                        if ("manifest".equalsIgnoreCase(pp.getName())) {
-                            hidePackageInfo = parseManifest(pp);
-                        } else if ("uses-sdk".equalsIgnoreCase(pp.getName())) {
-                            hideSdkInfo = parseAttr(pp);
-                            if (hideSdkInfo) {
-                                return;
-                            }
-                        }
-                    } else if (hideSdkInfo && type == XmlPullParser.END_TAG
-                            && "uses-sdk".equalsIgnoreCase(pp.getName())) {
-                        return;
-                    } else if (hidePackageInfo && type == XmlPullParser.END_TAG
-                            && "manifest".equalsIgnoreCase(pp.getName())) {
-                        super.event(pp);
-                        return;
-                    }
-                    super.event(pp);
-                }
-
-                private boolean parseManifest(XmlPullParser pp) {
-                    String attr_name;
-
-                    // read <manifest> for package:
-                    for (int i = 0; i < pp.getAttributeCount(); i++) {
-                        attr_name = pp.getAttributeName(i);
-
-                        if (attr_name.equalsIgnoreCase(("package"))) {
-                            resTable.setPackageRenamed(pp.getAttributeValue(i));
-                        } else if (attr_name.equalsIgnoreCase("versionCode")) {
-                            resTable.setVersionCode(pp.getAttributeValue(i));
-                        } else if (attr_name.equalsIgnoreCase("versionName")) {
-                            resTable.setVersionName(pp.getAttributeValue(i));
-                        }
-                    }
-                    return true;
-                }
-
-                private boolean parseAttr(XmlPullParser pp) {
-                    for (int i = 0; i < pp.getAttributeCount(); i++) {
-                        final String a_ns = "http://schemas.android.com/apk/res/android";
-                        String ns = pp.getAttributeNamespace(i);
-
-                        if (a_ns.equalsIgnoreCase(ns)) {
-                            String name = pp.getAttributeName(i);
-                            String value = pp.getAttributeValue(i);
-                            if (name != null && value != null) {
-                                if (name.equalsIgnoreCase("minSdkVersion")
-                                        || name.equalsIgnoreCase("targetSdkVersion")
-                                        || name.equalsIgnoreCase("maxSdkVersion")
-                                        || name.equalsIgnoreCase("compileSdkVersion")) {
-                                    resTable.addSdkInfo(name, value);
-                                } else {
-                                    resTable.clearSdkInfo();
-                                    return false; // Found unknown flags
-                                }
-                            }
-                        } else {
-                            resTable.clearSdkInfo();
-
-                            if (i >= pp.getAttributeCount()) {
-                                return false; // Found unknown flags
-                            }
-                        }
-                    }
-
-                    return ! resTable.getAnalysisMode();
-                }
-            };
-
-            par.setInput(in, null);
-            ser.setOutput(out, null);
-
-            while (par.nextToken() != XmlPullParser.END_DOCUMENT) {
-                ser.event(par);
-            }
-            ser.flush();
-        } catch (XmlPullParserException ex) {
-            throw new AXmlDecodingException("Could not decode XML", ex);
-        } catch (IOException ex) {
-            throw new RawXmlEncounteredException("Could not decode XML", ex);
-        }
-    }
-
-    public void decodeManifest(InputStream in, OutputStream out)
-            throws AndrolibException {
-            decode(in, out);
-    }
-
-    private final XmlPullParser mParser;
-    private final ExtXmlSerializer mSerial;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/decoder/XmlResourceParser.java b/apktool/androlib/src/main/java/brut/androlib/res/decoder/XmlResourceParser.java
deleted file mode 100644
index b10a28b..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/decoder/XmlResourceParser.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * 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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package brut.androlib.res.decoder;
-
-import org.xmlpull.v1.XmlPullParser;
-
-import brut.androlib.res.util.AttributeSet;
-
-/**
- * The XML parsing interface returned for an XML resource. This is a standard
- * XmlPullParser interface, as well as an extended AttributeSet interface and an
- * additional close() method on this interface for the client to indicate when
- * it is done reading the resource.
- */
-public interface XmlResourceParser extends XmlPullParser, AttributeSet {
-    /**
-     * Close this interface to the resource. Calls on the interface are no
-     * longer value after this call.
-     */
-    void close();
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/util/AttributeSet.java b/apktool/androlib/src/main/java/brut/androlib/res/util/AttributeSet.java
deleted file mode 100644
index dcc347f..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/util/AttributeSet.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2008 Android4ME / Dmitry Skiba
- *
- * 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
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package brut.androlib.res.util;
-
-public interface AttributeSet {
-    int getAttributeCount();
-
-    String getAttributeName(int index);
-
-    String getAttributeValue(int index);
-
-    String getPositionDescription();
-
-    int getAttributeNameResource(int index);
-
-    int getAttributeListValue(int index, String[] options, int defaultValue);
-
-    boolean getAttributeBooleanValue(int index, boolean defaultValue);
-
-    int getAttributeResourceValue(int index, int defaultValue);
-
-    int getAttributeIntValue(int index, int defaultValue);
-
-    int getAttributeUnsignedIntValue(int index, int defaultValue);
-
-    float getAttributeFloatValue(int index, float defaultValue);
-
-    String getIdAttribute();
-
-    String getClassAttribute();
-
-    int getIdAttributeResourceValue(int index);
-
-    int getStyleAttribute();
-
-    String getAttributeValue(String namespace, String attribute);
-
-    int getAttributeListValue(String namespace, String attribute, String[] options, int defaultValue);
-
-    boolean getAttributeBooleanValue(String namespace, String attribute, boolean defaultValue);
-
-    int getAttributeResourceValue(String namespace, String attribute, int defaultValue);
-
-    int getAttributeIntValue(String namespace, String attribute, int defaultValue);
-
-    int getAttributeUnsignedIntValue(String namespace, String attribute, int defaultValue);
-
-    float getAttributeFloatValue(String namespace, String attribute, float defaultValue);
-
-    // TODO: remove
-    int getAttributeValueType(int index);
-
-    int getAttributeValueData(int index);
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java b/apktool/androlib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java
deleted file mode 100644
index b644370..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.util;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-public class ExtMXSerializer extends MXSerializer implements ExtXmlSerializer {
-    @Override
-    public void startDocument(String encoding, Boolean standalone)
-            throws IOException, IllegalArgumentException, IllegalStateException {
-        super.startDocument(encoding != null ? encoding : mDefaultEncoding, standalone);
-        this.newLine();
-    }
-
-    @Override
-    protected void writeAttributeValue(String value, Writer out) throws IOException {
-        if (mIsDisabledAttrEscape) {
-            out.write(value == null ? "" : value);
-            return;
-        }
-        super.writeAttributeValue(value, out);
-    }
-
-    @Override
-    public void setOutput(OutputStream os, String encoding) throws IOException {
-        super.setOutput(os, encoding != null ? encoding : mDefaultEncoding);
-    }
-
-    @Override
-    public Object getProperty(String name) throws IllegalArgumentException {
-        if (PROPERTY_DEFAULT_ENCODING.equals(name)) {
-            return mDefaultEncoding;
-        }
-        return super.getProperty(name);
-    }
-
-    @Override
-    public void setProperty(String name, Object value) throws IllegalArgumentException, IllegalStateException {
-        if (PROPERTY_DEFAULT_ENCODING.equals(name)) {
-            mDefaultEncoding = (String) value;
-        } else {
-            super.setProperty(name, value);
-        }
-    }
-
-    @Override
-    public ExtXmlSerializer newLine() throws IOException {
-        super.out.write(lineSeparator);
-        return this;
-    }
-
-    @Override
-    public void setDisabledAttrEscape(boolean disabled) {
-        mIsDisabledAttrEscape = disabled;
-    }
-
-    private String mDefaultEncoding;
-    private boolean mIsDisabledAttrEscape = false;
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/util/ExtXmlSerializer.java b/apktool/androlib/src/main/java/brut/androlib/res/util/ExtXmlSerializer.java
deleted file mode 100644
index 3e4592e..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/util/ExtXmlSerializer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.util;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-public interface ExtXmlSerializer extends XmlSerializer {
-
-    ExtXmlSerializer newLine() throws IOException;
-
-    void setDisabledAttrEscape(boolean disabled);
-
-    String PROPERTY_SERIALIZER_INDENTATION = "http://xmlpull.org/v1/doc/properties.html#serializer-indentation";
-    String PROPERTY_SERIALIZER_LINE_SEPARATOR = "http://xmlpull.org/v1/doc/properties.html#serializer-line-separator";
-    String PROPERTY_DEFAULT_ENCODING = "DEFAULT_ENCODING";
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/util/MXSerializer.java b/apktool/androlib/src/main/java/brut/androlib/res/util/MXSerializer.java
deleted file mode 100644
index 7600aef..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/util/MXSerializer.java
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.util;
-
-import com.apkide.common.AppLog;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-/**
- * Implementation of XmlSerializer interface from XmlPull V1 API. This
- * implementation is optimized for performance and low memory footprint.
- *
- * <p>
- * Implemented features:
- * <ul>
- * <li>FEATURE_NAMES_INTERNED - when enabled all returned names (namespaces,
- * prefixes) will be interned and it is required that all names passed as
- * arguments MUST be interned
- * <li>FEATURE_SERIALIZER_ATTVALUE_USE_APOSTROPHE
- * </ul>
- * <p>
- * Implemented properties:
- * <ul>
- * <li>PROPERTY_SERIALIZER_INDENTATION
- * <li>PROPERTY_SERIALIZER_LINE_SEPARATOR
- * </ul>
- *
- */
-public class MXSerializer implements XmlSerializer {
-	protected final static String XML_URI = "http://www.w3.org/XML/1998/namespace";
-	protected final static String XMLNS_URI = "http://www.w3.org/2000/xmlns/";
-	private static final boolean TRACE_SIZING = false;
-	private static final boolean TRACE_ESCAPING = false;
-
-	protected final String FEATURE_SERIALIZER_ATTVALUE_USE_APOSTROPHE = "http://xmlpull.org/v1/doc/features.html#serializer-attvalue-use-apostrophe";
-	protected final String FEATURE_NAMES_INTERNED = "http://xmlpull.org/v1/doc/features.html#names-interned";
-	protected final String PROPERTY_SERIALIZER_INDENTATION = "http://xmlpull.org/v1/doc/properties.html#serializer-indentation";
-	protected final String PROPERTY_SERIALIZER_LINE_SEPARATOR = "http://xmlpull.org/v1/doc/properties.html#serializer-line-separator";
-	protected final static String PROPERTY_LOCATION = "http://xmlpull.org/v1/doc/properties.html#location";
-
-	// properties/features
-	protected boolean namesInterned;
-	protected boolean attributeUseApostrophe;
-	protected String indentationString = null; // " ";
-	protected String lineSeparator = "\n";
-
-	protected String location;
-	protected Writer out;
-
-	protected int autoDeclaredPrefixes;
-
-	protected int depth = 0;
-
-	// element stack
-	protected String[] elNamespace = new String[2];
-	protected String[] elName = new String[elNamespace.length];
-	protected String[] elPrefix = new String[elNamespace.length];
-	protected int[] elNamespaceCount = new int[elNamespace.length];
-
-	// namespace stack
-	protected int namespaceEnd = 0;
-	protected String[] namespacePrefix = new String[8];
-	protected String[] namespaceUri = new String[namespacePrefix.length];
-
-	protected boolean finished;
-	protected boolean pastRoot;
-	protected boolean setPrefixCalled;
-	protected boolean startTagIncomplete;
-
-	protected boolean doIndent;
-	protected boolean seenTag;
-
-	protected boolean seenBracket;
-	protected boolean seenBracketBracket;
-
-	// buffer output if needed to write escaped String see text(String)
-	private static final int BUF_LEN = Runtime.getRuntime().freeMemory() > 1000000L ? 8 * 1024 : 256;
-	protected char[] buf = new char[BUF_LEN];
-
-	protected static final String[] precomputedPrefixes;
-
-	static {
-		precomputedPrefixes = new String[32]; // arbitrary number ...
-		for (int i = 0; i < precomputedPrefixes.length; i++) {
-			precomputedPrefixes[i] = ("n" + i).intern();
-		}
-	}
-
-	private final boolean checkNamesInterned = false;
-
-	private void checkInterning(String name) {
-		if (namesInterned && name != name.intern()) {
-			throw new IllegalArgumentException("all names passed as arguments must be interned"
-					+ "when NAMES INTERNED feature is enabled");
-		}
-	}
-
-	protected void reset() {
-		location = null;
-		out = null;
-		autoDeclaredPrefixes = 0;
-		depth = 0;
-
-		// nullify references on all levels to allow it to be GCed
-		for (int i = 0; i < elNamespaceCount.length; i++) {
-			elName[i] = null;
-			elPrefix[i] = null;
-			elNamespace[i] = null;
-			elNamespaceCount[i] = 2;
-		}
-
-		namespaceEnd = 0;
-
-		// TODO: how to prevent from reporting this namespace?
-		// this is special namespace declared for consistency with XML infoset
-		namespacePrefix[namespaceEnd] = "xmlns";
-		namespaceUri[namespaceEnd] = XMLNS_URI;
-		++namespaceEnd;
-
-		namespacePrefix[namespaceEnd] = "xml";
-		namespaceUri[namespaceEnd] = XML_URI;
-		++namespaceEnd;
-
-		finished = false;
-		pastRoot = false;
-		setPrefixCalled = false;
-		startTagIncomplete = false;
-		seenTag = false;
-
-		seenBracket = false;
-		seenBracketBracket = false;
-	}
-
-	protected void ensureElementsCapacity() {
-		final int elStackSize = elName.length;
-		final int newSize = (depth >= 7 ? 2 * depth : 8) + 2;
-
-		if (TRACE_SIZING) {
-			AppLog.e(getClass().getName() + " elStackSize "
-					+ elStackSize + " ==> " + newSize);
-		}
-		final boolean needsCopying = elStackSize > 0;
-		String[] arr;
-		// reuse arr local variable slot
-		arr = new String[newSize];
-		if (needsCopying)
-			System.arraycopy(elName, 0, arr, 0, elStackSize);
-		elName = arr;
-
-		arr = new String[newSize];
-		if (needsCopying)
-			System.arraycopy(elPrefix, 0, arr, 0, elStackSize);
-		elPrefix = arr;
-
-		arr = new String[newSize];
-		if (needsCopying)
-			System.arraycopy(elNamespace, 0, arr, 0, elStackSize);
-		elNamespace = arr;
-
-		final int[] iarr = new int[newSize];
-		if (needsCopying) {
-			System.arraycopy(elNamespaceCount, 0, iarr, 0, elStackSize);
-		} else {
-			// special initialization
-			iarr[0] = 0;
-		}
-		elNamespaceCount = iarr;
-	}
-
-	protected void ensureNamespacesCapacity() { // int size) {
-		final int newSize = namespaceEnd > 7 ? 2 * namespaceEnd : 8;
-		if (TRACE_SIZING) {
-			AppLog.e(getClass().getName() + " namespaceSize " + namespacePrefix.length + " ==> " + newSize);
-		}
-		final String[] newNamespacePrefix = new String[newSize];
-		final String[] newNamespaceUri = new String[newSize];
-		if (namespacePrefix != null) {
-			System.arraycopy(namespacePrefix, 0, newNamespacePrefix, 0, namespaceEnd);
-			System.arraycopy(namespaceUri, 0, newNamespaceUri, 0, namespaceEnd);
-		}
-		namespacePrefix = newNamespacePrefix;
-		namespaceUri = newNamespaceUri;
-	}
-
-	@Override
-	public void setFeature(String name, boolean state)
-			throws IllegalArgumentException, IllegalStateException {
-		if (name == null) {
-			throw new IllegalArgumentException("feature name can not be null");
-		}
-		if (FEATURE_NAMES_INTERNED.equals(name)) {
-			namesInterned = state;
-		} else if (FEATURE_SERIALIZER_ATTVALUE_USE_APOSTROPHE.equals(name)) {
-			attributeUseApostrophe = state;
-		} else {
-			throw new IllegalStateException("unsupported feature " + name);
-		}
-	}
-
-	@Override
-	public boolean getFeature(String name) throws IllegalArgumentException {
-		if (name == null) {
-			throw new IllegalArgumentException("feature name can not be null");
-		}
-		if (FEATURE_NAMES_INTERNED.equals(name)) {
-			return namesInterned;
-		} else if (FEATURE_SERIALIZER_ATTVALUE_USE_APOSTROPHE.equals(name)) {
-			return attributeUseApostrophe;
-		} else {
-			return false;
-		}
-	}
-
-	// precomputed variables to simplify writing indentation
-	protected int offsetNewLine;
-	protected int indentationJump;
-	protected char[] indentationBuf;
-	protected int maxIndentLevel;
-	protected boolean writeLineSepartor; // should end-of-line be written
-	protected boolean writeIndentation; // is indentation used?
-
-	/**
-	 * For maximum efficiency when writing indents the required output is
-	 * pre-computed This is internal function that recomputes buffer after user
-	 * requested chnages.
-	 */
-	protected void rebuildIndentationBuf() {
-		if (!doIndent)
-			return;
-		final int maxIndent = 65; // hardcoded maximum indentation size in characters
-		int bufSize = 0;
-		offsetNewLine = 0;
-		if (writeLineSepartor) {
-			offsetNewLine = lineSeparator.length();
-			bufSize += offsetNewLine;
-		}
-		maxIndentLevel = 0;
-		if (writeIndentation) {
-			indentationJump = indentationString.length();
-			maxIndentLevel = maxIndent / indentationJump;
-			bufSize += maxIndentLevel * indentationJump;
-		}
-		if (indentationBuf == null || indentationBuf.length < bufSize) {
-			indentationBuf = new char[bufSize + 8];
-		}
-		int bufPos = 0;
-		if (writeLineSepartor) {
-			for (int i = 0; i < lineSeparator.length(); i++) {
-				indentationBuf[bufPos++] = lineSeparator.charAt(i);
-			}
-		}
-		if (writeIndentation) {
-			for (int i = 0; i < maxIndentLevel; i++) {
-				for (int j = 0; j < indentationString.length(); j++) {
-					indentationBuf[bufPos++] = indentationString.charAt(j);
-				}
-			}
-		}
-	}
-
-	protected void writeIndent() throws IOException {
-		final int start = writeLineSepartor ? 0 : offsetNewLine;
-		final int level = Math.min(depth, maxIndentLevel);
-
-		out.write(indentationBuf, start, ((level - 1) * indentationJump) + offsetNewLine);
-	}
-
-	@Override
-	public void setProperty(String name, Object value)
-			throws IllegalArgumentException, IllegalStateException {
-		if (name == null) {
-			throw new IllegalArgumentException("property name can not be null");
-		}
-        switch (name) {
-            case PROPERTY_SERIALIZER_INDENTATION:
-                indentationString = (String) value;
-                break;
-            case PROPERTY_SERIALIZER_LINE_SEPARATOR:
-                lineSeparator = (String) value;
-                break;
-            case PROPERTY_LOCATION:
-                location = (String) value;
-                break;
-            default:
-                throw new IllegalStateException("unsupported property " + name);
-        }
-		writeLineSepartor = lineSeparator != null && lineSeparator.length() > 0;
-		writeIndentation = indentationString != null
-				&& indentationString.length() > 0;
-		// optimize - do not write when nothing to write ...
-		doIndent = indentationString != null
-				&& (writeLineSepartor || writeIndentation);
-		// NOTE: when indentationString == null there is no indentation
-		// (even though writeLineSeparator may be true ...)
-		rebuildIndentationBuf();
-		seenTag = false; // for consistency
-	}
-
-	@Override
-	public Object getProperty(String name) throws IllegalArgumentException {
-		if (name == null) {
-			throw new IllegalArgumentException("property name can not be null");
-		}
-        switch (name) {
-            case PROPERTY_SERIALIZER_INDENTATION:
-                return indentationString;
-            case PROPERTY_SERIALIZER_LINE_SEPARATOR:
-                return lineSeparator;
-            case PROPERTY_LOCATION:
-                return location;
-            default:
-                return null;
-        }
-	}
-
-	private String getLocation() {
-		return location != null ? " @" + location : "";
-	}
-
-	// this is special method that can be accessed directly to retrieve Writer
-	// serializer is using
-	public Writer getWriter() {
-		return out;
-	}
-
-	@Override
-	public void setOutput(Writer writer) {
-		reset();
-		out = writer;
-	}
-
-	@Override
-	public void setOutput(OutputStream os, String encoding) throws IOException {
-		if (os == null)
-			throw new IllegalArgumentException("output stream can not be null");
-		reset();
-		if (encoding != null) {
-			out = new OutputStreamWriter(os, encoding);
-		} else {
-			out = new OutputStreamWriter(os);
-		}
-	}
-
-	@Override
-	public void startDocument(String encoding, Boolean standalone)
-			throws IOException {
-		if (attributeUseApostrophe) {
-			out.write("<?xml version='1.0'");
-		} else {
-			out.write("<?xml version=\"1.0\"");
-		}
-		if (encoding != null) {
-			out.write(" encoding=");
-			out.write(attributeUseApostrophe ? '\'' : '"');
-			out.write(encoding);
-			out.write(attributeUseApostrophe ? '\'' : '"');
-		}
-		if (standalone != null) {
-			out.write(" standalone=");
-			out.write(attributeUseApostrophe ? '\'' : '"');
-			if (standalone) {
-				out.write("yes");
-			} else {
-				out.write("no");
-			}
-			out.write(attributeUseApostrophe ? '\'' : '"');
-		}
-		out.write("?>");
-	}
-
-	@Override
-	public void endDocument() throws IOException {
-		// close all unclosed tag;
-		while (depth > 0) {
-			endTag(elNamespace[depth], elName[depth]);
-		}
-		finished = pastRoot = startTagIncomplete = true;
-		out.flush();
-	}
-
-	@Override
-	public void setPrefix(String prefix, String namespace) throws IOException {
-		if (startTagIncomplete)
-			closeStartTag();
-
-		if (prefix == null) {
-			prefix = "";
-		}
-		if (!namesInterned) {
-			prefix = prefix.intern(); // will throw NPE if prefix==null
-		} else if (checkNamesInterned) {
-			checkInterning(prefix);
-		} else if (prefix == null) {
-			throw new IllegalArgumentException("prefix must be not null" + getLocation());
-		}
-
-		if (!namesInterned) {
-			namespace = namespace.intern();
-		} else if (checkNamesInterned) {
-			checkInterning(namespace);
-		} else if (namespace == null) {
-			throw new IllegalArgumentException("namespace must be not null" + getLocation());
-		}
-
-		if (namespaceEnd >= namespacePrefix.length) {
-			ensureNamespacesCapacity();
-		}
-		namespacePrefix[namespaceEnd] = prefix;
-		namespaceUri[namespaceEnd] = namespace;
-		++namespaceEnd;
-		setPrefixCalled = true;
-	}
-
-	protected String lookupOrDeclarePrefix(String namespace) {
-		return getPrefix(namespace, true);
-	}
-
-	@Override
-	public String getPrefix(String namespace, boolean generatePrefix) {
-		return getPrefix(namespace, generatePrefix, false);
-	}
-
-	protected String getPrefix(String namespace, boolean generatePrefix,
-			boolean nonEmpty) {
-		if (!namesInterned) {
-			// when String is interned we can do much faster namespace stack lookups ...
-			namespace = namespace.intern();
-		} else if (checkNamesInterned) {
-			checkInterning(namespace);
-		}
-		if (namespace == null) {
-			throw new IllegalArgumentException("namespace must be not null" + getLocation());
-		} else if (namespace.length() == 0) {
-			throw new IllegalArgumentException("default namespace cannot have prefix" + getLocation());
-		}
-
-		// first check if namespace is already in scope
-		for (int i = namespaceEnd - 1; i >= 0; --i) {
-			if (namespace.equals(namespaceUri[i])) {
-				final String prefix = namespacePrefix[i];
-				if (nonEmpty && prefix.length() == 0) {
-				    continue;
-                }
-
-				return prefix;
-			}
-		}
-
-		// so not found it ...
-		if (!generatePrefix) {
-			return null;
-		}
-		return generatePrefix(namespace);
-	}
-
-	private String generatePrefix(String namespace) {
-        ++autoDeclaredPrefixes;
-        // fast lookup uses table that was pre-initialized in static{} ....
-        final String prefix = autoDeclaredPrefixes < precomputedPrefixes.length
-            ? precomputedPrefixes[autoDeclaredPrefixes]
-            : ("n" + autoDeclaredPrefixes).intern();
-
-        // declare prefix
-        if (namespaceEnd >= namespacePrefix.length) {
-            ensureNamespacesCapacity();
-        }
-        namespacePrefix[namespaceEnd] = prefix;
-        namespaceUri[namespaceEnd] = namespace;
-        ++namespaceEnd;
-
-        return prefix;
-	}
-
-	@Override
-	public int getDepth() {
-		return depth;
-	}
-
-	@Override
-	public String getNamespace() {
-		return elNamespace[depth];
-	}
-
-	@Override
-	public String getName() {
-		return elName[depth];
-	}
-
-	@Override
-	public XmlSerializer startTag(String namespace, String name)
-			throws IOException {
-		if (startTagIncomplete) {
-			closeStartTag();
-		}
-		seenBracket = seenBracketBracket = false;
-		++depth;
-		if (doIndent && depth > 0 && seenTag) {
-			writeIndent();
-		}
-		seenTag = true;
-		setPrefixCalled = false;
-		startTagIncomplete = true;
-		if ((depth + 1) >= elName.length) {
-			ensureElementsCapacity();
-		}
-
-		if (checkNamesInterned && namesInterned)
-			checkInterning(namespace);
-
-		elNamespace[depth] = (namesInterned || namespace == null) ? namespace : namespace.intern();
-		if (checkNamesInterned && namesInterned)
-			checkInterning(name);
-
-		elName[depth] = (namesInterned || name == null) ? name : name.intern();
-		if (out == null) {
-			throw new IllegalStateException("setOutput() must called set before serialization can start");
-		}
-		out.write('<');
-		if (namespace != null) {
-			if (namespace.length() > 0) {
-				// in future make this algo a feature on serializer
-				String prefix = null;
-				if (depth > 0 && (namespaceEnd - elNamespaceCount[depth - 1]) == 1) {
-					// if only one prefix was declared un-declare it if the
-					// prefix is already declared on parent el with the same URI
-					String uri = namespaceUri[namespaceEnd - 1];
-					if (uri == namespace || uri.equals(namespace)) {
-						String elPfx = namespacePrefix[namespaceEnd - 1];
-						for (int pos = elNamespaceCount[depth - 1] - 1; pos >= 2; --pos) {
-							String pf = namespacePrefix[pos];
-							if (pf == elPfx || pf.equals(elPfx)) {
-								String n = namespaceUri[pos];
-								if (n == uri || n.equals(uri)) {
-									--namespaceEnd; // un-declare namespace: this is kludge!
-									prefix = elPfx;
-								}
-								break;
-							}
-						}
-					}
-				}
-				if (prefix == null) {
-					prefix = lookupOrDeclarePrefix(namespace);
-				}
-				// make sure that default ("") namespace to not print ":"
-				if (prefix.length() > 0) {
-					elPrefix[depth] = prefix;
-					out.write(prefix);
-					out.write(':');
-				} else {
-					elPrefix[depth] = "";
-				}
-			} else {
-				// make sure that default namespace can be declared
-				for (int i = namespaceEnd - 1; i >= 0; --i) {
-					if (namespacePrefix[i] == "") {
-						final String uri = namespaceUri[i];
-						if (uri == null) {
-							setPrefix("", "");
-						} else if (uri.length() > 0) {
-							throw new IllegalStateException("start tag can not be written in empty default namespace "
-									+ "as default namespace is currently bound to '"
-									+ uri + "'" + getLocation());
-						}
-						break;
-					}
-				}
-				elPrefix[depth] = "";
-			}
-		} else {
-			elPrefix[depth] = "";
-		}
-		out.write(name);
-		return this;
-	}
-
-	@Override
-	public XmlSerializer attribute(String namespace, String name, String value)
-			throws IOException {
-		if (!startTagIncomplete) {
-			throw new IllegalArgumentException("startTag() must be called before attribute()" + getLocation());
-		}
-		out.write(' ');
-		if (namespace != null && namespace.length() > 0) {
-			if (!namesInterned) {
-				namespace = namespace.intern();
-			} else if (checkNamesInterned) {
-				checkInterning(namespace);
-			}
-			String prefix = getPrefix(namespace, false, true);
-			if (prefix == null) {
-				// needs to declare prefix to hold default namespace
-				// NOTE: attributes such as a='b' are in NO namespace
-				prefix = generatePrefix(namespace);
-			}
-			out.write(prefix);
-			out.write(':');
-		}
-		out.write(name);
-		out.write('=');
-		out.write(attributeUseApostrophe ? '\'' : '"');
-		writeAttributeValue(value, out);
-		out.write(attributeUseApostrophe ? '\'' : '"');
-		return this;
-	}
-
-	protected void closeStartTag() throws IOException {
-		if (finished) {
-			throw new IllegalArgumentException("trying to write past already finished output"
-					+ getLocation());
-		}
-		if (seenBracket) {
-			seenBracket = seenBracketBracket = false;
-		}
-		if (startTagIncomplete || setPrefixCalled) {
-			if (setPrefixCalled) {
-				throw new IllegalArgumentException("startTag() must be called immediately after setPrefix()"
-						+ getLocation());
-			}
-			if (!startTagIncomplete) {
-				throw new IllegalArgumentException("trying to close start tag that is not opened"
-						+ getLocation());
-			}
-
-			// write all namespace declarations!
-			writeNamespaceDeclarations();
-			out.write('>');
-			elNamespaceCount[depth] = namespaceEnd;
-			startTagIncomplete = false;
-		}
-	}
-
-	protected void writeNamespaceDeclarations() throws IOException {
-		for (int i = elNamespaceCount[depth - 1]; i < namespaceEnd; i++) {
-			if (doIndent && namespaceUri[i].length() > 40) {
-				writeIndent();
-				out.write(" ");
-			}
-			if (namespacePrefix[i] != "") {
-				out.write(" xmlns:");
-				out.write(namespacePrefix[i]);
-				out.write('=');
-			} else {
-				out.write(" xmlns=");
-			}
-			out.write(attributeUseApostrophe ? '\'' : '"');
-
-			// NOTE: escaping of namespace value the same way as attributes!!!!
-			writeAttributeValue(namespaceUri[i], out);
-			out.write(attributeUseApostrophe ? '\'' : '"');
-		}
-	}
-
-	@Override
-	public XmlSerializer endTag(String namespace, String name)
-			throws IOException {
-		seenBracket = seenBracketBracket = false;
-		if (namespace != null) {
-			if (!namesInterned) {
-				namespace = namespace.intern();
-			} else if (checkNamesInterned) {
-				checkInterning(namespace);
-			}
-		}
-
-		if (namespace != elNamespace[depth]) {
-			throw new IllegalArgumentException("expected namespace " + printable(elNamespace[depth]) + " and not "
-					+ printable(namespace) + getLocation());
-		}
-		if (name == null) {
-			throw new IllegalArgumentException("end tag name can not be null" + getLocation());
-		}
-		if (checkNamesInterned && namesInterned) {
-			checkInterning(name);
-		}
-		String startTagName = elName[depth];
-		if ((!namesInterned && !name.equals(startTagName)) || (namesInterned && name != startTagName)) {
-			throw new IllegalArgumentException("expected element name "
-					+ printable(elName[depth]) + " and not " + printable(name) + getLocation());
-		}
-		if (startTagIncomplete) {
-			writeNamespaceDeclarations();
-			out.write(" />"); // space is added to make it easier to work in XHTML!!!
-        } else {
-			if (doIndent && seenTag) {
-				writeIndent();
-			}
-			out.write("</");
-			String startTagPrefix = elPrefix[depth];
-			if (startTagPrefix.length() > 0) {
-				out.write(startTagPrefix);
-				out.write(':');
-			}
-			out.write(name);
-			out.write('>');
-        }
-        --depth;
-        namespaceEnd = elNamespaceCount[depth];
-		startTagIncomplete = false;
-		seenTag = true;
-		return this;
-	}
-
-	@Override
-	public XmlSerializer text(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		writeElementContent(text, out);
-		return this;
-	}
-
-	@Override
-	public XmlSerializer text(char[] buf, int start, int len)
-			throws IOException {
-		if (startTagIncomplete || setPrefixCalled)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		writeElementContent(buf, start, len, out);
-		return this;
-	}
-
-	@Override
-	public void cdsect(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled || seenBracket)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		out.write("<![CDATA[");
-		out.write(text); // escape?
-		out.write("]]>");
-	}
-
-	@Override
-	public void entityRef(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled || seenBracket)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		out.write('&');
-		out.write(text); // escape?
-		out.write(';');
-	}
-
-	@Override
-	public void processingInstruction(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled || seenBracket)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		out.write("<?");
-		out.write(text); // escape?
-		out.write("?>");
-	}
-
-	@Override
-	public void comment(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled || seenBracket)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		out.write("<!--");
-		out.write(text); // escape?
-		out.write("-->");
-	}
-
-	@Override
-	public void docdecl(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled || seenBracket)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		out.write("<!DOCTYPE");
-		out.write(text); // escape?
-		out.write(">");
-	}
-
-	@Override
-	public void ignorableWhitespace(String text) throws IOException {
-		if (startTagIncomplete || setPrefixCalled || seenBracket)
-			closeStartTag();
-		if (doIndent && seenTag)
-			seenTag = false;
-		if (text.length() == 0) {
-			throw new IllegalArgumentException("empty string is not allowed for ignorable whitespace" + getLocation());
-		}
-		out.write(text); // no escape?
-	}
-
-	@Override
-	public void flush() throws IOException {
-		if (!finished && startTagIncomplete)
-			closeStartTag();
-		out.flush();
-	}
-
-	// --- utility methods
-
-	protected void writeAttributeValue(String value, Writer out)
-			throws IOException {
-		// .[apostrophe and <, & escaped],
-		final char quot = attributeUseApostrophe ? '\'' : '"';
-		final String quotEntity = attributeUseApostrophe ? "&apos;" : "&quot;";
-
-		int pos = 0;
-		for (int i = 0; i < value.length(); i++) {
-			char ch = value.charAt(i);
-			if (ch == '&') {
-				if (i > pos)
-					out.write(value.substring(pos, i));
-				out.write("&amp;");
-				pos = i + 1;
-			}
-			if (ch == '<') {
-				if (i > pos)
-					out.write(value.substring(pos, i));
-				out.write("&lt;");
-				pos = i + 1;
-			} else if (ch == quot) {
-				if (i > pos)
-					out.write(value.substring(pos, i));
-				out.write(quotEntity);
-				pos = i + 1;
-			} else if (ch < 32) {
-				// in XML 1.0 only legal character are #x9 | #xA | #xD
-				// and they must be escaped otherwise in attribute value they
-				// are normalized to spaces
-				if (ch == 13 || ch == 10 || ch == 9) {
-					if (i > pos)
-						out.write(value.substring(pos, i));
-					out.write("&#");
-					out.write(Integer.toString(ch));
-					out.write(';');
-					pos = i + 1;
-				} else {
-					if (TRACE_ESCAPING)
-						AppLog.e(getClass().getName() + " DEBUG ATTR value.len=" + value.length()
-								+ " " + printable(value));
-
-					throw new IllegalStateException(
-							"character " + printable(ch) + " (" + Integer.toString(ch) + ") is not allowed in output"
-									+ getLocation() + " (attr value="
-									+ printable(value) + ")");
-				}
-			}
-		}
-		if (pos > 0) {
-			out.write(value.substring(pos));
-		} else {
-			out.write(value); // this is shortcut to the most common case
-		}
-	}
-
-	protected void writeElementContent(String text, Writer out)
-			throws IOException {
-
-		// For some reason, some non-empty, empty characters are surviving this far and getting filtered out
-		// So we are left with null, which causes an NPE
-		if (text == null) {
-			return;
-		}
-
-		// escape '<', '&', ']]>', <32 if necessary
-		int pos = 0;
-		for (int i = 0; i < text.length(); i++) {
-			// TODO: check if doing char[] text.getChars() would be faster than
-			// getCharAt(i) ...
-			char ch = text.charAt(i);
-			if (ch == ']') {
-				if (seenBracket) {
-					seenBracketBracket = true;
-				} else {
-					seenBracket = true;
-				}
-			} else {
-				if (ch == '&') {
-					if (!(i < text.length() - 3 && text.charAt(i+1) == 'l'
-					    && text.charAt(i+2) == 't' && text.charAt(i+3) == ';')) {
-					    if (i > pos)
-					        out.write(text.substring(pos, i));
-					    out.write("&amp;");
-					    pos = i + 1;
-                    }
-				} else if (ch == '<') {
-					if (i > pos)
-						out.write(text.substring(pos, i));
-					out.write("&lt;");
-					pos = i + 1;
-				} else if (seenBracketBracket && ch == '>') {
-					if (i > pos)
-						out.write(text.substring(pos, i));
-					out.write("&gt;");
-					pos = i + 1;
-				} else if (ch < 32) {
-					// in XML 1.0 only legal character are #x9 | #xA | #xD
-					if (ch == 9 || ch == 10 || ch == 13) {
-						// pass through
-					} else {
-						if (TRACE_ESCAPING)
-							AppLog.e(getClass().getName() + " DEBUG TEXT value.len=" + text.length()
-									+ " " + printable(text));
-						throw new IllegalStateException("character " + Integer.toString(ch)
-								+ " is not allowed in output" + getLocation()
-								+ " (text value=" + printable(text) + ")");
-					}
-				}
-				if (seenBracket) {
-					seenBracketBracket = seenBracket = false;
-				}
-
-			}
-		}
-		if (pos > 0) {
-			out.write(text.substring(pos));
-		} else {
-			out.write(text); // this is shortcut to the most common case
-		}
-
-	}
-
-	protected void writeElementContent(char[] buf, int off, int len, Writer out)
-			throws IOException {
-		// escape '<', '&', ']]>'
-		final int end = off + len;
-		int pos = off;
-		for (int i = off; i < end; i++) {
-			final char ch = buf[i];
-			if (ch == ']') {
-				if (seenBracket) {
-					seenBracketBracket = true;
-				} else {
-					seenBracket = true;
-				}
-			} else {
-				if (ch == '&') {
-					if (i > pos) {
-						out.write(buf, pos, i - pos);
-					}
-					out.write("&amp;");
-					pos = i + 1;
-				} else if (ch == '<') {
-					if (i > pos) {
-						out.write(buf, pos, i - pos);
-					}
-					out.write("&lt;");
-					pos = i + 1;
-
-				} else if (seenBracketBracket && ch == '>') {
-					if (i > pos) {
-						out.write(buf, pos, i - pos);
-					}
-					out.write("&gt;");
-					pos = i + 1;
-				} else if (ch < 32) {
-					// in XML 1.0 only legal character are #x9 | #xA | #xD
-					if (ch == 9 || ch == 10 || ch == 13) {
-						// pass through
-					} else {
-						if (TRACE_ESCAPING)
-							AppLog.e(getClass().getName() + " DEBUG TEXT value.len=" + len + " "
-									+ printable(new String(buf, off, len)));
-						throw new IllegalStateException("character "
-								+ printable(ch) + " (" + Integer.toString(ch)
-								+ ") is not allowed in output" + getLocation());
-					}
-				}
-				if (seenBracket) {
-					seenBracketBracket = seenBracket = false;
-				}
-			}
-		}
-		if (end > pos) {
-			out.write(buf, pos, end - pos);
-		}
-	}
-
-	protected static String printable(String s) {
-		if (s == null) {
-			return "null";
-		}
-		StringBuffer retval = new StringBuffer(s.length() + 16);
-		retval.append("'");
-		for (int i = 0; i < s.length(); i++) {
-			addPrintable(retval, s.charAt(i));
-		}
-		retval.append("'");
-		return retval.toString();
-	}
-
-	protected static String printable(char ch) {
-		StringBuffer retval = new StringBuffer();
-		addPrintable(retval, ch);
-		return retval.toString();
-	}
-
-	private static void addPrintable(StringBuffer retval, char ch) {
-		switch (ch) {
-		case '\b':
-			retval.append("\\b");
-			break;
-		case '\t':
-			retval.append("\\t");
-			break;
-		case '\n':
-			retval.append("\\n");
-			break;
-		case '\f':
-			retval.append("\\f");
-			break;
-		case '\r':
-			retval.append("\\r");
-			break;
-		case '\"':
-			retval.append("\\\"");
-			break;
-		case '\'':
-			retval.append("\\'");
-			break;
-		case '\\':
-			retval.append("\\\\");
-			break;
-		default:
-			if (ch < 0x20 || ch > 0x7e) {
-				final String ss = "0000" + Integer.toString(ch, 16);
-				retval.append("\\u").append(ss.substring(ss.length() - 4));
-			} else {
-				retval.append(ch);
-			}
-		}
-	}
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/util/TypedValue.java b/apktool/androlib/src/main/java/brut/androlib/res/util/TypedValue.java
deleted file mode 100644
index 7ecea91..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/util/TypedValue.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * 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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package brut.androlib.res.util;
-
-/**
- * Container for a dynamically typed data value. Primarily used with
- * Resources for holding resource values.
- */
-public class TypedValue {
-    /** The value contains no data. */
-    public static final int TYPE_NULL = 0x00;
-
-    /** The <var>data</var> field holds a resource identifier. */
-    public static final int TYPE_REFERENCE = 0x01;
-    /**
-     * The <var>data</var> field holds an attribute resource identifier
-     * (referencing an attribute in the current theme style, not a resource
-     * entry).
-     */
-    public static final int TYPE_ATTRIBUTE = 0x02;
-    /**
-     * The <var>string</var> field holds string data. In addition, if
-     * <var>data</var> is non-zero then it is the string block index of the
-     * string and <var>assetCookie</var> is the set of assets the string came
-     * from.
-     */
-    public static final int TYPE_STRING = 0x03;
-    /** The <var>data</var> field holds an IEEE 754 floating point number. */
-    public static final int TYPE_FLOAT = 0x04;
-    /**
-     * The <var>data</var> field holds a complex number encoding a dimension
-     * value.
-     */
-    public static final int TYPE_DIMENSION = 0x05;
-    /**
-     * The <var>data</var> field holds a complex number encoding a fraction of a
-     * container.
-     */
-    public static final int TYPE_FRACTION = 0x06;
-    /**
-     * The <var>data</var> holds a dynamic res table reference, which needs to be
-     * resolved before it can be used like TYPE_REFERENCE
-     */
-    public static final int TYPE_DYNAMIC_REFERENCE = 0x07;
-    /**
-     * The <var>data</var> an attribute resource identifier, which needs to be resolved
-     * before it can be used like a TYPE_ATTRIBUTE.
-     */
-    public static final int TYPE_DYNAMIC_ATTRIBUTE = 0x08;
-    /**
-     * Identifies the start of plain integer values. Any type value from this to
-     * {@link #TYPE_LAST_INT} means the <var>data</var> field holds a generic
-     * integer value.
-     */
-    public static final int TYPE_FIRST_INT = 0x10;
-
-    /**
-     * The <var>data</var> field holds a number that was originally specified in
-     * decimal.
-     */
-    public static final int TYPE_INT_DEC = 0x10;
-    /**
-     * The <var>data</var> field holds a number that was originally specified in
-     * hexadecimal (0xn).
-     */
-    public static final int TYPE_INT_HEX = 0x11;
-    /**
-     * The <var>data</var> field holds 0 or 1 that was originally specified as
-     * "false" or "true".
-     */
-    public static final int TYPE_INT_BOOLEAN = 0x12;
-
-    /**
-     * Identifies the start of integer values that were specified as color
-     * constants (starting with '#').
-     */
-    public static final int TYPE_FIRST_COLOR_INT = 0x1c;
-
-    /**
-     * The <var>data</var> field holds a color that was originally specified as
-     * #aarrggbb.
-     */
-    public static final int TYPE_INT_COLOR_ARGB8 = 0x1c;
-    /**
-     * The <var>data</var> field holds a color that was originally specified as
-     * #rrggbb.
-     */
-    public static final int TYPE_INT_COLOR_RGB8 = 0x1d;
-    /**
-     * The <var>data</var> field holds a color that was originally specified as
-     * #argb.
-     */
-    public static final int TYPE_INT_COLOR_ARGB4 = 0x1e;
-    /**
-     * The <var>data</var> field holds a color that was originally specified as
-     * #rgb.
-     */
-    public static final int TYPE_INT_COLOR_RGB4 = 0x1f;
-
-    /**
-     * Identifies the end of integer values that were specified as color
-     * constants.
-     */
-    public static final int TYPE_LAST_COLOR_INT = 0x1f;
-
-    /** Identifies the end of plain integer values. */
-    public static final int TYPE_LAST_INT = 0x1f;
-
-	/* ------------------------------------------------------------ */
-
-    /** Complex data: bit location of unit information. */
-    public static final int COMPLEX_UNIT_SHIFT = 0;
-    /**
-     * Complex data: mask to extract unit information (after shifting by
-     * {@link #COMPLEX_UNIT_SHIFT}). This gives us 16 possible types, as defined
-     * below.
-     */
-    public static final int COMPLEX_UNIT_MASK = 0xf;
-
-    /** {@link #TYPE_DIMENSION} complex unit: Value is raw pixels. */
-    public static final int COMPLEX_UNIT_PX = 0;
-    /**
-     * {@link #TYPE_DIMENSION} complex unit: Value is Device Independent Pixels.
-     */
-    public static final int COMPLEX_UNIT_DIP = 1;
-    /** {@link #TYPE_DIMENSION} complex unit: Value is a scaled pixel. */
-    public static final int COMPLEX_UNIT_SP = 2;
-    /** {@link #TYPE_DIMENSION} complex unit: Value is in points. */
-    public static final int COMPLEX_UNIT_PT = 3;
-    /** {@link #TYPE_DIMENSION} complex unit: Value is in inches. */
-    public static final int COMPLEX_UNIT_IN = 4;
-    /** {@link #TYPE_DIMENSION} complex unit: Value is in millimeters. */
-    public static final int COMPLEX_UNIT_MM = 5;
-
-    /**
-     * {@link #TYPE_FRACTION} complex unit: A basic fraction of the overall size.
-     */
-    public static final int COMPLEX_UNIT_FRACTION = 0;
-    /** {@link #TYPE_FRACTION} complex unit: A fraction of the parent size. */
-    public static final int COMPLEX_UNIT_FRACTION_PARENT = 1;
-
-    /**
-     * Complex data: where the radix information is, telling where the decimal
-     * place appears in the mantissa.
-     */
-    public static final int COMPLEX_RADIX_SHIFT = 4;
-    /**
-     * Complex data: mask to extract radix information (after shifting by
-     * {@link #COMPLEX_RADIX_SHIFT}). This give us 4 possible fixed point
-     * representations as defined below.
-     */
-    public static final int COMPLEX_RADIX_MASK = 0x3;
-
-    /** Complex data: the mantissa is an integral number -- i.e., 0xnnnnnn.0 */
-    public static final int COMPLEX_RADIX_23p0 = 0;
-    /** Complex data: the mantissa magnitude is 16 bits -- i.e, 0xnnnn.nn */
-    public static final int COMPLEX_RADIX_16p7 = 1;
-    /** Complex data: the mantissa magnitude is 8 bits -- i.e, 0xnn.nnnn */
-    public static final int COMPLEX_RADIX_8p15 = 2;
-    /** Complex data: the mantissa magnitude is 0 bits -- i.e, 0x0.nnnnnn */
-    public static final int COMPLEX_RADIX_0p23 = 3;
-
-    /** Complex data: bit location of mantissa information. */
-    public static final int COMPLEX_MANTISSA_SHIFT = 8;
-    /**
-     * Complex data: mask to extract mantissa information (after shifting by
-     * {@link #COMPLEX_MANTISSA_SHIFT}). This gives us 23 bits of precision; the
-     * top bit is the sign.
-     */
-    public static final int COMPLEX_MANTISSA_MASK = 0xffffff;
-
-	/* ------------------------------------------------------------ */
-
-    /**
-     * {@link #TYPE_NULL} data indicating the value was not specified.
-     */
-    public static final int DATA_NULL_UNDEFINED = 0;
-    /**
-     * {@link #TYPE_NULL} data indicating the value was explicitly set to null.
-     */
-    public static final int DATA_NULL_EMPTY = 1;
-
-    /* ------------------------------------------------------------ */
-
-    /**
-     * If density is equal to this value, then the density should be
-     * treated as the system's default density value:
-     */
-    public static final int DENSITY_DEFAULT = 0;
-
-    /**
-     * If density is equal to this value, then there is no density
-     * associated with the resource and it should not be scaled.
-     */
-    public static final int DENSITY_NONE = 0xffff;
-
-	/* ------------------------------------------------------------ */
-
-    /**
-     * The type held by this value, as defined by the constants here. This tells
-     * you how to interpret the other fields in the object.
-     */
-    public int type;
-
-    private static final float MANTISSA_MULT = 1.0f / (1 << TypedValue.COMPLEX_MANTISSA_SHIFT);
-    private static final float[] RADIX_MULTS = new float[] {
-        MANTISSA_MULT, 1.0f / (1 << 7) * MANTISSA_MULT,
-            1.0f / (1 << 15) * MANTISSA_MULT, 1.0f / (1 << 23) * MANTISSA_MULT };
-
-    /**
-     * Retrieve the base value from a complex data integer. This uses the
-     * {@link #COMPLEX_MANTISSA_MASK} and {@link #COMPLEX_RADIX_MASK} fields of
-     * the data to compute a floating point representation of the number they
-     * describe. The units are ignored.
-     *
-     * @param complex
-     *            A complex data value.
-     *
-     * @return A floating point value corresponding to the complex data.
-     */
-    public static float complexToFloat(int complex) {
-        return (complex & (TypedValue.COMPLEX_MANTISSA_MASK << TypedValue.COMPLEX_MANTISSA_SHIFT))
-                * RADIX_MULTS[(complex >> TypedValue.COMPLEX_RADIX_SHIFT)
-                & TypedValue.COMPLEX_RADIX_MASK];
-    }
-
-    private static final String[] DIMENSION_UNIT_STRS = new String[] { "px",
-            "dip", "sp", "pt", "in", "mm" };
-    private static final String[] FRACTION_UNIT_STRS = new String[] { "%", "%p" };
-
-    /**
-     * Perform type conversion as per coerceToString on an explicitly
-     * supplied type and data.
-     *
-     * @param type The data type identifier.
-     * @param data The data value.
-     *
-     * @return String The coerced string value. If the value is null or the type
-     *         is not known, null is returned.
-     */
-    public static String coerceToString(int type, int data) {
-        switch (type) {
-            case TYPE_NULL:
-                return null;
-            case TYPE_REFERENCE:
-                return "@" + data;
-            case TYPE_ATTRIBUTE:
-                return "?" + data;
-            case TYPE_FLOAT:
-                return Float.toString(Float.intBitsToFloat(data));
-            case TYPE_DIMENSION:
-                return complexToFloat(data)
-                        + DIMENSION_UNIT_STRS[(data >> COMPLEX_UNIT_SHIFT)
-                        & COMPLEX_UNIT_MASK];
-            case TYPE_FRACTION:
-                return complexToFloat(data) * 100
-                        + FRACTION_UNIT_STRS[(data >> COMPLEX_UNIT_SHIFT)
-                        & COMPLEX_UNIT_MASK];
-            case TYPE_INT_HEX:
-                return String.format("0x%08X", data);
-            case TYPE_INT_BOOLEAN:
-                return data != 0 ? "true" : "false";
-        }
-
-        if (type >= TYPE_FIRST_COLOR_INT && type <= TYPE_LAST_COLOR_INT) {
-            String res = String.format("%08x", data);
-            char[] vals = res.toCharArray();
-            switch (type) {
-                default:
-                case TYPE_INT_COLOR_ARGB8:// #AaRrGgBb
-                    break;
-                case TYPE_INT_COLOR_RGB8:// #FFRrGgBb->#RrGgBb
-                    res = res.substring(2);
-                    break;
-                case TYPE_INT_COLOR_ARGB4:// #AARRGGBB->#ARGB
-                    res = String.valueOf(vals[0]) + vals[2] +
-                        vals[4] + vals[6];
-                    break;
-                case TYPE_INT_COLOR_RGB4:// #FFRRGGBB->#RGB
-                    res = String.valueOf(vals[2]) + vals[4] +
-                        vals[6];
-                    break;
-            }
-            return "#" + res;
-        } else if (type >= TYPE_FIRST_INT && type <= TYPE_LAST_INT) {
-            String res = null;
-            if (type == TYPE_INT_DEC) {
-                res = Integer.toString(data);
-            }
-            return res;
-        }
-
-        return null;
-    }
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java b/apktool/androlib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java
deleted file mode 100644
index 9330dac..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.xml;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.res.data.ResResource;
-
-public interface ResValuesXmlSerializable {
-    void serializeToResValuesXml(XmlSerializer serializer,
-                                 ResResource res) throws IOException, AndrolibException;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java b/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java
deleted file mode 100644
index c7cb337..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.xml;
-
-import brut.androlib.err.AndrolibException;
-
-public interface ResXmlEncodable {
-    String encodeAsResXmlAttr() throws AndrolibException;
-
-    String encodeAsResXmlValue() throws AndrolibException;
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java b/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
deleted file mode 100644
index f179d31..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.xml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import brut.util.Duo;
-
-public final class ResXmlEncoders {
-
-    public static String escapeXmlChars(String str) {
-        return str.replace("&", "&amp;").replace("<", "&lt;");
-    }
-
-    public static String encodeAsResXmlAttr(String str) {
-        if (str == null || str.isEmpty()) {
-            return str;
-        }
-
-        char[] chars = str.toCharArray();
-        StringBuilder out = new StringBuilder(str.length() + 10);
-
-        switch (chars[0]) {
-            case '#':
-            case '@':
-            case '?':
-                out.append('\\');
-        }
-
-        for (char c : chars) {
-            switch (c) {
-                case '\\':
-                    out.append('\\');
-                    break;
-                case '"':
-                    out.append("&quot;");
-                    continue;
-                case '\n':
-                    out.append("\\n");
-                    continue;
-                default:
-                    if (!isPrintableChar(c)) {
-                        out.append(String.format("\\u%04x", (int) c));
-                        continue;
-                    }
-            }
-            out.append(c);
-        }
-
-        return out.toString();
-    }
-
-    public static String encodeAsXmlValue(String str) {
-        if (str == null || str.isEmpty()) {
-            return str;
-        }
-
-        char[] chars = str.toCharArray();
-        StringBuilder out = new StringBuilder(str.length() + 10);
-
-        switch (chars[0]) {
-            case '#':
-            case '@':
-            case '?':
-                out.append('\\');
-        }
-
-        boolean isInStyleTag = false;
-        int startPos = 0;
-        boolean enclose = false;
-        boolean wasSpace = true;
-        for (char c : chars) {
-            if (isInStyleTag) {
-                if (c == '>') {
-                    isInStyleTag = false;
-                    startPos = out.length() + 1;
-                    enclose = false;
-                }
-            } else if (c == ' ') {
-                if (wasSpace) {
-                    enclose = true;
-                }
-                wasSpace = true;
-            } else {
-                wasSpace = false;
-                switch (c) {
-                    case '\\':
-                    case '"':
-                        out.append('\\');
-                        break;
-                    case '\'':
-                    case '\n':
-                        enclose = true;
-                        break;
-                    case '<':
-                        isInStyleTag = true;
-                        if (enclose) {
-                            out.insert(startPos, '"').append('"');
-                        }
-                        break;
-                    default:
-                        if (!isPrintableChar(c)) {
-
-                            // lets not write trailing \u0000 if we are at end of string
-                            if ((out.length() + 1) == str.length() && c == '\u0000') {
-                                continue;
-                            }
-                            out.append(String.format("\\u%04x", (int) c));
-                            continue;
-                        }
-                }
-            }
-            out.append(c);
-        }
-
-        if (enclose || wasSpace) {
-            out.insert(startPos, '"').append('"');
-        }
-        return out.toString();
-    }
-
-    public static boolean hasMultipleNonPositionalSubstitutions(String str) {
-        Duo<List<Integer>, List<Integer>> tuple = findSubstitutions(str, 4);
-        return ! tuple.m1.isEmpty() && tuple.m1.size() + tuple.m2.size() > 1;
-    }
-
-    public static String enumerateNonPositionalSubstitutionsIfRequired(String str) {
-        Duo<List<Integer>, List<Integer>> tuple = findSubstitutions(str, 4);
-        if (tuple.m1.isEmpty() || tuple.m1.size() + tuple.m2.size() < 2) {
-            return str;
-        }
-        List<Integer> subs = tuple.m1;
-
-        StringBuilder out = new StringBuilder();
-        int pos = 0;
-        int count = 0;
-        for (Integer sub : subs) {
-            out.append(str, pos, ++sub).append(++count).append('$');
-            pos = sub;
-        }
-        out.append(str.substring(pos));
-
-        return out.toString();
-    }
-
-    /**
-     * It returns a tuple of:
-     *   - a list of offsets of non positional substitutions. non-pos is defined as any "%" which isn't "%%" nor "%\d+\$"
-     *   - a list of offsets of positional substitutions
-     */
-    private static Duo<List<Integer>, List<Integer>> findSubstitutions(String str, int nonPosMax) {
-        if (nonPosMax == -1) {
-            nonPosMax = Integer.MAX_VALUE;
-        }
-        int pos;
-        int pos2 = 0;
-        List<Integer> nonPositional = new ArrayList<>();
-        List<Integer> positional = new ArrayList<>();
-
-        if (str == null) {
-            return new Duo<>(nonPositional, positional);
-        }
-
-        int length = str.length();
-
-        while ((pos = str.indexOf('%', pos2)) != -1) {
-            pos2 = pos + 1;
-            if (pos2 == length) {
-                nonPositional.add(pos);
-                break;
-            }
-            char c = str.charAt(pos2++);
-            if (c == '%') {
-                continue;
-            }
-            if (c >= '0' && c <= '9' && pos2 < length) {
-                while ((c = str.charAt(pos2++)) >= '0' && c <= '9' && pos2 < length);
-                if (c == '$') {
-                    positional.add(pos);
-                    continue;
-                }
-            }
-
-            nonPositional.add(pos);
-            if (nonPositional.size() >= nonPosMax) {
-                break;
-            }
-        }
-
-        return new Duo<>(nonPositional, positional);
-    }
-
-    private static boolean isPrintableChar(char c) {
-        Character.UnicodeBlock block = Character.UnicodeBlock.of(c);
-        return !Character.isISOControl(c) && c !=  '\uffff'
-                && block != null && block != Character.UnicodeBlock.SPECIALS;
-    }
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java b/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java
deleted file mode 100644
index e0d3e3e..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.res.xml;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-public final class ResXmlPatcher {
-
-    /**
-     * Removes "debug" tag from file
-     *
-     * @param file AndroidManifest file
-     */
-    public static void removeApplicationDebugTag(File file) {
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                Node application = doc.getElementsByTagName("application").item(0);
-
-                // load attr
-                NamedNodeMap attr = application.getAttributes();
-                Node debugAttr = attr.getNamedItem("android:debuggable");
-
-                // remove application:debuggable
-                if (debugAttr != null) {
-                    attr.removeNamedItem("android:debuggable");
-                }
-
-                saveDocument(file, doc);
-
-            } catch (SAXException | ParserConfigurationException | IOException | TransformerException ignored) {
-            }
-        }
-    }
-
-    /**
-     * Sets "debug" tag in the file to true
-     *
-     * @param file AndroidManifest file
-     */
-    public static void setApplicationDebugTagTrue(File file) {
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                Node application = doc.getElementsByTagName("application").item(0);
-
-                // load attr
-                NamedNodeMap attr = application.getAttributes();
-                Node debugAttr = attr.getNamedItem("android:debuggable");
-
-                if (debugAttr == null) {
-                    debugAttr = doc.createAttribute("android:debuggable");
-                    attr.setNamedItem(debugAttr);
-                }
-
-                // set application:debuggable to 'true
-                debugAttr.setNodeValue("true");
-
-                saveDocument(file, doc);
-
-            } catch (SAXException | ParserConfigurationException | IOException | TransformerException ignored) {
-            }
-        }
-    }
-
-    /**
-     * Sets the value of the network security config in the AndroidManifest file
-     *
-     * @param file AndroidManifest file
-     */
-    public static void setNetworkSecurityConfig(File file) {
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                Node application = doc.getElementsByTagName("application").item(0);
-
-                // load attr
-                NamedNodeMap attr = application.getAttributes();
-                Node netSecConfAttr = attr.getNamedItem("android:networkSecurityConfig");
-
-                if (netSecConfAttr == null) {
-                    // there is not an already existing network security configuration
-                    netSecConfAttr = doc.createAttribute("android:networkSecurityConfig");
-                    attr.setNamedItem(netSecConfAttr);
-                }
-
-                // whether it already existed or it was created now set it to the proper value
-                netSecConfAttr.setNodeValue("@xml/network_security_config");
-
-                saveDocument(file, doc);
-
-            } catch (SAXException | ParserConfigurationException | IOException | TransformerException ignored) {
-            }
-        }
-    }
-
-    /**
-     * Creates a modified network security config file that is more permissive
-     *
-     * @param file network security config file
-     * @throws TransformerException XML file could not be edited
-     * @throws IOException XML file could not be located
-     * @throws SAXException XML file could not be read
-     * @throws ParserConfigurationException XML nodes could be written
-     */
-    public static void modNetworkSecurityConfig(File file)
-        throws ParserConfigurationException, TransformerException, IOException, SAXException {
-
-        DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder documentBuilder = documentFactory.newDocumentBuilder();
-        Document document = documentBuilder.newDocument();
-
-        Element root = document.createElement("network-security-config");
-        document.appendChild(root);
-        Element baseConfig = document.createElement("base-config");
-        root.appendChild(baseConfig);
-        Element trustAnchors = document.createElement("trust-anchors");
-        baseConfig.appendChild(trustAnchors);
-
-        Element certSystem = document.createElement("certificates");
-        Attr attrSystem = document.createAttribute("src");
-        attrSystem.setValue("system");
-        certSystem.setAttributeNode(attrSystem);
-        trustAnchors.appendChild(certSystem);
-
-        Element certUser = document.createElement("certificates");
-        Attr attrUser = document.createAttribute("src");
-        attrUser.setValue("user");
-        certUser.setAttributeNode(attrUser);
-        trustAnchors.appendChild(certUser);
-
-        saveDocument(file, document);
-    }
-
-    /**
-     * Any @string reference in a provider value in AndroidManifest.xml will break on
-     * build, thus preventing the application from installing. This is from a bug/error
-     * in AOSP where public resources cannot be part of an authorities attribute within
-     * a provider tag.
-     * <p>
-     * This finds any reference and replaces it with the literal value found in the
-     * res/values/strings.xml file.
-     *
-     * @param file File for AndroidManifest.xml
-     */
-    public static void fixingPublicAttrsInProviderAttributes(File file) {
-        boolean saved = false;
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                XPath xPath = XPathFactory.newInstance().newXPath();
-                XPathExpression expression = xPath.compile("/manifest/application/provider");
-
-                Object result = expression.evaluate(doc, XPathConstants.NODESET);
-                NodeList nodes = (NodeList) result;
-
-                for (int i = 0; i < nodes.getLength(); i++) {
-                    Node node = nodes.item(i);
-                    NamedNodeMap attrs = node.getAttributes();
-                    Node provider = attrs.getNamedItem("android:authorities");
-
-                    if (provider != null) {
-                        saved = isSaved(file, saved, provider);
-                    }
-                }
-
-                // android:scheme
-                xPath = XPathFactory.newInstance().newXPath();
-                expression = xPath.compile("/manifest/application/activity/intent-filter/data");
-
-                result = expression.evaluate(doc, XPathConstants.NODESET);
-                nodes = (NodeList) result;
-
-                for (int i = 0; i < nodes.getLength(); i++) {
-                    Node node = nodes.item(i);
-                    NamedNodeMap attrs = node.getAttributes();
-                    Node provider = attrs.getNamedItem("android:scheme");
-
-                    if (provider != null) {
-                        saved = isSaved(file, saved, provider);
-                    }
-                }
-
-                if (saved) {
-                    saveDocument(file, doc);
-                }
-
-            }  catch (SAXException | ParserConfigurationException | IOException |
-                    XPathExpressionException | TransformerException ignored) {
-            }
-        }
-    }
-
-    /**
-     * Checks if the replacement was properly made to a node.
-     *
-     * @param file File we are searching for value
-     * @param saved boolean on whether we need to save
-     * @param provider Node we are attempting to replace
-     * @return boolean
-     */
-    private static boolean isSaved(File file, boolean saved, Node provider) {
-        String reference = provider.getNodeValue();
-        String replacement = pullValueFromStrings(file.getParentFile(), reference);
-
-        if (replacement != null) {
-            provider.setNodeValue(replacement);
-            saved = true;
-        }
-        return saved;
-    }
-
-    /**
-     * Finds key in strings.xml file and returns text value
-     *
-     * @param directory Root directory of apk
-     * @param key String reference (ie @string/foo)
-     * @return String|null
-     */
-    public static String pullValueFromStrings(File directory, String key) {
-        if (key == null || ! key.contains("@")) {
-            return null;
-        }
-
-        File file = new File(directory, "/res/values/strings.xml");
-        key = key.replace("@string/", "");
-
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                XPath xPath = XPathFactory.newInstance().newXPath();
-                XPathExpression expression = xPath.compile("/resources/string[@name=" + '"' + key + "\"]/text()");
-
-                Object result = expression.evaluate(doc, XPathConstants.STRING);
-
-                if (result != null) {
-                    return (String) result;
-                }
-
-            }  catch (SAXException | ParserConfigurationException | IOException | XPathExpressionException ignored) {
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Finds key in integers.xml file and returns text value
-     *
-     * @param directory Root directory of apk
-     * @param key Integer reference (ie @integer/foo)
-     * @return String|null
-     */
-    public static String pullValueFromIntegers(File directory, String key) {
-        if (key == null || ! key.contains("@")) {
-            return null;
-        }
-
-        File file = new File(directory, "/res/values/integers.xml");
-        key = key.replace("@integer/", "");
-
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                XPath xPath = XPathFactory.newInstance().newXPath();
-                XPathExpression expression = xPath.compile("/resources/integer[@name=" + '"' + key + "\"]/text()");
-
-                Object result = expression.evaluate(doc, XPathConstants.STRING);
-
-                if (result != null) {
-                    return (String) result;
-                }
-
-            }  catch (SAXException | ParserConfigurationException | IOException | XPathExpressionException ignored) {
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Removes attributes like "versionCode" and "versionName" from file.
-     *
-     * @param file File representing AndroidManifest.xml
-     */
-    public static void removeManifestVersions(File file) {
-        if (file.exists()) {
-            try {
-                Document doc = loadDocument(file);
-                Node manifest = doc.getFirstChild();
-                NamedNodeMap attr = manifest.getAttributes();
-                Node vCode = attr.getNamedItem("android:versionCode");
-                Node vName = attr.getNamedItem("android:versionName");
-
-                if (vCode != null) {
-                    attr.removeNamedItem("android:versionCode");
-                }
-                if (vName != null) {
-                    attr.removeNamedItem("android:versionName");
-                }
-                saveDocument(file, doc);
-
-            } catch (SAXException | ParserConfigurationException | IOException | TransformerException ignored) {
-            }
-        }
-    }
-
-    /**
-     * Replaces package value with passed packageOriginal string
-     *
-     * @param file File for AndroidManifest.xml
-     * @param packageOriginal Package name to replace
-     */
-    public static void renameManifestPackage(File file, String packageOriginal) {
-        try {
-            Document doc = loadDocument(file);
-
-            // Get the manifest line
-            Node manifest = doc.getFirstChild();
-
-            // update package attribute
-            NamedNodeMap attr = manifest.getAttributes();
-            Node nodeAttr = attr.getNamedItem("package");
-            nodeAttr.setNodeValue(packageOriginal);
-            saveDocument(file, doc);
-
-        } catch (SAXException | ParserConfigurationException | IOException | TransformerException ignored) {
-        }
-    }
-
-    /**
-     *
-     * @param file File to load into Document
-     * @return Document
-     */
-    private static Document loadDocument(File file)
-            throws IOException, SAXException, ParserConfigurationException {
-
-        DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-        docFactory.setFeature(FEATURE_DISABLE_DOCTYPE_DECL, true);
-        docFactory.setFeature(FEATURE_LOAD_DTD, false);
-
-        try {
-            docFactory.setAttribute(ACCESS_EXTERNAL_DTD, " ");
-            docFactory.setAttribute(ACCESS_EXTERNAL_SCHEMA, " ");
-        } catch (IllegalArgumentException ex) {
-            LOGGER.warning("JAXP 1.5 Support is required to validate XML");
-        }
-
-        DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-        // Not using the parse(File) method on purpose, so that we can control when
-        // to close it. Somehow parse(File) does not seem to close the file in all cases.
-        try (FileInputStream inputStream = new FileInputStream(file)) {
-            return docBuilder.parse(inputStream);
-        }
-    }
-
-    /**
-     *
-     * @param file File to save Document to (ie AndroidManifest.xml)
-     * @param doc Document being saved
-     */
-    private static void saveDocument(File file, Document doc)
-            throws IOException, SAXException, ParserConfigurationException, TransformerException {
-
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Transformer transformer = transformerFactory.newTransformer();
-        DOMSource source = new DOMSource(doc);
-        StreamResult result = new StreamResult(file);
-        transformer.transform(source, result);
-    }
-
-    private static final String ACCESS_EXTERNAL_DTD = "http://javax.xml.XMLConstants/property/accessExternalDTD";
-    private static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
-    private static final String FEATURE_LOAD_DTD = "http://apache.org/xml/features/nonvalidating/load-external-dtd";
-    private static final String FEATURE_DISABLE_DOCTYPE_DECL = "http://apache.org/xml/features/disallow-doctype-decl";
-
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/src/SmaliBuilder.java b/apktool/androlib/src/main/java/brut/androlib/src/SmaliBuilder.java
deleted file mode 100644
index 160eddb..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/src/SmaliBuilder.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.src;
-
-import static brut.androlib.ApkBuilder.LOGGER;
-
-import com.android.tools.smali.dexlib2.Opcodes;
-import com.android.tools.smali.dexlib2.writer.builder.DexBuilder;
-import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
-
-import org.antlr.runtime.RecognitionException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-
-import brut.androlib.err.AndrolibException;
-import brut.androlib.mod.SmaliMod;
-import brut.directory.DirectoryException;
-import brut.directory.ExtFile;
-
-public class SmaliBuilder {
-	
-	public static void build(ExtFile smaliDir, File dexFile, int apiLevel) throws AndrolibException {
-		new SmaliBuilder(smaliDir, dexFile, apiLevel).build();
-	}
-	
-	private SmaliBuilder(ExtFile smaliDir, File dexFile, int apiLevel) {
-		mSmaliDir = smaliDir;
-		mDexFile = dexFile;
-		mApiLevel = apiLevel;
-	}
-	
-	private void build() throws AndrolibException {
-		try {
-			DexBuilder dexBuilder;
-			if (mApiLevel > 0) {
-				dexBuilder = new DexBuilder(Opcodes.forApi(mApiLevel));
-			} else {
-				dexBuilder = new DexBuilder(Opcodes.getDefault());
-			}
-			
-			for (String fileName : mSmaliDir.getDirectory().getFiles(true)) {
-				buildFile(fileName, dexBuilder);
-			}
-			dexBuilder.writeTo(new FileDataStore(new File(mDexFile.getAbsolutePath())));
-		} catch (IOException | DirectoryException ex) {
-			throw new AndrolibException(ex);
-		}
-	}
-	
-	private void buildFile(String fileName, DexBuilder dexBuilder)
-			throws AndrolibException, IOException {
-		File inFile = new File(mSmaliDir, fileName);
-		InputStream inStream = Files.newInputStream(inFile.toPath());
-		
-		if (fileName.endsWith(".smali")) {
-			try {
-				if (!SmaliMod.assembleSmaliFile(inFile, dexBuilder, mApiLevel, false, false)) {
-					throw new AndrolibException("Could not smali file: " + fileName);
-				}
-			} catch (IOException | RecognitionException ex) {
-				throw new AndrolibException(ex);
-			}
-		} else
-			LOGGER.warning("Unknown file type, ignoring: " + inFile);
-		inStream.close();
-	}
-	
-	private final ExtFile mSmaliDir;
-	private final File mDexFile;
-	private final int mApiLevel;
-	
-}
diff --git a/apktool/androlib/src/main/java/brut/androlib/src/SmaliDecoder.java b/apktool/androlib/src/main/java/brut/androlib/src/SmaliDecoder.java
deleted file mode 100644
index ac2c0c4..0000000
--- a/apktool/androlib/src/main/java/brut/androlib/src/SmaliDecoder.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.androlib.src;
-
-
-
-import com.android.tools.smali.baksmali.Baksmali;
-import com.android.tools.smali.baksmali.BaksmaliOptions;
-import com.android.tools.smali.dexlib2.DexFileFactory;
-import com.android.tools.smali.dexlib2.Opcodes;
-import com.android.tools.smali.dexlib2.analysis.InlineMethodResolver;
-import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
-import com.android.tools.smali.dexlib2.dexbacked.DexBackedOdexFile;
-import com.android.tools.smali.dexlib2.iface.DexFile;
-import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
-
-import java.io.File;
-import java.io.IOException;
-
-import brut.androlib.err.AndrolibException;
-
-public class SmaliDecoder {
-
-    public static DexFile decode(File apkFile, File outDir, String dexName, boolean bakDeb, int apiLevel)
-            throws AndrolibException {
-        return new SmaliDecoder(apkFile, outDir, dexName, bakDeb, apiLevel).decode();
-    }
-
-    private SmaliDecoder(File apkFile, File outDir, String dexName, boolean bakDeb, int apiLevel) {
-        mApkFile = apkFile;
-        mOutDir = outDir;
-        mDexFile = dexName;
-        mBakDeb = bakDeb;
-        mApiLevel = apiLevel;
-    }
-
-    private DexFile decode() throws AndrolibException {
-        try {
-            final BaksmaliOptions options = new BaksmaliOptions();
-
-            // options
-            options.deodex = false;
-            options.implicitReferences = false;
-            options.parameterRegisters = true;
-            options.localsDirective = true;
-            options.sequentialLabels = true;
-            options.debugInfo = mBakDeb;
-            options.codeOffsets = false;
-            options.accessorComments = false;
-            options.registerInfo = 0;
-            options.inlineResolver = null;
-
-            // set jobs automatically
-            int jobs = Runtime.getRuntime().availableProcessors();
-            if (jobs > 6) {
-                jobs = 6;
-            }
-
-            // create the container
-            MultiDexContainer<? extends DexBackedDexFile> container =
-                    DexFileFactory.loadDexContainer(mApkFile, mApiLevel > 0 ? Opcodes.forApi(mApiLevel) : null);
-            MultiDexContainer.DexEntry<? extends DexBackedDexFile> dexEntry;
-            DexBackedDexFile dexFile;
-
-            // If we have 1 item, ignore the passed file. Pull the DexFile we need.
-            if (container.getDexEntryNames().size() == 1) {
-                dexEntry = container.getEntry(container.getDexEntryNames().get(0));
-            } else {
-                dexEntry = container.getEntry(mDexFile);
-            }
-
-            // Double check the passed param exists
-            if (dexEntry == null) {
-                dexEntry = container.getEntry(container.getDexEntryNames().get(0));
-            }
-
-            assert dexEntry != null;
-            dexFile = dexEntry.getDexFile();
-
-            if (dexFile.supportsOptimizedOpcodes()) {
-                throw new AndrolibException("Warning: You are disassembling an odex file without deodexing it.");
-            }
-
-            if (dexFile instanceof DexBackedOdexFile) {
-                options.inlineResolver =
-                        InlineMethodResolver.createInlineMethodResolver(((DexBackedOdexFile)dexFile).getOdexVersion());
-            }
-
-            Baksmali.disassembleDexFile(dexFile, mOutDir, jobs, options);
-
-            return dexFile;
-        } catch (IOException ex) {
-            throw new AndrolibException(ex);
-        }
-    }
-
-    private final File mApkFile;
-    private final File mOutDir;
-    private final String mDexFile;
-    private final boolean mBakDeb;
-    private final int mApiLevel;
-}
diff --git a/apktool/androlib/src/test/java/brut/androlib/ExampleUnitTest.java b/apktool/androlib/src/test/java/brut/androlib/ExampleUnitTest.java
deleted file mode 100644
index b18bf32..0000000
--- a/apktool/androlib/src/test/java/brut/androlib/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package brut.androlib;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/apktool/common/.gitignore b/apktool/common/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/apktool/common/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/apktool/common/build.gradle b/apktool/common/build.gradle
deleted file mode 100644
index 3e2fec0..0000000
--- a/apktool/common/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'brut.common'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 26
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs = ['src/main/java']
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    testImplementation libs.junit
-    androidTestImplementation libs.androidx.test.ext.junit
-    androidTestImplementation libs.espresso.core
-}
\ No newline at end of file
diff --git a/apktool/common/consumer-rules.pro b/apktool/common/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/apktool/common/proguard-rules.pro b/apktool/common/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/apktool/common/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/apktool/common/src/androidTest/java/brut/common/ExampleInstrumentedTest.java b/apktool/common/src/androidTest/java/brut/common/ExampleInstrumentedTest.java
deleted file mode 100644
index 1f323c6..0000000
--- a/apktool/common/src/androidTest/java/brut/common/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package brut.common;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("brut.common.test", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/apktool/common/src/main/AndroidManifest.xml b/apktool/common/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/apktool/common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/apktool/common/src/main/java/brut/common/BrutException.java b/apktool/common/src/main/java/brut/common/BrutException.java
deleted file mode 100644
index b85c716..0000000
--- a/apktool/common/src/main/java/brut/common/BrutException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.common;
-
-public class BrutException extends Exception {
-    public BrutException(Throwable cause) {
-        super(cause);
-    }
-
-    public BrutException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public BrutException(String message) {
-        super(message);
-    }
-
-    public BrutException() {
-    }
-}
diff --git a/apktool/common/src/main/java/brut/common/InvalidUnknownFileException.java b/apktool/common/src/main/java/brut/common/InvalidUnknownFileException.java
deleted file mode 100644
index 195cd9a..0000000
--- a/apktool/common/src/main/java/brut/common/InvalidUnknownFileException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.common;
-
-public class InvalidUnknownFileException extends BrutException {
-    public InvalidUnknownFileException(String message) {
-        super(message);
-    }
-}
diff --git a/apktool/common/src/main/java/brut/common/RootUnknownFileException.java b/apktool/common/src/main/java/brut/common/RootUnknownFileException.java
deleted file mode 100644
index 1457268..0000000
--- a/apktool/common/src/main/java/brut/common/RootUnknownFileException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.common;
-
-public class RootUnknownFileException extends BrutException {
-    public RootUnknownFileException(String message) {
-        super(message);
-    }
-}
diff --git a/apktool/common/src/main/java/brut/common/TraversalUnknownFileException.java b/apktool/common/src/main/java/brut/common/TraversalUnknownFileException.java
deleted file mode 100644
index a58116e..0000000
--- a/apktool/common/src/main/java/brut/common/TraversalUnknownFileException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.common;
-
-public class TraversalUnknownFileException extends BrutException {
-    public TraversalUnknownFileException(String message) {
-        super(message);
-    }
-}
diff --git a/apktool/common/src/test/java/brut/common/ExampleUnitTest.java b/apktool/common/src/test/java/brut/common/ExampleUnitTest.java
deleted file mode 100644
index 1f09dc0..0000000
--- a/apktool/common/src/test/java/brut/common/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package brut.common;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/apktool/directory/.gitignore b/apktool/directory/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/apktool/directory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/apktool/directory/build.gradle b/apktool/directory/build.gradle
deleted file mode 100644
index d646b6f..0000000
--- a/apktool/directory/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'brut.directory'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 26
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs = ['src/main/java']
-        }
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled = true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    coreLibraryDesugaring libs.desugar.jdk.libs.nio
-    implementation project(':common')
-    implementation project(':apktool:common')
-    implementation project(':apktool:util')
-    implementation libs.androidx.annotation
-    testImplementation libs.junit
-    androidTestImplementation libs.androidx.test.ext.junit
-    androidTestImplementation libs.espresso.core
-}
\ No newline at end of file
diff --git a/apktool/directory/consumer-rules.pro b/apktool/directory/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/apktool/directory/proguard-rules.pro b/apktool/directory/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/apktool/directory/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/apktool/directory/src/androidTest/java/brut/directory/ExampleInstrumentedTest.java b/apktool/directory/src/androidTest/java/brut/directory/ExampleInstrumentedTest.java
deleted file mode 100644
index bed9f84..0000000
--- a/apktool/directory/src/androidTest/java/brut/directory/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package brut.directory;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("brut.directory.test", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/apktool/directory/src/main/AndroidManifest.xml b/apktool/directory/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/apktool/directory/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/apktool/directory/src/main/java/brut/directory/AbstractDirectory.java b/apktool/directory/src/main/java/brut/directory/AbstractDirectory.java
deleted file mode 100644
index af92438..0000000
--- a/apktool/directory/src/main/java/brut/directory/AbstractDirectory.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-public abstract class AbstractDirectory implements Directory {
-    protected Set<String> mFiles;
-    protected Set<String> mFilesRecursive;
-    protected Map<String, AbstractDirectory> mDirs;
-
-    @Override
-    public Set<String> getFiles() {
-        return getFiles(false);
-    }
-
-    @Override
-    public Set<String> getFiles(boolean recursive) {
-        if (mFiles == null) {
-            loadFiles();
-        }
-        if (!recursive) {
-            return mFiles;
-        }
-        if (mFilesRecursive == null) {
-            mFilesRecursive = new LinkedHashSet<>(mFiles);
-            for (Map.Entry<String, ? extends Directory> dir : getAbstractDirs().entrySet()) {
-                for (String path : dir.getValue().getFiles(true)) {
-                    mFilesRecursive.add(dir.getKey() + separator + path);
-                }
-            }
-        }
-        return mFilesRecursive;
-    }
-
-    @Override
-    public boolean containsFile(String path) {
-        SubPath subpath;
-        try {
-            subpath = getSubPath(path);
-        } catch (PathNotExist e) {
-            return false;
-        }
-
-        if (subpath.dir != null) {
-            return subpath.dir.containsFile(subpath.path);
-        }
-        return getFiles().contains(subpath.path);
-    }
-
-    @Override
-    public boolean containsDir(String path) {
-        SubPath subpath;
-        try {
-            subpath = getSubPath(path);
-        } catch (PathNotExist e) {
-            return false;
-        }
-
-        if (subpath.dir != null) {
-            return subpath.dir.containsDir(subpath.path);
-        }
-        return getAbstractDirs().containsKey(subpath.path);
-    }
-
-    @Override
-    public Map<String, Directory> getDirs()
-            throws UnsupportedOperationException {
-        return getDirs(false);
-    }
-
-    @Override
-    public Map<String, Directory> getDirs(boolean recursive)
-            throws UnsupportedOperationException {
-        return new LinkedHashMap<>(getAbstractDirs(recursive));
-    }
-
-    @Override
-    public InputStream getFileInput(String path) throws DirectoryException {
-        SubPath subpath = getSubPath(path);
-        if (subpath.dir != null) {
-            return subpath.dir.getFileInput(subpath.path);
-        }
-        if (! getFiles().contains(subpath.path)) {
-            throw new PathNotExist(path);
-        }
-        return getFileInputLocal(subpath.path);
-    }
-
-    @Override
-    public OutputStream getFileOutput(String path) throws DirectoryException {
-        ParsedPath parsed = parsePath(path);
-        if (parsed.dir == null) {
-            getFiles().add(parsed.subpath);
-            return getFileOutputLocal(parsed.subpath);
-        }
-
-        Directory dir;
-        // IMPOSSIBLE_EXCEPTION
-        try {
-            dir = createDir(parsed.dir);
-        } catch (PathAlreadyExists e) {
-            dir = getAbstractDirs().get(parsed.dir);
-        }
-        return Objects.requireNonNull(dir).getFileOutput(parsed.subpath);
-    }
-
-    @Override
-    public Directory getDir(String path) throws PathNotExist {
-        SubPath subpath = getSubPath(path);
-        if (subpath.dir != null) {
-            return subpath.dir.getDir(subpath.path);
-        }
-        if (! getAbstractDirs().containsKey(subpath.path)) {
-            throw new PathNotExist(path);
-        }
-        return getAbstractDirs().get(subpath.path);
-    }
-
-    @Override
-    public Directory createDir(String path) throws DirectoryException {
-        ParsedPath parsed = parsePath(path);
-        AbstractDirectory dir;
-        if (parsed.dir == null) {
-            if (getAbstractDirs().containsKey(parsed.subpath)) {
-                throw new PathAlreadyExists(path);
-            }
-            dir = createDirLocal(parsed.subpath);
-            getAbstractDirs().put(parsed.subpath, dir);
-            return dir;
-        }
-
-        if (getAbstractDirs().containsKey(parsed.dir)) {
-            dir = getAbstractDirs().get(parsed.dir);
-        } else {
-            dir = createDirLocal(parsed.dir);
-            getAbstractDirs().put(parsed.dir, dir);
-        }
-        return Objects.requireNonNull(dir).createDir(parsed.subpath);
-    }
-
-    @Override
-    public boolean removeFile(String path) {
-        SubPath subpath;
-        try {
-            subpath = getSubPath(path);
-        } catch (PathNotExist e) {
-            return false;
-        }
-
-        if (subpath.dir != null) {
-            return subpath.dir.removeFile(subpath.path);
-        }
-        if (! getFiles().contains(subpath.path)) {
-            return false;
-        }
-        removeFileLocal(subpath.path);
-        getFiles().remove(subpath.path);
-        return true;
-    }
-
-    public void copyToDir(Directory out) throws DirectoryException {
-        DirUtil.copyToDir(out, out);
-    }
-
-    public void copyToDir(Directory out, String[] fileNames)
-            throws DirectoryException {
-        DirUtil.copyToDir(out, out, fileNames);
-    }
-
-    public void copyToDir(Directory out, String fileName)
-            throws DirectoryException {
-        DirUtil.copyToDir(out, out, fileName);
-    }
-
-    public void copyToDir(File out) throws DirectoryException {
-        DirUtil.copyToDir(this, out);
-    }
-
-    public void copyToDir(File out, String[] fileNames)
-            throws DirectoryException {
-        DirUtil.copyToDir(this, out, fileNames);
-    }
-
-    public void copyToDir(File out, String fileName)
-            throws DirectoryException {
-        DirUtil.copyToDir(this, out, fileName);
-    }
-
-    public int getCompressionLevel(String fileName)
-            throws DirectoryException {
-        return -1;  // Unknown
-    }
-
-    protected Map<String, AbstractDirectory> getAbstractDirs() {
-        return getAbstractDirs(false);
-    }
-
-    protected Map<String, AbstractDirectory> getAbstractDirs(boolean recursive) {
-        if (mDirs == null) {
-            loadDirs();
-        }
-        if (!recursive) {
-            return mDirs;
-        }
-
-        Map<String, AbstractDirectory> dirs = new LinkedHashMap<>(mDirs);
-        for (Map.Entry<String, AbstractDirectory> dir : getAbstractDirs().entrySet()) {
-            for (Map.Entry<String, AbstractDirectory> subdir : dir.getValue().getAbstractDirs(
-                    true).entrySet()) {
-                dirs.put(dir.getKey() + separator + subdir.getKey(),
-                        subdir.getValue());
-            }
-        }
-        return dirs;
-    }
-
-
-    public void close() throws IOException {
-
-    }
-
-    private SubPath getSubPath(String path) throws PathNotExist {
-        ParsedPath parsed = parsePath(path);
-        if (parsed.dir == null) {
-            return new SubPath(null, parsed.subpath);
-        }
-        if (! getAbstractDirs().containsKey(parsed.dir)) {
-            throw new PathNotExist(path);
-        }
-        return new SubPath(getAbstractDirs().get(parsed.dir), parsed.subpath);
-    }
-
-    private ParsedPath parsePath(String path) {
-        int pos = path.indexOf(separator);
-        if (pos == -1) {
-            return new ParsedPath(null, path);
-        }
-        return new ParsedPath(path.substring(0, pos), path.substring(pos + 1));
-    }
-
-    protected abstract void loadFiles();
-    protected abstract void loadDirs();
-    protected abstract InputStream getFileInputLocal(String name)
-        throws DirectoryException;
-    protected abstract OutputStream getFileOutputLocal(String name)
-        throws DirectoryException;
-    protected abstract AbstractDirectory createDirLocal(String name)
-        throws DirectoryException;
-    protected abstract void removeFileLocal(String name);
-
-
-    private static class ParsedPath {
-        public final String dir;
-        public final String subpath;
-        public ParsedPath(String dir, String subpath) {
-            this.dir = dir;
-            this.subpath = subpath;
-        }
-    }
-
-    private static class SubPath {
-        public final AbstractDirectory dir;
-        public final String path;
-
-        public SubPath(AbstractDirectory dir, String path) {
-            this.dir = dir;
-            this.path = path;
-        }
-    }
-}
diff --git a/apktool/directory/src/main/java/brut/directory/DirUtil.java b/apktool/directory/src/main/java/brut/directory/DirUtil.java
deleted file mode 100644
index a203776..0000000
--- a/apktool/directory/src/main/java/brut/directory/DirUtil.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Objects;
-
-import brut.common.BrutException;
-import brut.util.BrutIO;
-import brut.util.OS;
-
-public class DirUtil {
-
-    private DirUtil() {
-        // Private constructor for utility class
-    }
-
-    public static void copyToDir(Directory in, Directory out)
-            throws DirectoryException {
-        for (String fileName : in.getFiles(true)) {
-            copyToDir(in, out, fileName);
-        }
-    }
-
-    public static void copyToDir(Directory in, Directory out,
-            String[] fileNames) throws DirectoryException {
-        for (String fileName : fileNames) {
-            copyToDir(in, out, fileName);
-        }
-    }
-
-    public static void copyToDir(Directory in, Directory out, String fileName)
-            throws DirectoryException {
-        copyToDir(in, out, fileName, fileName);
-    }
-
-    public static void copyToDir(Directory in, Directory out, String inFile, String outFile)
-            throws DirectoryException {
-        try {
-            if (in.containsDir(inFile)) {
-                in.getDir(inFile).copyToDir(out.createDir(outFile));
-            } else {
-                BrutIO.copyAndClose(in.getFileInput(inFile), out.getFileOutput(outFile));
-            }
-        } catch (IOException ex) {
-            throw new DirectoryException("Error copying file: " + inFile, ex);
-        }
-    }
-
-    public static void copyToDir(Directory in, File out)
-            throws DirectoryException {
-        for (String fileName : in.getFiles(true)) {
-            copyToDir(in, out, fileName);
-        }
-    }
-
-    public static void copyToDir(Directory in, File out, String[] fileNames)
-            throws DirectoryException {
-        for (String fileName : fileNames) {
-            copyToDir(in, out, fileName);
-        }
-    }
-
-    public static void copyToDir(Directory in, File out, String fileName)
-            throws DirectoryException {
-        try {
-            if (in.containsDir(fileName)) {
-                OS.rmdir(new File(out, fileName));
-                in.getDir(fileName).copyToDir(new File(out, fileName));
-            } else if (!in.containsDir(fileName) && !in.containsFile(fileName)) {
-                // Skip copies of directories/files not found.
-            } else {
-                String cleanedFilename = BrutIO.sanitizeUnknownFile(out, fileName);
-                File outFile = new File(out, cleanedFilename);
-                Objects.requireNonNull(outFile.getParentFile()).mkdirs();
-                BrutIO.copyAndClose(in.getFileInput(fileName), Files.newOutputStream(outFile.toPath()));
-            }
-        } catch (IOException | BrutException ex) {
-            throw new DirectoryException("Error copying file: " + fileName, ex);
-        }
-    }
-}
diff --git a/apktool/directory/src/main/java/brut/directory/Directory.java b/apktool/directory/src/main/java/brut/directory/Directory.java
deleted file mode 100644
index 86c848a..0000000
--- a/apktool/directory/src/main/java/brut/directory/Directory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.Set;
-
-public interface Directory {
-    Set<String> getFiles();
-
-    Set<String> getFiles(boolean recursive);
-
-    Map<String, Directory> getDirs();
-
-    Map<String, Directory> getDirs(boolean recursive);
-
-    boolean containsFile(String path);
-
-    boolean containsDir(String path);
-
-    InputStream getFileInput(String path) throws DirectoryException;
-
-    OutputStream getFileOutput(String path) throws DirectoryException;
-
-    Directory getDir(String path) throws PathNotExist;
-
-    Directory createDir(String path) throws DirectoryException;
-
-    boolean removeFile(String path);
-
-    void copyToDir(Directory out) throws DirectoryException;
-
-    void copyToDir(Directory out, String[] fileNames)
-        throws DirectoryException;
-
-    void copyToDir(Directory out, String fileName)
-        throws DirectoryException;
-
-    void copyToDir(File out) throws DirectoryException;
-
-    void copyToDir(File out, String[] fileNames)
-        throws DirectoryException;
-
-    void copyToDir(File out, String fileName)
-        throws DirectoryException;
-
-    long getSize(String fileName)
-        throws DirectoryException;
-
-    long getCompressedSize(String fileName)
-        throws DirectoryException;
-
-    int getCompressionLevel(String fileName)
-        throws DirectoryException;
-
-    void close() throws IOException;
-
-    char separator = '/';
-}
diff --git a/apktool/directory/src/main/java/brut/directory/DirectoryException.java b/apktool/directory/src/main/java/brut/directory/DirectoryException.java
deleted file mode 100644
index 86db499..0000000
--- a/apktool/directory/src/main/java/brut/directory/DirectoryException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import brut.common.BrutException;
-
-public class DirectoryException extends BrutException {
-    private static final long serialVersionUID = -8871963042836625387L;
-
-    public DirectoryException(String detailMessage, Throwable throwable) {
-        super(detailMessage, throwable);
-    }
-
-    public DirectoryException(String detailMessage) {
-        super(detailMessage);
-    }
-
-    public DirectoryException(Throwable throwable) {
-        super(throwable);
-    }
-
-    public DirectoryException() {
-        super();
-    }
-}
diff --git a/apktool/directory/src/main/java/brut/directory/ExtFile.java b/apktool/directory/src/main/java/brut/directory/ExtFile.java
deleted file mode 100644
index 575ea9b..0000000
--- a/apktool/directory/src/main/java/brut/directory/ExtFile.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-
-public class ExtFile extends File {
-    public ExtFile(File file) {
-        super(file.getPath());
-    }
-
-    public ExtFile(URI uri) {
-        super(uri);
-    }
-
-    public ExtFile(File parent, String child) {
-        super(parent, child);
-    }
-
-    public ExtFile(String parent, String child) {
-        super(parent, child);
-    }
-
-    public ExtFile(String pathname) {
-        super(pathname);
-    }
-
-    public Directory getDirectory() throws DirectoryException {
-        if (mDirectory == null) {
-            if (isDirectory()) {
-                mDirectory = new FileDirectory(this);
-            } else {
-                mDirectory = new ZipRODirectory(this);
-            }
-        }
-        return mDirectory;
-    }
-
-    public void close() throws IOException {
-        if (mDirectory != null) {
-            mDirectory.close();
-        }
-    }
-
-    private Directory mDirectory;
-}
diff --git a/apktool/directory/src/main/java/brut/directory/FileDirectory.java b/apktool/directory/src/main/java/brut/directory/FileDirectory.java
deleted file mode 100644
index c5fc42f..0000000
--- a/apktool/directory/src/main/java/brut/directory/FileDirectory.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Objects;
-
-public class FileDirectory extends AbstractDirectory {
-    private final File mDir;
-
-    public FileDirectory(ExtFile dir, String folder) throws DirectoryException {
-        this(new File(dir.toString().replaceAll("%20", " "), folder));
-    }
-
-    public FileDirectory(String dir) throws DirectoryException, UnsupportedEncodingException {
-        this(new File(URLDecoder.decode(dir, "UTF-8")));
-    }
-
-    public FileDirectory(File dir) throws DirectoryException {
-        super();
-        if (! dir.isDirectory()) {
-            throw new DirectoryException("file must be a directory: " + dir);
-        }
-        mDir = dir;
-    }
-
-    @Override
-    public long getSize(String fileName)
-            throws DirectoryException {
-        File file = new File(generatePath(fileName));
-        if (! file.isFile()) {
-            throw new DirectoryException("file must be a file: " + file);
-        }
-        return file.length();
-    }
-
-    @Override
-    public long getCompressedSize(String fileName)
-            throws DirectoryException {
-        return getSize(fileName);
-    }
-
-    @Override
-    protected AbstractDirectory createDirLocal(String name) throws DirectoryException {
-        File dir = new File(generatePath(name));
-        dir.mkdir();
-        return new FileDirectory(dir);
-    }
-
-    @Override
-    protected InputStream getFileInputLocal(String name) throws DirectoryException {
-        try {
-            return new FileInputStream(generatePath(name));
-        } catch (FileNotFoundException e) {
-            throw new DirectoryException(e);
-        }
-    }
-
-    @Override
-    protected OutputStream getFileOutputLocal(String name) throws DirectoryException {
-        try {
-            return new FileOutputStream(generatePath(name));
-        } catch (FileNotFoundException e) {
-            throw new DirectoryException(e);
-        }
-    }
-
-    @Override
-    protected void loadDirs() {
-        loadAll();
-    }
-
-    @Override
-    protected void loadFiles() {
-        loadAll();
-    }
-
-    @Override
-    protected void removeFileLocal(String name) {
-        new File(generatePath(name)).delete();
-    }
-
-    private String generatePath(String name) {
-        return getDir().getPath() + separator + name;
-    }
-
-    private void loadAll() {
-        mFiles = new LinkedHashSet<>();
-        mDirs = new LinkedHashMap<>();
-
-        File[] files = getDir().listFiles();
-        for (File file : Objects.requireNonNull(files)) {
-            if (file.isFile()) {
-                mFiles.add(file.getName());
-            } else {
-                // IMPOSSIBLE_EXCEPTION
-                try {
-                    mDirs.put(file.getName(), new FileDirectory(file));
-                } catch (DirectoryException ignored) {}
-            }
-        }
-    }
-
-    private File getDir() {
-        return mDir;
-    }
-}
diff --git a/apktool/directory/src/main/java/brut/directory/PathAlreadyExists.java b/apktool/directory/src/main/java/brut/directory/PathAlreadyExists.java
deleted file mode 100644
index 57e7d10..0000000
--- a/apktool/directory/src/main/java/brut/directory/PathAlreadyExists.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-public class PathAlreadyExists extends DirectoryException {
-    public PathAlreadyExists() {
-    }
-
-    public PathAlreadyExists(Throwable throwable) {
-        super(throwable);
-    }
-
-    public PathAlreadyExists(String detailMessage) {
-        super(detailMessage);
-    }
-
-    public PathAlreadyExists(String detailMessage, Throwable throwable) {
-        super(detailMessage, throwable);
-    }
-
-    private static final long serialVersionUID = 3776428251424428904L;
-}
diff --git a/apktool/directory/src/main/java/brut/directory/PathNotExist.java b/apktool/directory/src/main/java/brut/directory/PathNotExist.java
deleted file mode 100644
index f31c8ab..0000000
--- a/apktool/directory/src/main/java/brut/directory/PathNotExist.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-public class PathNotExist extends DirectoryException {
-    public PathNotExist() {
-        super();
-    }
-
-    public PathNotExist(String detailMessage, Throwable throwable) {
-        super(detailMessage, throwable);
-    }
-
-    public PathNotExist(String detailMessage) {
-        super(detailMessage);
-    }
-
-    public PathNotExist(Throwable throwable) {
-        super(throwable);
-    }
-
-    private static final long serialVersionUID = -6949242015506342032L;
-}
diff --git a/apktool/directory/src/main/java/brut/directory/ZipRODirectory.java b/apktool/directory/src/main/java/brut/directory/ZipRODirectory.java
deleted file mode 100644
index b6072ab..0000000
--- a/apktool/directory/src/main/java/brut/directory/ZipRODirectory.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class ZipRODirectory extends AbstractDirectory {
-    private final ZipFile mZipFile;
-    private final String mPath;
-
-    public ZipRODirectory(String zipFileName) throws DirectoryException {
-        this(zipFileName, "");
-    }
-
-    public ZipRODirectory(File zipFile) throws DirectoryException {
-        this(zipFile, "");
-    }
-
-    public ZipRODirectory(ZipFile zipFile) {
-        this(zipFile, "");
-    }
-
-    public ZipRODirectory(String zipFileName, String path)
-            throws DirectoryException {
-        this(new File(zipFileName), path);
-    }
-
-    public ZipRODirectory(File zipFile, String path) throws DirectoryException {
-        super();
-        try {
-            mZipFile = new ZipFile(zipFile);
-        } catch (IOException e) {
-            throw new DirectoryException(e);
-        }
-        mPath = path;
-    }
-
-    public ZipRODirectory(ZipFile zipFile, String path) {
-        super();
-        mZipFile = zipFile;
-        mPath = path;
-    }
-
-    @Override
-    protected AbstractDirectory createDirLocal(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected InputStream getFileInputLocal(String name)
-            throws DirectoryException {
-        try {
-            return getZipFile().getInputStream(new ZipEntry(getPath() + name));
-        } catch (IOException e) {
-            throw new PathNotExist(name, e);
-        }
-    }
-
-    @Override
-    protected OutputStream getFileOutputLocal(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected void loadDirs() {
-        loadAll();
-    }
-
-    @Override
-    protected void loadFiles() {
-        loadAll();
-    }
-
-    @Override
-    protected void removeFileLocal(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getSize(String fileName)
-            throws DirectoryException {
-        ZipEntry entry = getZipFileEntry(fileName);
-        return entry.getSize();
-    }
-
-    @Override
-    public long getCompressedSize(String fileName)
-            throws DirectoryException {
-        ZipEntry entry = getZipFileEntry(fileName);
-        return entry.getCompressedSize();
-    }
-
-    @Override
-    public int getCompressionLevel(String fileName)
-            throws DirectoryException {
-        ZipEntry entry = getZipFileEntry(fileName);
-        return entry.getMethod();
-    }
-
-    private ZipEntry getZipFileEntry(String fileName)
-            throws DirectoryException {
-        ZipEntry entry = mZipFile.getEntry(fileName);
-        if (entry == null) {
-            throw new PathNotExist("Entry not found: " + fileName);
-        }
-        return entry;
-    }
-
-    private void loadAll() {
-        mFiles = new LinkedHashSet<>();
-        mDirs = new LinkedHashMap<>();
-
-        int prefixLen = getPath().length();
-        Enumeration<? extends ZipEntry> entries = getZipFile().entries();
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            String name = entry.getName();
-
-            if (name.equals(getPath()) || ! name.startsWith(getPath()) || name.contains(".." + separator)) {
-                continue;
-            }
-
-            String subname = name.substring(prefixLen);
-
-            int pos = subname.indexOf(separator);
-            if (pos == -1) {
-                if (! entry.isDirectory()) {
-                    mFiles.add(subname);
-                    continue;
-                }
-            } else {
-                subname = subname.substring(0, pos);
-            }
-
-            if (! mDirs.containsKey(subname)) {
-                AbstractDirectory dir = new ZipRODirectory(getZipFile(), getPath() + subname + separator);
-                mDirs.put(subname, dir);
-            }
-        }
-    }
-
-    private String getPath() {
-        return mPath;
-    }
-
-    private ZipFile getZipFile() {
-        return mZipFile;
-    }
-
-
-    public void close() throws IOException {
-        mZipFile.close();
-    }
-}
diff --git a/apktool/directory/src/main/java/brut/directory/ZipUtils.java b/apktool/directory/src/main/java/brut/directory/ZipUtils.java
deleted file mode 100644
index 6bbf1f3..0000000
--- a/apktool/directory/src/main/java/brut/directory/ZipUtils.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.directory;
-
-import static java.util.Objects.requireNonNull;
-
-import com.apkide.common.FileUtils;
-import com.apkide.common.IOUtils;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collection;
-import java.util.zip.CRC32;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import brut.common.BrutException;
-import brut.util.BrutIO;
-
-public class ZipUtils {
-
-    private static Collection<String> mDoNotCompress;
-
-    private ZipUtils() {
-        // Private constructor for utility class
-    }
-
-    public static void zipFolders(final File folder, final File zip, final File assets, final Collection<String> doNotCompress)
-            throws BrutException, IOException {
-
-        mDoNotCompress = doNotCompress;
-        ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(zip.toPath()));
-        zipFolders(folder, zipOutputStream);
-
-        // We manually set the assets because we need to retain the folder structure
-        if (assets != null) {
-            processFolder(assets, zipOutputStream, assets.getPath().length() - 6);
-        }
-        zipOutputStream.close();
-    }
-
-    private static void zipFolders(final File folder, final ZipOutputStream outputStream)
-            throws BrutException, IOException {
-        processFolder(folder, outputStream, folder.getPath().length() + 1);
-    }
-
-    private static void processFolder(final File folder, final ZipOutputStream zipOutputStream, final int prefixLength)
-            throws BrutException, IOException {
-        for (final File file : requireNonNull(folder.listFiles())) {
-            if (file.isFile()) {
-                final String cleanedPath = BrutIO.sanitizeUnknownFile(folder, file.getPath().substring(prefixLength));
-                final ZipEntry zipEntry = new ZipEntry(BrutIO.normalizePath(cleanedPath));
-
-                // aapt binary by default takes in parameters via -0 arsc to list extensions that shouldn't be
-                // compressed. We will replicate that behavior
-                final String extension = FileUtils.getExtension(file.getAbsolutePath());
-                if (mDoNotCompress != null && (mDoNotCompress.contains(extension) || mDoNotCompress.contains(zipEntry.getName()))) {
-                    zipEntry.setMethod(ZipEntry.STORED);
-                    zipEntry.setSize(file.length());
-                    BufferedInputStream unknownFile = new BufferedInputStream(Files.newInputStream(file.toPath()));
-                    CRC32 crc = BrutIO.calculateCrc(unknownFile);
-                    zipEntry.setCrc(crc.getValue());
-                    unknownFile.close();
-                } else {
-                    zipEntry.setMethod(ZipEntry.DEFLATED);
-                }
-
-                zipOutputStream.putNextEntry(zipEntry);
-                try (FileInputStream inputStream = new FileInputStream(file)) {
-                    IOUtils.copyBytes(inputStream, zipOutputStream);
-                }
-                zipOutputStream.closeEntry();
-            } else if (file.isDirectory()) {
-                processFolder(file, zipOutputStream, prefixLength);
-            }
-        }
-    }
-}
diff --git a/apktool/directory/src/test/java/brut/directory/ExampleUnitTest.java b/apktool/directory/src/test/java/brut/directory/ExampleUnitTest.java
deleted file mode 100644
index 50dc977..0000000
--- a/apktool/directory/src/test/java/brut/directory/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package brut.directory;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/apktool/util/.gitignore b/apktool/util/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/apktool/util/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/apktool/util/build.gradle b/apktool/util/build.gradle
deleted file mode 100644
index 85d861e..0000000
--- a/apktool/util/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'brut.util'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 26
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs = ['src/main/java']
-            resources.srcDirs = ['src/main/java', 'src/main/resources']
-        }
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled = true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    coreLibraryDesugaring libs.desugar.jdk.libs.nio
-    implementation project(':common')
-    implementation project(':apktool:common')
-    implementation libs.androidx.annotation
-    testImplementation libs.junit
-    androidTestImplementation libs.androidx.test.ext.junit
-    androidTestImplementation libs.espresso.core
-}
\ No newline at end of file
diff --git a/apktool/util/consumer-rules.pro b/apktool/util/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/apktool/util/proguard-rules.pro b/apktool/util/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/apktool/util/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/apktool/util/src/androidTest/java/brut/util/ExampleInstrumentedTest.java b/apktool/util/src/androidTest/java/brut/util/ExampleInstrumentedTest.java
deleted file mode 100644
index 09000e8..0000000
--- a/apktool/util/src/androidTest/java/brut/util/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package brut.util;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("brut.util.test", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/apktool/util/src/main/AndroidManifest.xml b/apktool/util/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/apktool/util/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/apktool/util/src/main/java/brut/util/AaptManager.java b/apktool/util/src/main/java/brut/util/AaptManager.java
deleted file mode 100644
index c61157d..0000000
--- a/apktool/util/src/main/java/brut/util/AaptManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.util;
-
-import android.text.TextUtils;
-
-import com.apkide.common.ApplicationProvider;
-
-import java.io.File;
-
-import brut.common.BrutException;
-
-public class AaptManager {
-
-	public static File getAapt2() throws BrutException {
-		return getAapt(2);
-	}
-
-	public static File getAapt1() throws BrutException {
-		return getAapt(1);
-	}
-
-	private static File getAapt(Integer version) throws BrutException {
-		File aaptBinary;
-		String aaptVersion = getAaptBinaryName(version);
-		aaptBinary = ApplicationProvider.get().foundBinary(aaptVersion);
-
-		if (!aaptBinary.exists())
-			throw new BrutException("Can't found aapt binary");
-
-		if (aaptBinary.canExecute())
-			return aaptBinary;
-
-		throw new BrutException("aapt binary are not executable.");
-	}
-
-	public static String getAaptExecutionCommand(String aaptPath, File aapt) throws BrutException {
-		if (!TextUtils.isEmpty(aaptPath)) {
-			File aaptFile = new File(aaptPath);
-			if (aaptFile.canRead() && aaptFile.exists()) {
-				aaptFile.setExecutable(true);
-				return aaptFile.getPath();
-			} else {
-				throw new BrutException("binary could not be read: " + aaptFile.getAbsolutePath());
-			}
-		} else {
-			return aapt.getAbsolutePath();
-		}
-	}
-
-
-	public static String getAaptBinaryName(Integer version) {
-		return "aapt" + (version == 2 ? "2" : "");
-	}
-
-}
diff --git a/apktool/util/src/main/java/brut/util/BrutIO.java b/apktool/util/src/main/java/brut/util/BrutIO.java
deleted file mode 100644
index 79c4e02..0000000
--- a/apktool/util/src/main/java/brut/util/BrutIO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.util;
-
-import com.apkide.common.IOUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Objects;
-import java.util.zip.CRC32;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import brut.common.BrutException;
-import brut.common.InvalidUnknownFileException;
-import brut.common.RootUnknownFileException;
-import brut.common.TraversalUnknownFileException;
-
-public class BrutIO {
-    public static void copyAndClose(InputStream in, OutputStream out) throws IOException {
-        try {
-            IOUtils.copyBytes(in, out);
-        } finally {
-            IOUtils.safeClose(in);
-            IOUtils.safeClose(out);
-        }
-    }
-
-    public static long recursiveModifiedTime(File[] files) {
-        long modified = 0;
-        for (File file : files) {
-            long submodified = recursiveModifiedTime(file);
-            if (submodified > modified) {
-                modified = submodified;
-            }
-        }
-        return modified;
-    }
-
-    public static long recursiveModifiedTime(File file) {
-        long modified = file.lastModified();
-        if (file.isDirectory()) {
-            File[] subfiles = file.listFiles();
-            for (File subfile : Objects.requireNonNull(subfiles)) {
-                long submodified = recursiveModifiedTime(subfile);
-                if (submodified > modified) {
-                    modified = submodified;
-                }
-            }
-        }
-        return modified;
-    }
-
-    public static CRC32 calculateCrc(InputStream input) throws IOException {
-        CRC32 crc = new CRC32();
-        int bytesRead;
-        byte[] buffer = new byte[8192];
-        while((bytesRead = input.read(buffer)) != -1) {
-            crc.update(buffer, 0, bytesRead);
-        }
-        return crc;
-    }
-
-    public static String sanitizeUnknownFile(final File directory, final String entry) throws IOException, BrutException {
-        if (entry.length() == 0) {
-            throw new InvalidUnknownFileException("Invalid Unknown File");
-        }
-
-        if (new File(entry).isAbsolute()) {
-            throw new RootUnknownFileException("Absolute Unknown Files is not allowed");
-        }
-
-        final String canonicalDirPath = directory.getCanonicalPath() + File.separator;
-        final String canonicalEntryPath = new File(directory, entry).getCanonicalPath();
-
-        if (!canonicalEntryPath.startsWith(canonicalDirPath)) {
-            throw new TraversalUnknownFileException("Directory Traversal is not allowed");
-        }
-
-        // https://stackoverflow.com/q/2375903/455008
-        return canonicalEntryPath.substring(canonicalDirPath.length());
-    }
-
-    public static String normalizePath(String path) {
-        char separator = File.separatorChar;
-
-        if (separator != '/') {
-            return path.replace(separator, '/');
-        }
-
-        return path;
-    }
-
-    public static void copy(File inputFile, ZipOutputStream outputFile) throws IOException {
-        try (FileInputStream fis = new FileInputStream(inputFile)) {
-           IOUtils.copyBytes(fis, outputFile);
-        }
-    }
-
-    public static void copy(ZipFile inputFile, ZipOutputStream outputFile, ZipEntry entry) throws IOException {
-        try (InputStream is = inputFile.getInputStream(entry)) {
-            IOUtils.copyBytes(is, outputFile);
-        }
-    }
-
-}
diff --git a/apktool/util/src/main/java/brut/util/DataInputDelegate.java b/apktool/util/src/main/java/brut/util/DataInputDelegate.java
deleted file mode 100644
index 0d5021d..0000000
--- a/apktool/util/src/main/java/brut/util/DataInputDelegate.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.util;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-public abstract class DataInputDelegate implements DataInput {
-    protected final DataInput mDelegate;
-
-    public DataInputDelegate(DataInput delegate) {
-        this.mDelegate = delegate;
-    }
-
-    public int skipBytes(int n) throws IOException {
-        return mDelegate.skipBytes(n);
-    }
-
-    public int readUnsignedShort() throws IOException {
-        return mDelegate.readUnsignedShort();
-    }
-
-    public int readUnsignedByte() throws IOException {
-        return mDelegate.readUnsignedByte();
-    }
-
-    public String readUTF() throws IOException {
-        return mDelegate.readUTF();
-    }
-
-    public short readShort() throws IOException {
-        return mDelegate.readShort();
-    }
-
-    public long readLong() throws IOException {
-        return mDelegate.readLong();
-    }
-
-    public String readLine() throws IOException {
-        return mDelegate.readLine();
-    }
-
-    public int readInt() throws IOException {
-        return mDelegate.readInt();
-    }
-
-    public void readFully(byte[] b, int off, int len) throws IOException {
-        mDelegate.readFully(b, off, len);
-    }
-
-    public void readFully(byte[] b) throws IOException {
-        mDelegate.readFully(b);
-    }
-
-    public float readFloat() throws IOException {
-        return mDelegate.readFloat();
-    }
-
-    public double readDouble() throws IOException {
-        return mDelegate.readDouble();
-    }
-
-    public char readChar() throws IOException {
-        return mDelegate.readChar();
-    }
-
-    public byte readByte() throws IOException {
-        return mDelegate.readByte();
-    }
-
-    public boolean readBoolean() throws IOException {
-        return mDelegate.readBoolean();
-    }
-}
diff --git a/apktool/util/src/main/java/brut/util/Duo.java b/apktool/util/src/main/java/brut/util/Duo.java
deleted file mode 100644
index f37854d..0000000
--- a/apktool/util/src/main/java/brut/util/Duo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.util;
-
-import java.util.Objects;
-
-public class Duo<T1, T2> {
-    public final T1 m1;
-    public final T2 m2;
-
-    public Duo(T1 t1, T2 t2) {
-        this.m1 = t1;
-        this.m2 = t2;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Duo<T1, T2> other = (Duo<T1, T2>) obj;
-        if (!Objects.equals(this.m1, other.m1)) {
-            return false;
-        }
-        return Objects.equals(this.m2, other.m2);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 71 * hash + (this.m1 != null ? this.m1.hashCode() : 0);
-        hash = 71 * hash + (this.m2 != null ? this.m2.hashCode() : 0);
-        return hash;
-    }
-}
diff --git a/apktool/util/src/main/java/brut/util/ExtDataInput.java b/apktool/util/src/main/java/brut/util/ExtDataInput.java
deleted file mode 100644
index fcd301f..0000000
--- a/apktool/util/src/main/java/brut/util/ExtDataInput.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.util;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ExtDataInput extends DataInputDelegate {
-    public ExtDataInput(InputStream in) {
-        this((DataInput) new DataInputStream(in));
-    }
-
-    public ExtDataInput(DataInput delegate) {
-        super(delegate);
-    }
-
-    public int[] readIntArray(int length) throws IOException {
-        int[] array = new int[length];
-        for(int i = 0; i < length; i++) {
-            array[i] = readInt();
-        }
-        return array;
-    }
-
-    public void skipInt() throws IOException {
-        skipBytes(4);
-    }
-
-    public void skipCheckInt(int expected1, int expected2) throws IOException {
-        int got = readInt();
-        if (got != expected1 && got != expected2) {
-            throw new IOException(String.format(
-                "Expected: 0x%08x or 0x%08x, got: 0x%08x", expected1, expected2, got));
-        }
-    }
-
-    public void skipCheckShort(short expected) throws IOException {
-        short got = readShort();
-        if (got != expected) {
-            throw new IOException(String.format(
-                "Expected: 0x%08x, got: 0x%08x", expected, got));
-        }
-    }
-
-    public void skipCheckByte(byte expected) throws IOException {
-        byte got = readByte();
-        if (got != expected) {
-            throw new IOException(String.format(
-                    "Expected: 0x%08x, got: 0x%08x", expected, got));
-        }
-    }
-
-    public void skipCheckChunkTypeInt(int expected, int possible) throws IOException {
-        int got = readInt();
-
-        if (got == possible || got < expected) {
-            skipCheckChunkTypeInt(expected, -1);
-        } else if (got != expected) {
-            throw new IOException(String.format("Expected: 0x%08x, got: 0x%08x", expected, got));
-        }
-    }
-
-    /**
-     * The general contract of DataInput doesn't guarantee all the bytes requested will be skipped
-     * and failure can occur for many reasons. We override this to try harder to skip all the bytes
-     * requested (this is similar to DataInputStream's wrapper).
-     */
-    public final int skipBytes(int n) throws IOException {
-        int total = 0;
-        int cur;
-
-        while ((total < n) && ((cur = super.skipBytes(n - total)) > 0)) {
-            total += cur;
-        }
-
-        return total;
-    }
-
-    public String readNullEndedString(int length, boolean fixed)
-            throws IOException {
-        StringBuilder string = new StringBuilder(16);
-        while(length-- != 0) {
-            short ch = readShort();
-            if (ch == 0) {
-                break;
-            }
-            string.append((char) ch);
-        }
-        if (fixed) {
-            skipBytes(length * 2);
-        }
-
-        return string.toString();
-    }
-}
diff --git a/apktool/util/src/main/java/brut/util/OS.java b/apktool/util/src/main/java/brut/util/OS.java
deleted file mode 100644
index 14f7050..0000000
--- a/apktool/util/src/main/java/brut/util/OS.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
- *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
- *
- *  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
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package brut.util;
-
-import android.os.Build;
-
-import com.apkide.common.AppLog;
-import com.apkide.common.IOUtils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import brut.common.BrutException;
-
-public class OS {
-
-
-	public static void rmdir(File dir) {
-		if (!dir.exists())
-			return;
-
-		File[] files = dir.listFiles();
-		if (files == null)
-			return;
-
-		for (File file : files) {
-			if (file.isDirectory())
-				rmdir(file);
-			else
-				file.delete();
-		}
-		dir.delete();
-	}
-
-	public static void rmfile(String file) {
-		File del = new File(file);
-		del.delete();
-	}
-
-	public static void rmdir(String dir) throws BrutException {
-		rmdir(new File(dir));
-	}
-
-	public static void cpdir(File src, File dest) throws BrutException {
-		dest.mkdirs();
-		File[] files = src.listFiles();
-		if (files == null)
-			return;
-
-		for (File file : files) {
-			File destFile = new File(dest.getPath() + File.separatorChar + file.getName());
-			if (file.isDirectory()) {
-				cpdir(file, destFile);
-				continue;
-			}
-			try {
-				try (InputStream in = Files.newInputStream(file.toPath())) {
-					try (OutputStream out = Files.newOutputStream(destFile.toPath())) {
-						IOUtils.copyBytes(in, out);
-					}
-				}
-			} catch (IOException ex) {
-				throw new BrutException("Could not copy file: " + file, ex);
-			}
-		}
-	}
-
-	public static void exec(String[] cmd) throws BrutException {
-		Process ps;
-		int exitValue;
-
-		try {
-			ProcessBuilder builder = new ProcessBuilder(cmd);
-			ps = builder.start();
-
-			//builder.redirectErrorStream(true);
-
-			new StreamForwarder(ps.getErrorStream(), "ERROR").start();
-			new StreamForwarder(ps.getInputStream(), "OUTPUT").start();
-
-			exitValue = ps.waitFor();
-			if (exitValue != 0)
-				throw new BrutException("could not exec (exit code = " + exitValue + "): " + Arrays.toString(cmd));
-
-		} catch (IOException ex) {
-			throw new BrutException("could not exec: " + Arrays.toString(cmd), ex);
-		} catch (InterruptedException ex) {
-			throw new BrutException("could not exec : " + Arrays.toString(cmd), ex);
-		}
-	}
-
-	public static String execAndReturn(String[] cmd) {
-		ExecutorService executor = Executors.newCachedThreadPool();
-		try {
-			ProcessBuilder builder = new ProcessBuilder(cmd);
-			//builder.redirectErrorStream(true);
-			Process process = builder.start();
-			StreamCollector collector = new StreamCollector(process.getInputStream());
-			executor.execute(collector);
-			if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
-				process.waitFor(15, TimeUnit.SECONDS);
-				executor.shutdownNow();
-				if (! executor.awaitTermination(5, TimeUnit.SECONDS)) {
-					AppLog.e("Stream collector did not terminate.");
-				}
-			}else {
-				process.waitFor();
-				if (!executor.awaitTermination(15, TimeUnit.SECONDS)) {
-					executor.shutdownNow();
-					if (!executor.awaitTermination(5, TimeUnit.SECONDS))
-						AppLog.e("Stream collector did not terminate.");
-				}
-			}
-			return collector.get();
-		} catch (IOException | InterruptedException e) {
-			AppLog.e(e);
-			return null;
-		}
-	}
-
-	public static File createTempDirectory() throws BrutException {
-		try {
-			File tmp = File.createTempFile("BRUT", null);
-			tmp.deleteOnExit();
-			if (!tmp.delete())
-				throw new BrutException("Could not delete tmp file: " + tmp.getAbsolutePath());
-
-			if (!tmp.mkdir())
-				throw new BrutException("Could not create tmp dir: " + tmp.getAbsolutePath());
-
-			return tmp;
-		} catch (IOException ex) {
-			throw new BrutException("Could not create tmp dir", ex);
-		}
-	}
-
-	static class StreamForwarder extends Thread {
-
-		StreamForwarder(InputStream is, String type) {
-			mIn = is;
-			mType = type;
-		}
-
-		@Override
-		public void run() {
-			try {
-				BufferedReader br = new BufferedReader(new InputStreamReader(mIn));
-				String line;
-				while ((line = br.readLine()) != null) {
-					if (mType.equals("OUTPUT"))
-						AppLog.s(line);
-
-					AppLog.d(line);
-				}
-			} catch (IOException ex) {
-				AppLog.e(ex);
-			}
-		}
-
-		private final InputStream mIn;
-		private final String mType;
-	}
-
-	static class StreamCollector implements Runnable {
-		private final StringBuilder buffer = new StringBuilder();
-		private final InputStream inputStream;
-
-		public StreamCollector(InputStream inputStream) {
-			super();
-			this.inputStream = inputStream;
-		}
-
-		@Override
-		public void run() {
-			String line;
-			try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
-				while ((line = reader.readLine()) != null) {
-					AppLog.s(line);
-					buffer.append(line).append('\n');
-				}
-			} catch (IOException e) {
-				AppLog.e(e);
-			}
-		}
-
-		public String get() {
-			return buffer.toString();
-		}
-	}
-}
diff --git a/apktool/util/src/main/java/brut/util/OSDetection.java b/apktool/util/src/main/java/brut/util/OSDetection.java
deleted file mode 100644
index 26a80cb..0000000
--- a/apktool/util/src/main/java/brut/util/OSDetection.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package brut.util;
-
-import android.os.Build;
-
-import java.util.Arrays;
-
-public class OSDetection {
-    private static final String[] architectures = Build.SUPPORTED_ABIS;
-
-    public static String[] getArchitectures() {
-        return architectures;
-    }
-
-    public static boolean isAarch64() {
-        return Arrays.stream(architectures)
-                .anyMatch(arch -> arch.contains("arm64-v8a"));
-    }
-
-    public static boolean isAarch32() {
-        return Arrays.stream(architectures)
-                .anyMatch(arch -> arch.contains("armeabi-v7a"));
-    }
-
-	public static boolean isArm() {
-		return Arrays.stream(architectures)
-				.anyMatch(arch -> arch.contains("armeabi"));
-	}
-	
-	public static boolean isX86() {
-		return Arrays.stream(architectures)
-				.anyMatch(arch -> arch.contains("x86"));
-	}
-	
-	public static boolean isX86_64() {
-		return Arrays.stream(architectures)
-				.anyMatch(arch -> arch.contains("x86_64"));
-	}
-}
diff --git a/apktool/util/src/test/java/brut/util/ExampleUnitTest.java b/apktool/util/src/test/java/brut/util/ExampleUnitTest.java
deleted file mode 100644
index 208fabd..0000000
--- a/apktool/util/src/test/java/brut/util/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package brut.util;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4d9de48..249a27d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,8 +96,4 @@ dependencies {
     implementation project(':common')
     implementation project(':openapi')
     implementation project(':engine')
-    implementation project(':apktool:androlib')
-    implementation project(':apktool:common')
-    implementation project(':apktool:directory')
-    implementation project(':apktool:util')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d344419..086eadf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,7 @@
 
 
         <activity
-            android:name=".activities.AboutUI"
+            android:name=".AboutUI"
             android:label="About"
             android:theme="@style/Theme.UI" />
 
@@ -56,10 +56,6 @@
             android:label="Preferences"
             android:theme="@style/Theme.UI.Preferences" />
 
-        <provider
-            android:authorities="com.apkide.ui.initializer"
-            android:name=".IDEInitializer"
-            android:exported="false"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/JavaLexer.java b/app/src/main/assets/JavaLexer.java
deleted file mode 100644
index 761141b..0000000
--- a/app/src/main/assets/JavaLexer.java
+++ /dev/null
@@ -1,821 +0,0 @@
-// DO NOT EDIT
-// Generated by JFlex 1.9.1 http://jflex.de/
-// source: _JavaLexer.flex
-
-package com.apkide.ui;
-
-
-import static com.apkide.common.SyntaxKind.Comment;
-import static com.apkide.common.SyntaxKind.DocComment;
-import static com.apkide.common.SyntaxKind.Keyword;
-import static com.apkide.common.SyntaxKind.Literal;
-import static com.apkide.common.SyntaxKind.Operator;
-import static com.apkide.common.SyntaxKind.Plain;
-import static com.apkide.common.SyntaxKind.Separator;
-import static com.apkide.common.SyntaxKind.TypeIdentifier;
-
-import com.apkide.common.SyntaxKind;
-
-import java.io.IOException;
-import java.io.Reader;
-
-
-@SuppressWarnings("fallthrough")
-public class JavaLexer {
-
-	/**
-	 * This character denotes the end of file.
-	 */
-	public static final int YYEOF = -1;
-
-	/**
-	 * Initial size of the lookahead buffer.
-	 */
-	private static final int ZZ_BUFFERSIZE = 16384;
-
-	// Lexical states.
-	public static final int YYINITIAL = 0;
-
-	/**
-	 * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-	 * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-	 * at the beginning of a line
-	 * l is of the form l = 2*k, k a non negative integer
-	 */
-	private static final int ZZ_LEXSTATE[] = {0, 0};
-
-	/**
-	 * Top-level table for translating characters to character classes
-	 */
-	private static final int[] ZZ_CMAP_TOP = zzUnpackcmap_top();
-
-	private static final String ZZ_CMAP_TOP_PACKED_0 = "\1\0\1\u0100\1\u0200\1\u0300\1\u0400\1\u0500\1\u0600\1\u0700" + "\1\u0800\1\u0900\1\u0a00\1\u0b00\1\u0c00\1\u0d00\1\u0e00\1\u0f00" + "\1\u1000\1\u0100\1\u1100\1\u1200\1\u1300\1\u0100\1\u1400\1\u1500" + "\1\u1600\1\u1700\1\u1800\1\u1900\1\u1a00\1\u1b00\1\u0100\1\u1c00" + "\1\u1d00\1\u1e00\12\u1f00\1\u2000\1\u2100\1\u2200\1\u1f00\1\u2300" + "\1\u2400\2\u1f00\31\u0100\1\u2500\121\u0100\1\u2600\4\u0100\1\u2700" + "\1\u0100\1\u2800\1\u2900\1\u2a00\1\u2b00\1\u2c00\1\u2d00\53\u0100" + "\1\u2e00\10\u2f00\31\u1f00\1\u0100\1\u3000\1\u3100\1\u0100\1\u3200" + "\1\u3300\1\u3400\1\u3500\1\u3600\1\u3700\1\u3800\1\u3900\1\u3a00" + "\1\u0100\1\u3b00\1\u3c00\1\u3d00\1\u3e00\1\u3f00\1\u4000\1\u4100" + "\1\u4200\1\u4300\1\u4400\1\u4500\1\u4600\1\u4700\1\u4800\1\u4900" + "\1\u4a00\1\u4b00\1\u4c00\1\u4d00\1\u4e00\1\u1f00\1\u4f00\1\u5000" + "\1\u5100\1\u5200\3\u0100\1\u5300\1\u5400\1\u5500\12\u1f00\4\u0100" + "\1\u5600\17\u1f00\2\u0100\1\u5700\41\u1f00\2\u0100\1\u5800\1\u5900" + "\2\u1f00\1\u5a00\1\u5b00\27\u0100\1\u5c00\4\u0100\1\u5d00\1\u5e00" + "\42\u1f00\1\u0100\1\u5f00\1\u6000\11\u1f00\1\u6100\24\u1f00\1\u6200" + "\1\u6300\1\u1f00\1\u6400\1\u6500\1\u6600\1\u6700\2\u1f00\1\u6800" + "\5\u1f00\1\u6900\1\u6a00\1\u6b00\5\u1f00\1\u6c00\1\u6d00\2\u1f00" + "\1\u6e00\1\u1f00\1\u6f00\14\u1f00\1\u7000\4\u1f00\246\u0100\1\u7100" + "\20\u0100\1\u7200\1\u7300\25\u0100\1\u7400\34\u0100\1\u7500\14\u1f00" + "\2\u0100\1\u7600\5\u1f00\23\u0100\1\u7700\u0aec\u1f00\1\u7800\1\u7900" + "\u02fe\u1f00";
-
-	private static int[] zzUnpackcmap_top() {
-		int[] result = new int[4352];
-		int offset = 0;
-		offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackcmap_top(String packed, int offset, int[] result) {
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while (i < l) {
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do result[j++] = value; while (--count > 0);
-		}
-		return j;
-	}
-
-
-	/**
-	 * Second-level tables for translating characters to character classes
-	 */
-	private static final int[] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
-
-	private static final String ZZ_CMAP_BLOCKS_PACKED_0 = "\11\0\1\1\1\2\1\3\1\1\1\2\16\0\4\4" + "\1\1\1\5\1\6\1\4\1\7\1\5\1\10\1\11" + "\2\12\1\13\1\14\1\12\1\15\1\16\1\17\1\20" + "\11\21\1\22\1\12\1\23\1\24\1\25\1\26\1\27" + "\1\30\1\31\1\30\1\32\1\33\1\32\5\7\1\34" + "\3\7\1\35\7\7\1\36\2\7\1\12\1\37\1\12" + "\1\5\1\40\1\4\1\41\1\42\1\43\1\44\1\45" + "\1\46\1\47\1\50\1\51\1\7\1\52\1\53\1\54" + "\1\55\1\56\1\57\1\7\1\60\1\61\1\62\1\63" + "\1\64\1\65\1\66\1\67\1\70\1\12\1\71\1\12" + "\1\26\6\0\1\72\32\0\2\4\4\7\4\4\1\7" + "\2\4\1\0\7\4\1\7\4\4\1\7\5\4\27\7" + "\1\4\37\7\1\4\u01ca\7\4\4\14\7\16\4\5\7" + "\7\4\1\7\1\4\1\7\21\4\160\0\5\7\1\4" + "\2\7\2\4\4\7\1\4\1\7\6\4\1\7\1\4" + "\3\7\1\4\1\7\1\4\24\7\1\4\123\7\1\4" + "\213\7\1\4\5\0\2\4\246\7\1\4\46\7\2\4" + "\1\7\6\4\51\7\6\4\1\7\1\4\55\0\1\4" + "\1\0\1\4\2\0\1\4\2\0\1\4\1\0\10\4" + "\33\7\4\4\4\7\15\4\6\0\5\4\1\7\4\4" + "\13\0\1\4\1\0\3\4\53\7\37\0\4\4\2\7" + "\1\0\143\7\1\4\1\7\10\0\1\4\6\0\2\7" + "\2\0\1\4\4\0\2\7\12\0\3\7\2\4\1\7" + "\17\4\1\0\1\7\1\0\36\7\33\0\2\4\131\7" + "\13\0\1\7\16\4\12\0\41\7\11\0\2\7\4\4" + "\1\7\2\4\1\0\30\7\4\0\1\7\11\0\1\7" + "\3\0\1\7\5\0\22\4\31\7\3\0\4\4\13\7" + "\65\4\25\7\1\4\22\7\13\4\61\0\66\7\3\0" + "\1\7\22\0\1\7\7\0\12\7\2\0\2\4\12\0" + "\1\4\20\7\3\0\1\4\10\7\2\4\2\7\2\4" + "\26\7\1\4\7\7\1\4\1\7\3\4\4\7\2\4" + "\1\0\1\7\7\0\2\4\2\0\2\4\3\0\1\7" + "\10\4\1\0\4\4\2\7\1\4\3\7\2\0\2\4" + "\12\0\4\7\7\4\2\7\1\4\1\0\2\4\3\0" + "\1\4\6\7\4\4\2\7\2\4\26\7\1\4\7\7" + "\1\4\2\7\1\4\2\7\1\4\2\7\2\4\1\0" + "\1\4\5\0\4\4\2\0\2\4\3\0\3\4\1\0" + "\7\4\4\7\1\4\1\7\7\4\14\0\3\7\1\0" + "\13\4\3\0\1\4\11\7\1\4\3\7\1\4\26\7" + "\1\4\7\7\1\4\2\7\1\4\5\7\2\4\1\0" + "\1\7\10\0\1\4\3\0\1\4\3\0\2\4\1\7" + "\17\4\2\7\2\0\2\4\12\0\1\4\1\7\7\4" + "\1\7\6\0\1\4\3\0\1\4\10\7\2\4\2\7" + "\2\4\26\7\1\4\7\7\1\4\2\7\1\4\5\7" + "\2\4\1\0\1\7\7\0\2\4\2\0\2\4\3\0" + "\7\4\3\0\4\4\2\7\1\4\3\7\2\0\2\4" + "\12\0\1\4\1\7\20\4\1\0\1\7\1\4\6\7" + "\3\4\3\7\1\4\4\7\3\4\2\7\1\4\1\7" + "\1\4\2\7\3\4\2\7\3\4\3\7\3\4\14\7" + "\4\4\5\0\3\4\3\0\1\4\4\0\2\4\1\7" + "\6\4\1\0\16\4\12\0\11\4\1\7\6\4\5\0" + "\10\7\1\4\3\7\1\4\27\7\1\4\20\7\3\4" + "\1\7\7\0\1\4\3\0\1\4\4\0\7\4\2\0" + "\1\4\3\7\5\4\2\7\2\0\2\4\12\0\20\4" + "\1\7\3\0\1\4\10\7\1\4\3\7\1\4\27\7" + "\1\4\12\7\1\4\5\7\2\4\1\0\1\7\7\0" + "\1\4\3\0\1\4\4\0\7\4\2\0\7\4\1\7" + "\1\4\2\7\2\0\2\4\12\0\1\4\2\7\15\4" + "\4\0\11\7\1\4\3\7\1\4\51\7\2\0\1\7" + "\7\0\1\4\3\0\1\4\4\0\1\7\5\4\3\7" + "\1\0\7\4\3\7\2\0\2\4\12\0\12\4\6\7" + "\1\4\3\0\1\4\22\7\3\4\30\7\1\4\11\7" + "\1\4\1\7\2\4\7\7\3\4\1\0\4\4\6\0" + "\1\4\1\0\1\4\10\0\6\4\12\0\2\4\2\0" + "\15\4\60\7\1\0\2\7\7\0\4\4\10\7\10\0" + "\1\4\12\0\47\4\2\7\1\4\1\7\1\4\5\7" + "\1\4\30\7\1\4\1\7\1\4\12\7\1\0\2\7" + "\11\0\1\7\2\4\5\7\1\4\1\7\1\4\6\0" + "\2\4\12\0\2\4\4\7\40\4\1\7\27\4\2\0" + "\6\4\12\0\13\4\1\0\1\4\1\0\1\4\1\0" + "\4\4\2\0\10\7\1\4\44\7\4\4\24\0\1\4" + "\2\0\5\7\13\0\1\4\44\0\11\4\1\0\71\4" + "\53\7\24\0\1\7\12\0\6\4\6\7\4\0\4\7" + "\3\0\1\7\3\0\2\7\7\0\3\7\4\0\15\7" + "\14\0\1\7\17\0\2\4\46\7\1\4\1\7\5\4" + "\1\7\2\4\53\7\1\4\115\7\1\4\4\7\2\4" + "\7\7\1\4\1\7\1\4\4\7\2\4\51\7\1\4" + "\4\7\2\4\41\7\1\4\4\7\2\4\7\7\1\4" + "\1\7\1\4\4\7\2\4\17\7\1\4\71\7\1\4" + "\4\7\2\4\103\7\2\4\3\0\40\4\20\7\20\4" + "\126\7\2\4\6\7\3\4\u016c\7\2\4\21\7\1\4" + "\32\7\5\4\113\7\3\4\13\7\7\4\15\7\1\4" + "\4\7\3\0\13\4\22\7\3\0\13\4\22\7\2\0" + "\14\4\15\7\1\4\3\7\1\4\2\0\14\4\64\7" + "\40\0\3\4\1\7\3\4\2\7\1\0\2\4\12\0" + "\41\4\4\0\1\4\12\0\6\4\131\7\7\4\5\7" + "\2\0\42\7\1\0\1\7\5\4\106\7\12\4\37\7" + "\1\4\14\0\4\4\14\0\12\4\12\0\36\7\2\4" + "\5\7\13\4\54\7\4\4\32\7\6\4\12\0\46\4" + "\27\7\5\0\4\4\65\7\12\0\1\4\35\0\2\4" + "\13\0\6\4\12\0\15\4\1\7\10\4\16\0\1\4" + "\2\0\77\4\5\0\57\7\21\0\7\7\4\4\12\0" + "\21\4\11\0\14\4\3\0\36\7\15\0\2\7\12\0" + "\54\7\16\0\14\4\44\7\24\0\10\4\12\0\3\4" + "\3\7\12\0\44\7\2\4\11\7\7\4\53\7\2\4" + "\3\7\20\4\3\0\1\4\25\0\4\7\1\0\6\7" + "\1\0\2\7\3\0\1\7\5\4\300\7\72\0\1\4" + "\5\0\26\7\2\4\6\7\2\4\46\7\2\4\6\7" + "\2\4\10\7\1\4\1\7\1\4\1\7\1\4\1\7" + "\1\4\37\7\2\4\65\7\1\4\7\7\1\4\1\7" + "\3\4\3\7\1\4\7\7\3\4\4\7\2\4\6\7" + "\4\4\15\7\5\4\3\7\1\4\7\7\16\4\5\0" + "\30\4\2\3\5\0\20\4\2\7\23\4\1\7\13\4" + "\5\0\1\4\12\0\1\4\1\7\15\4\1\7\20\4" + "\15\7\3\4\40\7\20\4\15\0\4\4\1\0\3\4" + "\14\0\21\4\1\7\4\4\1\7\2\4\12\7\1\4" + "\1\7\3\4\5\7\6\4\1\7\1\4\1\7\1\4" + "\1\7\1\4\4\7\1\4\13\7\2\4\4\7\5\4" + "\5\7\4\4\1\7\21\4\51\7\u0177\4\57\7\1\4" + "\57\7\1\4\205\7\6\4\4\7\3\0\2\7\14\4" + "\46\7\1\4\1\7\5\4\1\7\2\4\70\7\7\4" + "\1\7\17\4\1\0\27\7\11\4\7\7\1\4\7\7" + "\1\4\7\7\1\4\7\7\1\4\7\7\1\4\7\7" + "\1\4\7\7\1\4\7\7\1\4\40\0\57\4\1\7" + "\325\4\3\7\31\4\11\7\6\0\1\4\5\7\2\4" + "\5\7\4\4\126\7\2\4\2\0\2\4\3\7\1\4" + "\132\7\1\4\4\7\5\4\53\7\1\4\136\7\21\4" + "\40\7\60\4\320\7\100\4\375\7\3\4\215\7\103\4" + "\56\7\2\4\15\7\3\4\20\7\12\0\2\7\24\4" + "\57\7\1\0\4\4\12\0\1\4\37\7\2\0\120\7" + "\2\0\45\4\11\7\2\4\147\7\2\4\65\7\2\4" + "\11\7\52\4\15\7\1\0\3\7\1\0\4\7\1\0" + "\27\7\5\0\4\4\1\0\13\4\1\7\7\4\64\7" + "\14\4\2\0\62\7\22\0\12\4\12\0\6\4\22\0" + "\6\7\3\4\1\7\1\4\2\7\13\0\34\7\10\0" + "\2\4\27\7\15\0\14\4\35\7\3\4\4\0\57\7" + "\16\0\16\4\1\7\12\0\6\4\5\7\1\0\12\7" + "\12\0\5\7\1\4\51\7\16\0\11\4\3\7\1\0" + "\10\7\2\0\2\4\12\0\6\4\27\7\3\4\1\7" + "\3\0\62\7\1\0\1\7\3\0\2\7\2\0\5\7" + "\2\0\1\7\1\0\1\7\30\4\3\7\2\4\13\7" + "\5\0\2\4\3\7\2\0\12\4\6\7\2\4\6\7" + "\2\4\6\7\11\4\7\7\1\4\7\7\1\4\53\7" + "\1\4\16\7\6\4\163\7\10\0\1\4\2\0\2\4" + "\12\0\6\4\244\7\14\4\27\7\4\4\61\7\4\4" + "\u0100\3\156\7\2\4\152\7\46\4\7\7\14\4\5\7" + "\5\4\1\7\1\0\12\7\1\4\15\7\1\4\5\7" + "\1\4\1\7\1\4\2\7\1\4\2\7\1\4\154\7" + "\41\4\153\7\22\4\100\7\2\4\66\7\50\4\15\7" + "\3\4\20\0\20\4\20\0\3\4\2\7\30\4\3\7" + "\31\4\1\7\6\4\5\7\1\4\207\7\2\4\1\0" + "\4\4\1\7\13\4\12\0\7\4\32\7\4\4\1\7" + "\1\4\32\7\13\4\131\7\3\4\6\7\2\4\6\7" + "\2\4\6\7\2\4\3\7\3\4\2\7\3\4\2\7" + "\22\4\3\0\4\4\14\7\1\4\32\7\1\4\23\7" + "\1\4\2\7\1\4\17\7\2\4\16\7\42\4\173\7" + "\105\4\65\7\210\4\1\0\202\4\35\7\3\4\61\7" + "\17\4\1\0\37\4\40\7\15\4\36\7\5\4\46\7" + "\5\0\5\4\36\7\2\4\44\7\4\4\10\7\1\4" + "\5\7\52\4\236\7\2\4\12\0\6\4\44\7\4\4" + "\44\7\4\4\50\7\10\4\64\7\234\4\67\7\11\4" + "\26\7\12\4\10\7\230\4\6\7\2\4\1\7\1\4" + "\54\7\1\4\2\7\3\4\1\7\2\4\27\7\12\4" + "\27\7\11\4\37\7\101\4\23\7\1\4\2\7\12\4" + "\26\7\12\4\32\7\106\4\70\7\6\4\2\7\100\4" + "\1\7\3\0\1\4\2\0\5\4\4\0\4\7\1\4" + "\3\7\1\4\35\7\2\4\3\0\4\4\1\0\40\4" + "\35\7\3\4\35\7\43\4\10\7\1\4\34\7\2\0" + "\31\4\66\7\12\4\26\7\12\4\23\7\15\4\22\7" + "\156\4\111\7\67\4\63\7\15\4\63\7\15\4\44\7" + "\4\0\10\4\12\0\u0146\4\52\7\1\4\2\0\3\4" + "\2\7\116\4\35\7\12\4\1\7\10\4\26\7\13\0" + "\137\4\25\7\33\4\27\7\11\4\3\0\65\7\17\0" + "\37\4\12\0\17\4\4\0\55\7\13\0\2\4\1\0" + "\17\4\1\0\2\4\31\7\7\4\12\0\6\4\3\0" + "\44\7\16\0\1\4\12\0\4\4\1\7\2\0\1\7" + "\10\4\43\7\1\0\2\4\1\7\11\4\3\0\60\7" + "\16\0\4\7\4\4\4\0\1\4\14\0\1\7\1\4" + "\1\7\43\4\22\7\1\4\31\7\14\0\6\4\1\0" + "\101\4\7\7\1\4\1\7\1\4\4\7\1\4\17\7" + "\1\4\12\7\7\4\57\7\14\0\5\4\12\0\6\4" + "\4\0\1\4\10\7\2\4\2\7\2\4\26\7\1\4" + "\7\7\1\4\2\7\1\4\5\7\1\4\2\0\1\7" + "\7\0\2\4\2\0\2\4\3\0\2\4\1\7\6\4" + "\1\0\5\4\5\7\2\0\2\4\7\0\3\4\5\0" + "\213\4\65\7\22\0\4\7\5\4\12\0\4\4\1\0" + "\3\7\36\4\60\7\24\0\2\7\1\4\1\7\10\4" + "\12\0\246\4\57\7\7\0\2\4\11\0\27\4\4\7" + "\2\0\42\4\60\7\21\0\3\4\1\7\13\4\12\0" + "\46\4\53\7\15\0\1\7\7\4\12\0\66\4\33\7" + "\2\4\17\0\4\4\12\0\306\4\54\7\17\0\145\4" + "\100\7\12\0\25\4\10\7\2\4\1\7\2\4\10\7" + "\1\4\2\7\1\4\30\7\6\0\1\4\2\0\2\4" + "\4\0\1\7\1\0\1\7\2\0\14\4\12\0\106\4" + "\10\7\2\4\47\7\7\0\2\4\7\0\1\7\1\4" + "\1\7\1\0\33\4\1\7\12\0\50\7\7\0\1\7" + "\4\0\10\4\1\0\10\4\1\7\13\0\56\7\20\0" + "\3\4\1\7\42\4\71\7\7\4\11\7\1\4\45\7" + "\10\0\1\4\10\0\1\7\17\4\12\0\30\4\36\7" + "\2\4\26\0\1\4\16\0\111\4\7\7\1\4\2\7" + "\1\4\46\7\6\0\3\4\1\0\1\4\2\0\1\4" + "\7\0\1\7\1\0\10\4\12\0\6\4\6\7\1\4" + "\2\7\1\4\40\7\5\0\1\4\2\0\1\4\5\0" + "\1\7\7\4\12\0\u0136\4\23\7\4\0\271\4\1\7" + "\54\4\4\7\37\4\232\7\146\4\157\7\21\4\304\7" + "\274\4\57\7\1\4\11\0\307\4\107\7\271\4\71\7" + "\7\4\37\7\1\4\12\0\146\4\36\7\2\4\5\0" + "\13\4\60\7\7\0\11\4\4\7\14\4\12\0\11\4" + "\25\7\5\4\23\7\260\4\100\7\200\4\113\7\4\4" + "\1\0\1\7\67\0\7\4\4\0\15\7\100\4\2\7" + "\1\4\1\7\1\0\13\4\2\0\16\4\370\7\10\4" + "\326\7\52\4\11\7\367\4\37\7\61\4\3\7\21\4" + "\4\7\10\4\u018c\7\4\4\153\7\5\4\15\7\3\4" + "\11\7\7\4\12\7\3\4\2\0\1\4\4\0\301\4" + "\5\0\3\4\26\0\2\4\7\0\36\4\4\0\224\4" + "\3\0\273\4\125\7\1\4\107\7\1\4\2\7\2\4" + "\1\7\2\4\2\7\2\4\4\7\1\4\14\7\1\4" + "\1\7\1\4\7\7\1\4\101\7\1\4\4\7\2\4" + "\10\7\1\4\7\7\1\4\34\7\1\4\4\7\1\4" + "\5\7\1\4\1\7\3\4\7\7\1\4\u0154\7\2\4" + "\31\7\1\4\31\7\1\4\37\7\1\4\31\7\1\4" + "\37\7\1\4\31\7\1\4\37\7\1\4\31\7\1\4" + "\37\7\1\4\31\7\1\4\10\7\2\4\151\0\4\4" + "\62\0\10\4\1\0\16\4\1\0\26\4\5\0\1\4" + "\17\0\120\4\7\0\1\4\21\0\2\4\7\0\1\4" + "\2\0\1\4\5\0\325\4\55\7\3\4\7\0\7\7" + "\2\4\12\0\4\4\1\7\u0171\4\54\7\16\0\5\4" + "\306\7\13\4\7\0\51\4\104\7\7\0\1\7\4\4" + "\12\0\u0156\4\1\7\117\4\4\7\1\4\33\7\1\4" + "\2\7\1\4\1\7\2\4\1\7\1\4\12\7\1\4" + "\4\7\1\4\1\7\1\4\1\7\6\4\1\7\4\4" + "\1\7\1\4\1\7\1\4\1\7\1\4\3\7\1\4" + "\2\7\1\4\1\7\2\4\1\7\1\4\1\7\1\4" + "\1\7\1\4\1\7\1\4\1\7\1\4\2\7\1\4" + "\1\7\2\4\4\7\1\4\7\7\1\4\4\7\1\4" + "\4\7\1\4\1\7\1\4\12\7\1\4\21\7\5\4" + "\3\7\1\4\5\7\1\4\21\7\u0134\4\12\0\6\4" + "\336\7\42\4\65\7\13\4\336\7\2\4\u0182\7\16\4" + "\u0131\7\37\4\36\7\342\4\113\7\266\4\1\0\36\4" + "\140\0\200\4\360\0\20\4";
-
-	private static int[] zzUnpackcmap_blocks() {
-		int[] result = new int[31232];
-		int offset = 0;
-		offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackcmap_blocks(String packed, int offset, int[] result) {
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while (i < l) {
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do result[j++] = value; while (--count > 0);
-		}
-		return j;
-	}
-
-	/**
-	 * Translates DFA states to action switch labels.
-	 */
-	private static final int[] ZZ_ACTION = zzUnpackAction();
-
-	private static final String ZZ_ACTION_PACKED_0 = "\1\0\2\1\1\2\1\3\1\1\1\2\1\3\1\4" + "\2\2\1\4\1\2\2\3\3\2\21\1\1\2\3\3" + "\1\0\1\3\2\5\3\3\1\6\12\1\1\7\10\1" + "\1\7\23\1\1\5\1\10\1\3\1\0\1\3\21\1" + "\1\7\24\1\1\0\2\10\1\0\10\1\1\11\20\1" + "\1\5\1\0\6\1\1\7\11\1\1\7\2\1\1\12" + "\25\1";
-
-	private static int[] zzUnpackAction() {
-		int[] result = new int[201];
-		int offset = 0;
-		offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackAction(String packed, int offset, int[] result) {
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while (i < l) {
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do result[j++] = value; while (--count > 0);
-		}
-		return j;
-	}
-
-
-	/**
-	 * Translates a state to a row index in the transition table
-	 */
-	private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
-
-	private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\73\0\166\0\261\0\354\0\u0127\0\u0162\0\u019d" + "\0\73\0\u01d8\0\u0213\0\u024e\0\u0289\0\u02c4\0\u02ff\0\u033a" + "\0\u0375\0\73\0\u03b0\0\u03eb\0\u0426\0\u0461\0\u049c\0\u04d7" + "\0\u0512\0\u054d\0\u0588\0\u05c3\0\u05fe\0\u0639\0\u0674\0\u06af" + "\0\u06ea\0\u0725\0\u0760\0\u079b\0\73\0\u07d6\0\u0811\0\u084c" + "\0\u0887\0\u08c2\0\u08fd\0\u0938\0\u0973\0\u09ae\0\u09e9\0\u0a24" + "\0\u0a5f\0\u0a9a\0\u0ad5\0\u0b10\0\u0b4b\0\u0b86\0\u0bc1\0\u0bfc" + "\0\u0c37\0\u0c72\0\u0cad\0\u0ce8\0\u0d23\0\u0d5e\0\u0d99\0\u0dd4" + "\0\u0e0f\0\u0e4a\0\u0127\0\u0e85\0\u0ec0\0\u0efb\0\u0f36\0\u0f71" + "\0\u0fac\0\u0fe7\0\u1022\0\u105d\0\u1098\0\u10d3\0\u110e\0\u1149" + "\0\u1184\0\u11bf\0\u11fa\0\u1235\0\u1270\0\u12ab\0\u12e6\0\u1321" + "\0\u135c\0\u1397\0\u13d2\0\u140d\0\u1448\0\u1483\0\u14be\0\u14f9" + "\0\u1534\0\u156f\0\u15aa\0\u15e5\0\u1620\0\u165b\0\u1696\0\u16d1" + "\0\u170c\0\u1747\0\u1782\0\u17bd\0\u17f8\0\u1833\0\u186e\0\u18a9" + "\0\u18e4\0\u191f\0\u195a\0\u1995\0\u19d0\0\u1a0b\0\u1a46\0\u1a81" + "\0\u1abc\0\u1af7\0\u1b32\0\u1b6d\0\u1ba8\0\u1be3\0\u1c1e\0\u1c59" + "\0\u1c94\0\u1ccf\0\u1d0a\0\73\0\u1d45\0\u1d80\0\u1dbb\0\u1df6" + "\0\u1e31\0\u1e6c\0\u1ea7\0\u1ee2\0\u1f1d\0\u0127\0\u1f58\0\u1f93" + "\0\u1fce\0\u2009\0\u2044\0\u207f\0\u20ba\0\u20f5\0\u2130\0\u216b" + "\0\u21a6\0\u21e1\0\u221c\0\u2257\0\u2292\0\u22cd\0\73\0\u2308" + "\0\u2343\0\u237e\0\u23b9\0\u23f4\0\u242f\0\u246a\0\u24a5\0\u24e0" + "\0\u251b\0\u2556\0\u2591\0\u25cc\0\u2607\0\u2642\0\u267d\0\u26b8" + "\0\u1b6d\0\u26f3\0\u272e\0\u0127\0\u2769\0\u27a4\0\u27df\0\u281a" + "\0\u2855\0\u2890\0\u28cb\0\u2906\0\u2941\0\u297c\0\u29b7\0\u29f2" + "\0\u2a2d\0\u2a68\0\u2aa3\0\u2ade\0\u2b19\0\u2b54\0\u2b8f\0\u2bca" + "\0\u2c05";
-
-	private static int[] zzUnpackRowMap() {
-		int[] result = new int[201];
-		int offset = 0;
-		offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-		int i = 0;  /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length() - 1;
-		while (i < l) {
-			int high = packed.charAt(i++) << 16;
-			result[j++] = high | packed.charAt(i++);
-		}
-		return j;
-	}
-
-	/**
-	 * The transition table of the DFA
-	 */
-	private static final int[] ZZ_TRANS = zzUnpacktrans();
-
-	private static final String ZZ_TRANS_PACKED_0 = "\1\2\2\3\1\0\1\2\1\4\1\5\1\6\1\7" + "\1\10\1\11\1\4\1\12\1\13\1\14\1\15\1\16" + "\1\17\1\20\1\21\1\4\2\22\1\23\7\6\1\2" + "\1\6\1\24\1\25\1\26\1\27\1\30\1\31\1\32" + "\1\6\1\33\1\6\1\34\1\6\1\35\1\6\1\36" + "\1\37\1\40\1\41\1\6\1\42\1\43\3\6\1\44" + "\75\0\2\3\114\0\1\22\46\0\2\5\1\0\3\5" + "\1\45\30\5\1\46\33\5\1\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\31\6\1\0\1\6\10\0" + "\1\22\13\0\1\22\46\0\2\10\1\0\6\10\1\45" + "\25\10\1\47\33\10\14\0\1\22\7\0\1\22\63\0" + "\1\22\6\0\2\22\63\0\1\50\1\0\2\51\64\0" + "\1\52\3\0\1\53\4\0\1\22\64\0\1\51\1\0" + "\2\17\7\0\1\54\1\45\1\55\1\45\1\0\1\56" + "\1\0\1\17\1\0\1\54\1\0\1\45\1\55\1\45" + "\4\0\1\45\12\0\1\56\22\0\1\51\1\0\2\17" + "\10\0\1\45\1\55\1\45\3\0\1\17\3\0\1\45" + "\1\55\1\45\4\0\1\45\41\0\1\22\73\0\1\4" + "\1\22\55\0\1\57\20\0\7\57\1\0\31\57\2\0" + "\1\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\2\6\1\60\16\6\1\61\7\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\62" + "\1\6\1\63\6\6\1\64\1\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\65" + "\6\6\1\66\2\6\1\67\2\6\1\70\12\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\5\6\1\71\10\6\1\72\12\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\13\6\1\73" + "\1\6\1\74\10\6\1\75\2\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\76" + "\7\6\1\77\1\6\1\100\2\6\1\101\12\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\16\6\1\102\12\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\6\6\1\103\5\6\1\104" + "\1\105\13\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\16\6\1\106\12\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\1\6" + "\1\107\3\6\1\110\15\6\1\111\5\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\1\6" + "\1\112\16\6\1\113\2\6\1\114\5\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\5\6" + "\1\115\23\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\10\6\1\116\11\6\1\117\1\120" + "\1\6\1\121\1\6\1\122\1\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\10\6\1\123" + "\7\6\1\124\10\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\16\6\1\125\12\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\10\6\1\126\20\6\1\0\1\6\24\0\1\22\44\0" + "\1\22\1\0\2\5\1\0\70\5\2\10\1\0\70\10" + "\16\0\1\11\74\0\2\51\10\0\1\45\1\55\4\0" + "\1\51\3\0\1\45\1\55\1\45\24\0\13\127\1\130" + "\57\127\2\53\1\0\70\53\20\0\2\54\12\0\1\45" + "\3\0\1\54\12\0\1\45\33\0\2\131\2\0\2\131" + "\10\0\1\45\5\0\1\131\3\0\1\45\1\0\1\45" + "\42\0\1\132\1\0\2\133\6\0\4\133\1\45\3\0" + "\7\133\4\0\1\45\17\0\1\57\6\0\1\57\10\0" + "\2\57\6\0\7\57\1\0\31\57\1\0\1\57\1\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\21\6" + "\1\134\7\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\21\6\1\135\7\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\16\6" + "\1\136\12\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\5\6\1\137\23\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\22\6" + "\1\140\6\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\21\6\1\140\1\141\6\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\1\6\1\101\27\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\1\6\1\142\27\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\15\6\1\143\13\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\6\6\1\144\22\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\23\6\1\145\5\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\21\6\1\140\7\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\23\6\1\146\5\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\22\6\1\147\6\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\13\6\1\73\15\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\15\6\1\150\13\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\16\6\1\151\12\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\20\6\1\103\10\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\22\6\1\152\6\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\17\6\1\153\11\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\21\6\1\154\1\155\6\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\15\6\1\156\13\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\22\6\1\157\6\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\25\6\1\103\3\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\13\6\1\160\15\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\3\6\1\161\25\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\11\6\1\162\4\6\1\163\12\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\2\6" + "\1\164\26\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\22\6\1\165\6\6\1\0\2\6" + "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\16\6" + "\1\166\12\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\1\6\1\167\16\6\1\170\10\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\17\6\1\171\11\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\11\6\1\172\17\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\15\6\1\173\13\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\11\6\1\174\6\6" + "\1\175\10\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\1\6\1\176\21\6\1\140\3\6" + "\1\103\1\6\1\0\2\6\6\0\1\6\10\0\2\6" + "\6\0\7\6\1\0\11\6\1\177\1\6\1\200\15\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\11\6\1\201\17\6\1\0\1\6\13\127\1\202" + "\57\127\13\203\1\130\3\203\1\204\53\203\20\0\2\131" + "\10\0\1\45\5\0\1\131\3\0\1\45\1\0\1\45" + "\44\0\2\205\6\0\4\205\4\0\7\205\42\0\1\205" + "\1\0\2\133\6\0\4\133\1\45\1\55\2\0\7\133" + "\4\0\1\45\3\0\1\55\13\0\1\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\22\6\1\206\6\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\5\6\1\207\23\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\13\6\1\210\15\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\1\6\1\211\27\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\5\6\1\103\23\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\3\6\1\212\25\6\1\0\2\6\6\0\1\6" + "\10\0\2\6\6\0\7\6\1\0\21\6\1\174\7\6" + "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6" + "\1\0\21\6\1\213\1\214\6\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\215" + "\27\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\2\6\1\201\26\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\14\6\1\216" + "\14\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\5\6\1\217\23\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\220" + "\27\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\1\6\1\213\27\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\103" + "\12\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\13\6\1\221\2\6\1\166\12\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\22\6\1\222\6\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\5\6\1\223\23\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\7\6\1\103\21\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\11\6\1\224\17\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\13\6\1\103\15\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\12\6\1\225\16\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\24\6\1\226\4\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\22\6\1\227\6\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\13\6\1\230\15\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\23\6\1\231\5\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\20\6\1\213\10\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\22\6\1\230\6\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\11\6\1\232\17\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\5\6\1\101\23\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\22\6\1\141\6\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\3\6\1\233\25\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\21\6\1\103\7\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\16\6\1\234\12\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\15\6\1\235\13\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\4\6\1\103\24\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\1\6\1\236\27\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\13\6\1\140\15\6\1\0" + "\1\6\13\127\1\202\3\127\1\237\53\127\13\203\1\240" + "\57\203\20\0\2\205\6\0\4\205\1\0\1\55\2\0" + "\7\205\10\0\1\55\13\0\1\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\20\6\1\241\10\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\20\6\1\242\10\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\5\6\1\243\23\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\12\6\1\103\16\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\10\6\1\103\20\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\22\6\1\103\6\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\11\6\1\244\17\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\23\6\1\245\5\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\15\6\1\246\13\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\13\6\1\247\15\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\5\6\1\250\23\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\1\6\1\251\27\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\20\6\1\252\10\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\24\6\1\140\4\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\1\6\1\253\27\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\1\6\1\64\27\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\5\6\1\254\23\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\11\6\1\255\17\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\20\6\1\256\10\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\3\6\1\257\25\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\10\6\1\260\20\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\25\6\1\261\3\6\1\0\2\6\6\0\1\6\10\0" + "\2\6\6\0\7\6\1\0\21\6\1\262\7\6\1\0" + "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0" + "\22\6\1\126\6\6\1\0\1\6\13\203\1\240\3\203" + "\1\204\53\203\1\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\1\6\1\263\27\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\22\6\1\264" + "\6\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\1\6\1\256\27\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\265" + "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\13\6\1\213\15\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\4\6\1\174" + "\24\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\13\6\1\266\15\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\14\6\1\267" + "\14\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\15\6\1\270\13\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\6\6\1\271" + "\22\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\7\6\1\140\21\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\272" + "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\3\6\1\103\25\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\103" + "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\22\6\1\273\6\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\20\6\1\274" + "\10\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\11\6\1\275\17\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\213" + "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\23\6\1\140\5\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\27\6\1\103" + "\1\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\5\6\1\276\23\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\277" + "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\1\6\1\300\27\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\22\6\1\301" + "\6\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\6\6\1\302\22\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\303" + "\12\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\5\6\1\304\23\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\305" + "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\5\6\1\306\23\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\140" + "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\5\6\1\177\23\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\17\6\1\103" + "\11\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\15\6\1\307\13\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\213" + "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\22\6\1\174\6\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\310" + "\12\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\11\6\1\311\17\6\1\0\2\6\6\0" + "\1\6\10\0\2\6\6\0\7\6\1\0\6\6\1\103" + "\22\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0" + "\7\6\1\0\30\6\1\301\1\0\1\6";
-
-	private static int[] zzUnpacktrans() {
-		int[] result = new int[11328];
-		int offset = 0;
-		offset = zzUnpacktrans(ZZ_TRANS_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpacktrans(String packed, int offset, int[] result) {
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while (i < l) {
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			value--;
-			do result[j++] = value; while (--count > 0);
-		}
-		return j;
-	}
-
-
-	/**
-	 * Error code for "Unknown internal scanner error".
-	 */
-	private static final int ZZ_UNKNOWN_ERROR = 0;
-	/**
-	 * Error code for "could not match input".
-	 */
-	private static final int ZZ_NO_MATCH = 1;
-	/**
-	 * Error code for "pushback value was too large".
-	 */
-	private static final int ZZ_PUSHBACK_2BIG = 2;
-
-	/**
-	 * Error messages for {@link #ZZ_UNKNOWN_ERROR}, {@link #ZZ_NO_MATCH}, and
-	 * {@link #ZZ_PUSHBACK_2BIG} respectively.
-	 */
-	private static final String ZZ_ERROR_MSG[] = {"Unknown internal scanner error", "Error: could not match input", "Error: pushback value was too large"};
-
-	/**
-	 * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}
-	 */
-	private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-	private static final String ZZ_ATTRIBUTE_PACKED_0 = "\1\0\1\11\6\1\1\11\10\1\1\11\22\1\1\11" + "\2\1\1\0\61\1\1\0\47\1\1\0\1\1\1\11" + "\1\0\31\1\1\11\1\0\51\1";
-
-	private static int[] zzUnpackAttribute() {
-		int[] result = new int[201];
-		int offset = 0;
-		offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while (i < l) {
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do result[j++] = value; while (--count > 0);
-		}
-		return j;
-	}
-
-	/**
-	 * Input device.
-	 */
-	private Reader zzReader;
-
-	/**
-	 * Current state of the DFA.
-	 */
-	private int zzState;
-
-	/**
-	 * Current lexical state.
-	 */
-	private int zzLexicalState = YYINITIAL;
-
-	/**
-	 * This buffer contains the current text to be matched and is the source of the {@link #yytext()}
-	 * string.
-	 */
-	private char zzBuffer[] = new char[Math.min(ZZ_BUFFERSIZE, zzMaxBufferLen())];
-
-	/**
-	 * Text position at the last accepting state.
-	 */
-	private int zzMarkedPos;
-
-	/**
-	 * Current text position in the buffer.
-	 */
-	private int zzCurrentPos;
-
-	/**
-	 * Marks the beginning of the {@link #yytext()} string in the buffer.
-	 */
-	private int zzStartRead;
-
-	/**
-	 * Marks the last character in the buffer, that has been read from input.
-	 */
-	private int zzEndRead;
-
-	/**
-	 * Whether the scanner is at the end of file.
-	 *
-	 * @see #yyatEOF
-	 */
-	private boolean zzAtEOF;
-
-	/**
-	 * The number of occupied positions in {@link #zzBuffer} beyond {@link #zzEndRead}.
-	 *
-	 * <p>When a lead/high surrogate has been read from the input stream into the final
-	 * {@link #zzBuffer} position, this will have a value of 1; otherwise, it will have a value of 0.
-	 */
-	private int zzFinalHighSurrogate = 0;
-
-	/**
-	 * Number of newlines encountered up to the start of the matched text.
-	 */
-	private int yyline;
-
-	/**
-	 * Number of characters from the last newline up to the start of the matched text.
-	 */
-	private int yycolumn;
-
-	/**
-	 * Number of characters up to the start of the matched text.
-	 */
-	@SuppressWarnings("unused")
-	private long yychar;
-
-	/**
-	 * Whether the scanner is currently at the beginning of a line.
-	 */
-	@SuppressWarnings("unused")
-	private boolean zzAtBOL = true;
-
-	/**
-	 * Whether the user-EOF-code has already been executed.
-	 */
-	@SuppressWarnings("unused")
-	private boolean zzEOFDone;
-
-	/* user code: */
-	private boolean myAssertKeyword;
-	private boolean myEnumKeyword;
-
-	public JavaLexer() {
-		this(8);
-	}
-
-	public JavaLexer(int level) {
-		this((Reader) null);
-		myAssertKeyword = level >= 4;
-		myEnumKeyword = level >= 5;
-	}
-
-	public void setReader(Reader reader) {
-		zzReader = reader;
-	}
-
-	public void reset(Reader reader) {
-		yyreset(reader);
-	}
-
-	public int getState() {
-		return yystate() + 1;
-	}
-
-	public void setState(int state) {
-		yybegin(state - 1);
-	}
-
-	public int getDefaultState() {
-		return YYINITIAL + 1;
-	}
-
-	public SyntaxKind nextToken() throws IOException {
-		return yylex();
-	}
-
-	public int getLine() {
-		return yyline;
-	}
-
-	public int getColumn() {
-		return yycolumn;
-	}
-
-
-	/**
-	 * Creates a new scanner
-	 *
-	 * @param in the java.io.Reader to read input from.
-	 */
-	public JavaLexer(Reader in) {
-		this.zzReader = in;
-	}
-
-
-	/**
-	 * Returns the maximum size of the scanner buffer, which limits the size of tokens.
-	 */
-	private int zzMaxBufferLen() {
-		return Integer.MAX_VALUE;
-	}
-
-	/**
-	 * Whether the scanner buffer can grow to accommodate a larger token.
-	 */
-	private boolean zzCanGrow() {
-		return true;
-	}
-
-	/**
-	 * Translates raw input code points to DFA table row
-	 */
-	private static int zzCMap(int input) {
-		int offset = input & 255;
-		return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];
-	}
-
-	/**
-	 * Refills the input buffer.
-	 *
-	 * @return {@code false} iff there was new input.
-	 * @throws IOException if any I/O-Error occurs
-	 */
-	private boolean zzRefill() throws IOException {
-
-		/* first: make room (if you can) */
-		if (zzStartRead > 0) {
-			zzEndRead += zzFinalHighSurrogate;
-			zzFinalHighSurrogate = 0;
-			System.arraycopy(zzBuffer, zzStartRead, zzBuffer, 0, zzEndRead - zzStartRead);
-
-			/* translate stored positions */
-			zzEndRead -= zzStartRead;
-			zzCurrentPos -= zzStartRead;
-			zzMarkedPos -= zzStartRead;
-			zzStartRead = 0;
-		}
-
-		/* is the buffer big enough? */
-		if (zzCurrentPos >= zzBuffer.length - zzFinalHighSurrogate && zzCanGrow()) {
-			/* if not, and it can grow: blow it up */
-			char newBuffer[] = new char[Math.min(zzBuffer.length * 2, zzMaxBufferLen())];
-			System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
-			zzBuffer = newBuffer;
-			zzEndRead += zzFinalHighSurrogate;
-			zzFinalHighSurrogate = 0;
-		}
-
-		/* fill the buffer with new input */
-		int requested = zzBuffer.length - zzEndRead;
-		int numRead = zzReader.read(zzBuffer, zzEndRead, requested);
-
-		/* not supposed to occur according to specification of java.io.Reader */
-		if (numRead == 0) {
-			if (requested == 0) {
-				throw new java.io.EOFException("Scan buffer limit reached [" + zzBuffer.length + "]");
-			} else {
-				throw new IOException("Reader returned 0 characters. See JFlex examples/zero-reader for a workaround.");
-			}
-		}
-		if (numRead > 0) {
-			zzEndRead += numRead;
-			if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
-				if (numRead == requested) { // We requested too few chars to encode a full Unicode character
-					--zzEndRead;
-					zzFinalHighSurrogate = 1;
-				} else {                    // There is room in the buffer for at least one more char
-					int c = zzReader.read();  // Expecting to read a paired low surrogate char
-					if (c == -1) {
-						return true;
-					} else {
-						zzBuffer[zzEndRead++] = (char) c;
-					}
-				}
-			}
-			/* potentially more input available */
-			return false;
-		}
-
-		/* numRead < 0 ==> end of stream */
-		return true;
-	}
-
-
-	/**
-	 * Closes the input reader.
-	 *
-	 * @throws IOException if the reader could not be closed.
-	 */
-	public final void yyclose() throws IOException {
-		zzAtEOF = true; // indicate end of file
-		zzEndRead = zzStartRead; // invalidate buffer
-
-		if (zzReader != null) {
-			zzReader.close();
-		}
-	}
-
-
-	/**
-	 * Resets the scanner to read from a new input stream.
-	 *
-	 * <p>Does not close the old reader.
-	 *
-	 * <p>All internal variables are reset, the old input stream <b>cannot</b> be reused (internal
-	 * buffer is discarded and lost). Lexical state is set to {@code ZZ_INITIAL}.
-	 *
-	 * <p>Internal scan buffer is resized down to its initial length, if it has grown.
-	 *
-	 * @param reader The new input stream.
-	 */
-	public final void yyreset(Reader reader) {
-		zzReader = reader;
-		zzEOFDone = false;
-		yyResetPosition();
-		zzLexicalState = YYINITIAL;
-		int initBufferSize = Math.min(ZZ_BUFFERSIZE, zzMaxBufferLen());
-		if (zzBuffer.length > initBufferSize) {
-			zzBuffer = new char[initBufferSize];
-		}
-	}
-
-	/**
-	 * Resets the input position.
-	 */
-	private final void yyResetPosition() {
-		zzAtBOL = true;
-		zzAtEOF = false;
-		zzCurrentPos = 0;
-		zzMarkedPos = 0;
-		zzStartRead = 0;
-		zzEndRead = 0;
-		zzFinalHighSurrogate = 0;
-		yyline = 0;
-		yycolumn = 0;
-		yychar = 0L;
-	}
-
-
-	/**
-	 * Returns whether the scanner has reached the end of the reader it reads from.
-	 *
-	 * @return whether the scanner has reached EOF.
-	 */
-	public final boolean yyatEOF() {
-		return zzAtEOF;
-	}
-
-
-	/**
-	 * Returns the current lexical state.
-	 *
-	 * @return the current lexical state.
-	 */
-	public final int yystate() {
-		return zzLexicalState;
-	}
-
-
-	/**
-	 * Enters a new lexical state.
-	 *
-	 * @param newState the new lexical state
-	 */
-	public final void yybegin(int newState) {
-		zzLexicalState = newState;
-	}
-
-
-	/**
-	 * Returns the text matched by the current regular expression.
-	 *
-	 * @return the matched text.
-	 */
-	public final String yytext() {
-		return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead);
-	}
-
-
-	/**
-	 * Returns the character at the given position from the matched text.
-	 *
-	 * <p>It is equivalent to {@code yytext().charAt(pos)}, but faster.
-	 *
-	 * @param position the position of the character to fetch. A value from 0 to {@code yylength()-1}.
-	 * @return the character at {@code position}.
-	 */
-	public final char yycharat(int position) {
-		return zzBuffer[zzStartRead + position];
-	}
-
-
-	/**
-	 * How many characters were matched.
-	 *
-	 * @return the length of the matched text region.
-	 */
-	public final int yylength() {
-		return zzMarkedPos - zzStartRead;
-	}
-
-
-	/**
-	 * Reports an error that occurred while scanning.
-	 *
-	 * <p>In a well-formed scanner (no or only correct usage of {@code yypushback(int)} and a
-	 * match-all fallback rule) this method will only be called with things that
-	 * "Can't Possibly Happen".
-	 *
-	 * <p>If this method is called, something is seriously wrong (e.g. a JFlex bug producing a faulty
-	 * scanner etc.).
-	 *
-	 * <p>Usual syntax/scanner level error handling should be done in error fallback rules.
-	 *
-	 * @param errorCode the code of the error message to display.
-	 */
-	private static void zzScanError(int errorCode) {
-		String message;
-		try {
-			message = ZZ_ERROR_MSG[errorCode];
-		} catch (ArrayIndexOutOfBoundsException e) {
-			message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-		}
-
-		throw new Error(message);
-	}
-
-
-	/**
-	 * Pushes the specified amount of characters back into the input stream.
-	 *
-	 * <p>They will be read again by then next call of the scanning method.
-	 *
-	 * @param number the number of characters to be read again. This number must not be greater than
-	 *               {@link #yylength()}.
-	 */
-	public void yypushback(int number) {
-		if (number > yylength()) zzScanError(ZZ_PUSHBACK_2BIG);
-
-		zzMarkedPos -= number;
-	}
-
-
-	/**
-	 * Resumes scanning until the next regular expression is matched, the end of input is encountered
-	 * or an I/O-Error occurs.
-	 *
-	 * @return the next token.
-	 * @throws IOException if any I/O-Error occurs.
-	 */
-	public SyntaxKind yylex() throws IOException {
-		int zzInput;
-		int zzAction;
-
-		// cached fields:
-		int zzCurrentPosL;
-		int zzMarkedPosL;
-		int zzEndReadL = zzEndRead;
-		char[] zzBufferL = zzBuffer;
-
-		int[] zzTransL = ZZ_TRANS;
-		int[] zzRowMapL = ZZ_ROWMAP;
-		int[] zzAttrL = ZZ_ATTRIBUTE;
-
-		while (true) {
-			zzMarkedPosL = zzMarkedPos;
-
-			boolean zzR = false;
-			int zzCh;
-			int zzCharCount;
-			for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL; zzCurrentPosL += zzCharCount) {
-				zzCh = Character.codePointAt(zzBufferL, zzCurrentPosL, zzMarkedPosL);
-				zzCharCount = Character.charCount(zzCh);
-				switch (zzCh) {
-					case '\u000B':  // fall through
-					case '\u000C':  // fall through
-					case '\u0085':  // fall through
-					case '\u2028':  // fall through
-					case '\u2029':
-						yyline++;
-						yycolumn = 0;
-						zzR = false;
-						break;
-					case '\r':
-						yyline++;
-						yycolumn = 0;
-						zzR = true;
-						break;
-					case '\n':
-						if (zzR) zzR = false;
-						else {
-							yyline++;
-							yycolumn = 0;
-						}
-						break;
-					default:
-						zzR = false;
-						yycolumn += zzCharCount;
-				}
-			}
-
-			if (zzR) {
-				// peek one character ahead if it is
-				// (if we have counted one line too much)
-				boolean zzPeek;
-				if (zzMarkedPosL < zzEndReadL) zzPeek = zzBufferL[zzMarkedPosL] == '\n';
-				else if (zzAtEOF) zzPeek = false;
-				else {
-					boolean eof = zzRefill();
-					zzEndReadL = zzEndRead;
-					zzMarkedPosL = zzMarkedPos;
-					zzBufferL = zzBuffer;
-					if (eof) zzPeek = false;
-					else zzPeek = zzBufferL[zzMarkedPosL] == '\n';
-				}
-				if (zzPeek) yyline--;
-			}
-			zzAction = -1;
-
-			zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-			zzState = ZZ_LEXSTATE[zzLexicalState];
-
-			// set up zzAction for empty match case:
-			int zzAttributes = zzAttrL[zzState];
-			if ((zzAttributes & 1) == 1) {
-				zzAction = zzState;
-			}
-
-
-			zzForAction:
-			{
-				while (true) {
-
-					if (zzCurrentPosL < zzEndReadL) {
-						zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
-						zzCurrentPosL += Character.charCount(zzInput);
-					} else if (zzAtEOF) {
-						zzInput = YYEOF;
-						break zzForAction;
-					} else {
-						// store back cached positions
-						zzCurrentPos = zzCurrentPosL;
-						zzMarkedPos = zzMarkedPosL;
-						boolean eof = zzRefill();
-						// get translated positions and possibly new buffer
-						zzCurrentPosL = zzCurrentPos;
-						zzMarkedPosL = zzMarkedPos;
-						zzBufferL = zzBuffer;
-						zzEndReadL = zzEndRead;
-						if (eof) {
-							zzInput = YYEOF;
-							break zzForAction;
-						} else {
-							zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
-							zzCurrentPosL += Character.charCount(zzInput);
-						}
-					}
-					int zzNext = zzTransL[zzRowMapL[zzState] + zzCMap(zzInput)];
-					if (zzNext == -1) break zzForAction;
-					zzState = zzNext;
-
-					zzAttributes = zzAttrL[zzState];
-					if ((zzAttributes & 1) == 1) {
-						zzAction = zzState;
-						zzMarkedPosL = zzCurrentPosL;
-						if ((zzAttributes & 8) == 8) break zzForAction;
-					}
-
-				}
-			}
-
-			// store back cached position
-			zzMarkedPos = zzMarkedPosL;
-
-			if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-				zzAtEOF = true;
-				{
-					return null;
-				}
-			} else {
-				switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-					case 1: {
-						return Plain;
-					}
-					// fall through
-					case 11:
-						break;
-					case 2: {
-						return Operator;
-					}
-					// fall through
-					case 12:
-						break;
-					case 3: {
-						return Literal;
-					}
-					// fall through
-					case 13:
-						break;
-					case 4: {
-						return Separator;
-					}
-					// fall through
-					case 14:
-						break;
-					case 5: {
-						return Comment;
-					}
-					// fall through
-					case 15:
-						break;
-					case 6: {
-						return TypeIdentifier;
-					}
-					// fall through
-					case 16:
-						break;
-					case 7: {
-						return Keyword;
-					}
-					// fall through
-					case 17:
-						break;
-					case 8: {
-						return DocComment;
-					}
-					// fall through
-					case 18:
-						break;
-					case 9: {
-						return myEnumKeyword ? Keyword : Plain;
-					}
-					// fall through
-					case 19:
-						break;
-					case 10: {
-						return myAssertKeyword ? Keyword : Plain;
-					}
-					// fall through
-					case 20:
-						break;
-					default:
-						zzScanError(ZZ_NO_MATCH);
-				}
-			}
-		}
-	}
-
-
-}
diff --git a/app/src/main/assets/testkey.jks b/app/src/main/assets/testkey.jks
deleted file mode 100644
index 9e78dad..0000000
Binary files a/app/src/main/assets/testkey.jks and /dev/null differ
diff --git a/app/src/main/assets/testkey.pk8 b/app/src/main/assets/testkey.pk8
deleted file mode 100644
index 586c1bd..0000000
Binary files a/app/src/main/assets/testkey.pk8 and /dev/null differ
diff --git a/app/src/main/assets/testkey.x509.pem b/app/src/main/assets/testkey.x509.pem
deleted file mode 100644
index e242d83..0000000
--- a/app/src/main/assets/testkey.x509.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM
-qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4
-wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy
-4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU
-RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s
-zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw
-HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ
-AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa
-J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y
-LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe
-+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX
-31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr
-sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0=
------END CERTIFICATE-----
diff --git a/app/src/main/java/com/apkide/ui/activities/AboutUI.java b/app/src/main/java/com/apkide/ui/AboutUI.java
similarity index 93%
rename from app/src/main/java/com/apkide/ui/activities/AboutUI.java
rename to app/src/main/java/com/apkide/ui/AboutUI.java
index 51ea085..f86d4df 100644
--- a/app/src/main/java/com/apkide/ui/activities/AboutUI.java
+++ b/app/src/main/java/com/apkide/ui/AboutUI.java
@@ -1,10 +1,9 @@
-package com.apkide.ui.activities;
+package com.apkide.ui;
 
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 
-import com.apkide.ui.StyledUI;
 import com.apkide.ui.databinding.UiAboutBinding;
 
 public class AboutUI extends StyledUI {
diff --git a/app/src/main/java/com/apkide/ui/App.java b/app/src/main/java/com/apkide/ui/App.java
index e3596a4..c23f32f 100644
--- a/app/src/main/java/com/apkide/ui/App.java
+++ b/app/src/main/java/com/apkide/ui/App.java
@@ -9,9 +9,12 @@
 
 import androidx.annotation.NonNull;
 
-import com.apkide.common.ApplicationProvider;
+import com.apkide.common.app.Application;
+import com.apkide.ui.browsers.file.FileBrowserService;
+import com.apkide.ui.services.file.OpenFileService;
 import com.apkide.ui.services.keybinding.KeyBindingService;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,6 +26,8 @@ public final class App {
     private static Handler sHandler;
     private static MainUI sMainUI;
 
+    private final FileBrowserService myFileBrowserService=new FileBrowserService();
+    private final OpenFileService myOpenFileService=new OpenFileService();
     private final KeyBindingService myKeyBindingService=new KeyBindingService();
     private App() {
 
@@ -32,6 +37,7 @@ public static void initialize(MainUI mainUI) {
         sApp = new App();
         sHandler = new Handler(requireNonNull(Looper.getMainLooper()));
         sMainUI = mainUI;
+        sApp.myOpenFileService.init();
     }
 
 
@@ -46,6 +52,15 @@ public static boolean isShutdown() {
         return sApp == null;
     }
 
+
+    public static FileBrowserService getFileBrowserService(){
+        return sApp.myFileBrowserService;
+    }
+
+    public static OpenFileService getOpenFileService(){
+        return sApp.myOpenFileService;
+    }
+
     public static KeyBindingService getKeyBindingService(){
         return sApp.myKeyBindingService;
     }
@@ -94,6 +109,10 @@ public static SharedPreferences getPreferences(String name) {
     }
 
     public static Context getContext() {
-        return ApplicationProvider.get().getContext();
+        return Application.get().getContext();
+    }
+
+    public static File getHomeDir(){
+        return getContext().getExternalFilesDir(null).getParentFile();
     }
 }
diff --git a/app/src/main/java/com/apkide/ui/AppCommands.java b/app/src/main/java/com/apkide/ui/AppCommands.java
index 73ee5eb..cd4e2a2 100644
--- a/app/src/main/java/com/apkide/ui/AppCommands.java
+++ b/app/src/main/java/com/apkide/ui/AppCommands.java
@@ -1,77 +1,125 @@
 package com.apkide.ui;
 
-import static java.lang.System.arraycopy;
-
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.apkide.common.AppLog;
-import com.apkide.common.Command;
-import com.apkide.ui.commands.ExitApp;
-import com.apkide.ui.commands.GotoSettings;
-import com.apkide.ui.commands.MakeProject;
-import com.apkide.ui.commands.Redo;
-import com.apkide.ui.commands.Undo;
-import com.apkide.ui.commands.view.ViewBuild;
-import com.apkide.ui.commands.view.ViewFiles;
-import com.apkide.ui.commands.view.ViewFind;
-import com.apkide.ui.commands.view.ViewProblem;
-import com.apkide.ui.util.MenuCommand;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
+import com.apkide.common.command.Command;
+import com.apkide.common.keybinding.KeyStroke;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 public class AppCommands {
 
-    private static final Command[] commands;
-    private static final MenuCommand[] menuCommands;
-
-
-    static {
-        menuCommands = new MenuCommand[]{
-                new Undo(),
-                new Redo(),
-                new MakeProject(),
-                new GotoSettings(),
-                new ExitApp(),
-
-                //View
-                new ViewFiles(),
-                new ViewProblem(),
-                new ViewBuild(),
-                new ViewFind(),
-
-        };
-
-        commands = new Command[menuCommands.length];
-        arraycopy(menuCommands, 0, commands, 0, menuCommands.length);
-    }
-
-
-    public static boolean menuCommandPreExec(Menu menu) {
-        long startTime=System.currentTimeMillis();
-        boolean apply = false;
-        for (Command command : commands) {
-            if (command instanceof MenuCommand) {
-                MenuItem item = menu.findItem(((MenuCommand) command).getId());
-                if (item != null) {
-                    item.setEnabled(command.isEnabled());
-                    item.setVisible(((MenuCommand) command).isVisible());
-                    apply = true;
-                }
-            }
-        }
-        long endTime=System.currentTimeMillis();
-        AppLog.s("menuCommandPreExec:"+(endTime-startTime));
-        return apply;
-    }
-
-    public static boolean menuCommandExec(MenuItem item) {
-        for (Command command : commands) {
-            if (command instanceof MenuCommand) {
-                if (item.getItemId() == ((MenuCommand) command).getId()) {
-                    AppLog.s("menuCommandExec:"+item.getTitle());
-                    return command.run();
-                }
-            }
-        }
-        return false;
-    }
+	public interface MenuCommand extends Command {
+		int getId();
+
+		boolean isEnabled();
+
+		boolean run();
+	}
+
+	public interface VisibleMenuCommand extends MenuCommand {
+		boolean getVisible(boolean preview);
+	}
+
+	public interface TitleMenuCommand extends MenuCommand {
+		@NonNull
+		String getTitle();
+	}
+
+	public interface ActionBarCommand extends Command {
+		int getId();
+
+		@NonNull
+		String getLabel();
+
+		boolean isEnabled();
+
+		boolean isVisible();
+
+		boolean run();
+	}
+
+	public interface BrowserCommand extends Command {
+
+		boolean getVisible(boolean preview);
+		@DrawableRes
+		int getIcon();
+
+		@StringRes
+		int getLabel();
+
+		boolean isEnabled();
+
+		boolean run();
+	}
+
+	public interface ShortcutKeyCommand extends Command {
+		@NonNull
+		String getName();
+
+
+		boolean isEnabled();
+
+		boolean run();
+
+		@NonNull
+		KeyStroke getKeyStroke();
+	}
+
+
+	private static final HashSet<Class<?>> sCommandClasses = new HashSet<>(50);
+	private static final List<Command> sCommands = new ArrayList<>(50);
+
+	static {
+
+	}
+
+	private static void addCommands(Command[] commands, List<ShortcutKeyCommand> keyCommands) {
+		for (Command command : commands) {
+			if (command instanceof ShortcutKeyCommand) {
+				if (!keyCommands.contains(command))
+					keyCommands.add((ShortcutKeyCommand) command);
+			}
+			if (!sCommandClasses.contains(command.getClass())) {
+				sCommandClasses.add(command.getClass());
+				sCommands.add(command);
+			}
+		}
+	}
+
+	public static List<Command> getCommands() {
+		return sCommands;
+	}
+
+	public static List<BrowserCommand> getBrowserCommands() {
+		ArrayList<BrowserCommand> commands = new ArrayList<>();
+		for (Command command : getCommands()) {
+			if (command instanceof BrowserCommand) {
+				commands.add((BrowserCommand) command);
+			}
+		}
+		return commands;
+	}
+
+	public static MenuCommand foundMenuCommand(int id) {
+		for (Command command : getCommands()) {
+			if (command instanceof MenuCommand && ((MenuCommand) command).getId() == id) {
+				return (MenuCommand) command;
+			}
+		}
+		return null;
+	}
+
+	public static ActionBarCommand foundActionBarCommand(int id) {
+		for (Command command : getCommands()) {
+			if (command instanceof ActionBarCommand && ((ActionBarCommand) command).getId() == id) {
+				return (ActionBarCommand) command;
+			}
+		}
+		return null;
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/AppPreferences.java b/app/src/main/java/com/apkide/ui/AppPreferences.java
index e377d89..a773bc9 100644
--- a/app/src/main/java/com/apkide/ui/AppPreferences.java
+++ b/app/src/main/java/com/apkide/ui/AppPreferences.java
@@ -2,131 +2,64 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.ArrayMap;
 
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 
-import com.apkide.common.ApplicationProvider;
-
-import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
-
-import java.util.Collections;
-import java.util.Map;
-
-import brut.androlib.Config;
-
-public class AppPreferences implements IFernflowerPreferences {
-
-
-    private static SharedPreferences preferences;
-
-    public static void init(Context context) {
-        PreferenceManager.setDefaultValues(context, R.xml.preferences_application, false);
-        PreferenceManager.setDefaultValues(context, R.xml.preferences_editor, false);
-        PreferenceManager.setDefaultValues(context, R.xml.preferences_compiler, false);
-        PreferenceManager.setDefaultValues(context, R.xml.preferences_sourcecontrol, false);
-    }
-
-    public static void registerListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
-        getPreferences().registerOnSharedPreferenceChangeListener(listener);
-    }
-
-    public static void unregisterListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
-        getPreferences().unregisterOnSharedPreferenceChangeListener(listener);
-    }
-
-    @NonNull
-    public static SharedPreferences getPreferences() {
-        if (preferences == null)
-            preferences = PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.get().getContext());
-        return preferences;
-    }
-
-    @NonNull
-    public static SharedPreferences.Editor getEditor() {
-        return getPreferences().edit();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Editor Preferences
-    ///////////////////////////////////////////////////////////////////////////
-
-    public static boolean isEditorUseTabs() {
-        return getPreferences().getBoolean("editor.useTabs", true);
-    }
-
-    public static int getEditorTabSize() {
-        return getPreferences().getInt("editor.tabSize", 4);
-    }
-
-    public static int getEditorFontSize() {
-        String value = getPreferences().getString("editor.fontSize", "16");
-        try {
-            return Integer.parseInt(value);
-        } catch (NumberFormatException e) {
-            return 16;
-        }
-    }
-
-    private static String getOption(String key) {
-        boolean enabled = getPreferences().getBoolean(key, false);
-        return enabled ? "1" : "0";
-    }
-
-    public static Map<String, Object> getClassDecompileOptions() {
-        Map<String, Object> defaults = new ArrayMap<>(40);
-        defaults.put(REMOVE_BRIDGE, getOption(REMOVE_BRIDGE));
-        defaults.put(REMOVE_SYNTHETIC, getOption(REMOVE_SYNTHETIC));
-        defaults.put(DECOMPILE_INNER, getOption(DECOMPILE_INNER));
-        defaults.put(DECOMPILE_CLASS_1_4, getOption(DECOMPILE_CLASS_1_4));
-        defaults.put(DECOMPILE_ASSERTIONS, getOption(DECOMPILE_ASSERTIONS));
-        defaults.put(HIDE_EMPTY_SUPER, getOption(HIDE_EMPTY_SUPER));
-        defaults.put(HIDE_DEFAULT_CONSTRUCTOR, getOption(HIDE_DEFAULT_CONSTRUCTOR));
-        defaults.put(DECOMPILE_GENERIC_SIGNATURES, getOption(DECOMPILE_GENERIC_SIGNATURES));
-        defaults.put(NO_EXCEPTIONS_RETURN, getOption(NO_EXCEPTIONS_RETURN));
-        defaults.put(ENSURE_SYNCHRONIZED_MONITOR, getOption(ENSURE_SYNCHRONIZED_MONITOR));
-        defaults.put(DECOMPILE_ENUM, getOption(DECOMPILE_ENUM));
-        defaults.put(REMOVE_GET_CLASS_NEW, getOption(REMOVE_GET_CLASS_NEW));
-        defaults.put(LITERALS_AS_IS, getOption(LITERALS_AS_IS));
-        defaults.put(BOOLEAN_TRUE_ONE, getOption(BOOLEAN_TRUE_ONE));
-        defaults.put(ASCII_STRING_CHARACTERS, getOption(ASCII_STRING_CHARACTERS));
-        defaults.put(SYNTHETIC_NOT_SET, getOption(SYNTHETIC_NOT_SET));
-        defaults.put(UNDEFINED_PARAM_TYPE_OBJECT, getOption(UNDEFINED_PARAM_TYPE_OBJECT));
-        defaults.put(USE_DEBUG_VAR_NAMES, getOption(USE_DEBUG_VAR_NAMES));
-        defaults.put(USE_METHOD_PARAMETERS, getOption(USE_METHOD_PARAMETERS));
-        defaults.put(REMOVE_EMPTY_RANGES, getOption(REMOVE_EMPTY_RANGES));
-        defaults.put(FINALLY_DEINLINE, getOption(FINALLY_DEINLINE));
-        defaults.put(IDEA_NOT_NULL_ANNOTATION, getOption(IDEA_NOT_NULL_ANNOTATION));
-        defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, getOption(LAMBDA_TO_ANONYMOUS_CLASS));
-        defaults.put(BYTECODE_SOURCE_MAPPING, getOption(BYTECODE_SOURCE_MAPPING));
-        defaults.put(IGNORE_INVALID_BYTECODE, getOption(IGNORE_INVALID_BYTECODE));
-        defaults.put(VERIFY_ANONYMOUS_CLASSES, getOption(VERIFY_ANONYMOUS_CLASSES));
-
-        defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-        defaults.put(MAX_PROCESSING_METHOD, getOption(MAX_PROCESSING_METHOD));
-        defaults.put(RENAME_ENTITIES, getOption(RENAME_ENTITIES));
-        defaults.put(NEW_LINE_SEPARATOR, (InterpreterUtil.IS_WINDOWS ? "0" : "1"));
-        defaults.put(INDENT_STRING, "   ");
-        defaults.put(BANNER, "");
-        defaults.put(UNIT_TEST_MODE, getOption(UNIT_TEST_MODE));
-        defaults.put(DUMP_ORIGINAL_LINES, getOption(DUMP_ORIGINAL_LINES));
-
-        return Collections.unmodifiableMap(defaults);
-    }
-
-    public static void applyApkToolConfig() {
-        Config config = new Config() {
-            @Override
-            public void onChanged() {
-
-            }
-        };
-        //TODO: Configurable ApkTool options.
-        Config.set(config);
-    }
+import com.apkide.common.app.Application;
+
+public class AppPreferences {
+
+
+	private static SharedPreferences preferences;
+
+	public static void init(Context context) {
+		PreferenceManager.setDefaultValues(context, R.xml.preferences_application, false);
+		PreferenceManager.setDefaultValues(context, R.xml.preferences_editor, false);
+		PreferenceManager.setDefaultValues(context, R.xml.preferences_compiler, false);
+		PreferenceManager.setDefaultValues(context, R.xml.preferences_sourcecontrol, false);
+	}
+
+	public static void registerListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
+		getPreferences().registerOnSharedPreferenceChangeListener(listener);
+	}
+
+	public static void unregisterListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
+		getPreferences().unregisterOnSharedPreferenceChangeListener(listener);
+	}
+
+	@NonNull
+	public static SharedPreferences getPreferences() {
+		if (preferences == null)
+			preferences = PreferenceManager.getDefaultSharedPreferences(Application.get().getContext());
+		return preferences;
+	}
+
+	@NonNull
+	public static SharedPreferences.Editor getEditor() {
+		return getPreferences().edit();
+	}
+
+
+	///////////////////////////////////////////////////////////////////////////
+	// Editor Preferences
+	///////////////////////////////////////////////////////////////////////////
+
+	public static boolean isUseTabs() {
+		return getPreferences().getBoolean("editor.useTabs", true);
+	}
+
+	public static int getTabSize() {
+		return getPreferences().getInt("editor.tabSize", 4);
+	}
+
+	public static int getFontSize() {
+		String value = getPreferences().getString("editor.fontSize", "16");
+		try {
+			return Integer.parseInt(value);
+		} catch (NumberFormatException e) {
+			return 16;
+		}
+	}
 
 }
diff --git a/app/src/main/java/com/apkide/ui/FileSystem.java b/app/src/main/java/com/apkide/ui/FileSystem.java
deleted file mode 100644
index cded3e3..0000000
--- a/app/src/main/java/com/apkide/ui/FileSystem.java
+++ /dev/null
@@ -1,430 +0,0 @@
-package com.apkide.ui;
-
-import android.util.Log;
-
-import com.apkide.common.IOUtils;
-import com.apkide.ui.util.JarArchiveReader;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-
-public class FileSystem {
-    private static final String TAG = "FileSystem";
-    private static final int BINARY_CHECK_BYTE_COUNT = 8000;
-    private static final JarArchiveReader jarArchiveReader = new JarArchiveReader();
-
-    public static boolean areEqualTimestamps(long time1, long time2) {
-
-        long difference = Math.abs(time1 - time2);
-        if (difference <= 1000)
-            return true;
-        if (difference % 3600000 <= 0)
-            return difference <= 13 * 3600000;
-        if ((difference - 1000) % 3600000 == 0)
-            return difference <= 13 * 3600000;
-        if ((difference + 1000) % 3600000 == 0)
-            return difference <= 13 * 3600000;
-        return false;
-    }
-
-    public static boolean isBinary(String filePath) {
-        if (isJarFileEntry(filePath))
-            return false;
-
-        long fileLength = new File(filePath).length();
-        int readCount = BINARY_CHECK_BYTE_COUNT < fileLength ? BINARY_CHECK_BYTE_COUNT : (int) fileLength;
-        try {
-            try (FileInputStream fis = new FileInputStream(filePath)) {
-                byte[] bytes = new byte[readCount];
-                new DataInputStream(fis).readFully(bytes);
-                for (byte aByte : bytes) {
-                    if (aByte == 0)
-                        return true;
-                }
-                return false;
-            }
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    public static Reader readFile(String path) throws IOException {
-        return readFile(path, null);
-    }
-
-    public static Reader readFile(String filePath, String encoding) throws IOException {
-        if (isNormalFile(filePath)) {
-            if (jarArchiveReader.isArchiveFileEntry(filePath)) {
-                Reader reader = jarArchiveReader.getArchiveEntryReader(new File(filePath).getParent(),getName(filePath), encoding);
-                return new Reader() {
-                    @Override
-                    public int read(char[] cbuf, int off, int len) throws IOException {
-                        return reader.read(cbuf, off, len);
-                    }
-
-                    @Override
-                    public void close() throws IOException {
-                        jarArchiveReader.closeArchive();
-                    }
-                };
-            }
-            return encoding == null ? new FileReader(filePath) : new InputStreamReader(new FileInputStream(filePath), encoding);
-        } else if (isJarFileEntry(filePath))
-            return readJarFileEntry(filePath, encoding);
-        throw new IOException();
-    }
-
-    public static boolean isRegexContainedInFile(String regex, String filePath) {
-        try {
-            Pattern pattern = Pattern.compile(regex);
-            try (Reader r = readFile(filePath)) {
-                BufferedReader bufferedReader = new BufferedReader(r);
-                String line;
-                while ((line = bufferedReader.readLine()) != null) {
-                    if (pattern.matcher(line).find())
-                        return true;
-                }
-                return false;
-            }
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    public static String getEnclosingJar(String path) {
-        if (isJar(path))
-            return path;
-        String parentPath = path;
-        while (true) {
-            parentPath = getParentDirPath(parentPath);
-            if (parentPath == null)
-                return null;
-            if (isJar(parentPath))
-                return parentPath;
-        }
-    }
-
-    public static boolean isJar(String path) {
-        return new File(path).isFile() && (path.endsWith(".jar") || path.endsWith(".zip"));
-    }
-
-    private static Reader readJarFileEntry(String filePath, String encoding) throws IOException {
-        String jarFilepath = getEnclosingJar(filePath);
-        String entryPath = getJarFileEntryRelativePath(filePath);
-        Reader reader = jarArchiveReader.getArchiveEntryReader(jarFilepath, entryPath, encoding);
-        return new Reader() {
-            @Override
-            public int read(char[] cbuf, int off, int len) throws IOException {
-                return reader.read(cbuf, off, len);
-            }
-
-            @Override
-            public void close() throws IOException {
-                jarArchiveReader.closeArchive();
-            }
-        };
-    }
-
-    public static String getJarFileEntryRelativePath(String path) {
-        String jarFilepath = getEnclosingJar(path);
-        assert jarFilepath != null;
-        if (jarFilepath.length() == path.length())
-            return "";
-        return path.substring(jarFilepath.length() + 1);
-    }
-
-    private static String readFully(Reader reader) throws IOException {
-        return IOUtils.readString(reader);
-    }
-
-    public static void writeFile(String filePath, Reader content) throws IOException {
-        FileWriter writer = new FileWriter(filePath, false);
-        IOUtils.writeString(writer,readFully(content),true);
-    }
-
-    public static boolean isRoot(String path) {
-        return path.equals("/");
-    }
-
-    public static String getParentDirPath(String path) {
-        if (path.length() == 0)
-            return null;
-        if (path.equals("/"))
-            return null;
-        int index = path.lastIndexOf('/');
-        if (index == 0)
-            return "/";
-        else if (index == -1)
-            return null;
-        return path.substring(0, index);
-    }
-
-    public static String getName(String path) {
-        return path.substring(path.lastIndexOf('/') + 1);
-    }
-
-    public static boolean exists(String path) {
-        return new File(path).exists() || isJarFileEntry(path);
-    }
-
-    public static boolean isJarFileEntry(String path) {
-        String jarPath = getEnclosingJar(path);
-        return jarPath != null && jarArchiveReader.isArchiveFileEntry(path);
-    }
-
-    public static boolean isJarDirectoryEntry(String path) {
-        String jarPath = getEnclosingJar(path);
-        return jarPath != null && !jarArchiveReader.isArchiveFileEntry(path);
-    }
-
-    public static boolean isJarEntry(String path) {
-        String jarPath = getEnclosingJar(path);
-        return jarPath != null;
-    }
-
-    public static boolean isDirectory(String path) {
-        return isNormalDirectory(path) || isJarDirectoryEntry(path);
-    }
-
-    public static boolean isNormalDirectory(String path) {
-        return new File(path).isDirectory();
-    }
-
-    public static boolean isNormalFile(String path) {
-        return new File(path).isFile() && !isJar(path);
-    }
-
-    public static boolean isFile(String path) {
-        return (isNormalFile(path) || isJarFileEntry(path)) && !isJar(path);
-    }
-
-    public static List<String> getChildEntries(String dirPath) {
-        if (isJarEntry(dirPath)) {
-            String jarFilepath = getEnclosingJar(dirPath);
-            String entryPath = getJarFileEntryRelativePath(dirPath);
-            List<String> entries = null;
-            try {
-                entries = jarArchiveReader.getArchiveDirectoryEntries(jarFilepath, entryPath);
-            } catch (IOException ignored) {
-
-            }
-            if (entries == null)
-                return new ArrayList<>();
-            return entries;
-        } else {
-            String[] entries = new File(dirPath).list();
-            if (entries == null)
-                return new ArrayList<>();
-            String[] paths = new String[entries.length];
-            String prefix = dirPath.equals("/") ? "/" : dirPath + File.separator;
-            for (int i = 0; i < paths.length; i++) {
-                paths[i] = prefix + entries[i];
-            }
-            return Arrays.asList(paths);
-        }
-    }
-
-    public static String getRelativePath(String parentPath, String filePath) {
-        if (parentPath.equals(filePath))
-            return "";
-        return filePath.substring(parentPath.length() + 1);
-    }
-
-    public static boolean isContained(String path, String entryPath) {
-        return entryPath != null && (entryPath.equals(path) || entryPath.startsWith(path + "/"));
-    }
-
-    public static String getFilePathAfterRename(String filePath, String oldPath, String newPath) {
-        return newPath + filePath.substring(oldPath.length());
-    }
-
-    public static void rename(String path, String newPath) throws IOException {
-        File newFile = new File(newPath);
-        if (newFile.exists())
-            throw new IOException(newPath + " already exists");
-        if (!new File(path).renameTo(newFile))
-            throw new IOException(path + " could not be renamed");
-    }
-
-    public static void createDir(String path) throws IOException {
-        if (!new File(path).mkdir()){
-            if (!new File(path).mkdirs()) {
-                throw new IOException(path + " could not be created");
-            }
-        }
-    }
-
-    public static void createFile(String path) throws IOException {
-        if (new File(path).exists())
-            throw new IOException(path + " already exists");
-        new File(path).createNewFile();
-    }
-
-    public static void createFile(String path, String content) throws IOException {
-        if (new File(path).exists())
-            throw new IOException(path + " already exists");
-        FileWriter writer = new FileWriter(path);
-        writer.write(content);
-        writer.close();
-    }
-
-    public static void delete(String path) throws IOException {
-        delete(new File(path));
-    }
-
-    private static void delete(File file) throws IOException {
-        if (file.isDirectory()) {
-            String[] children = file.list();
-            if (children != null) {
-                for (String child : children)
-                    delete(new File(file, child));
-            }
-        }
-        if (!file.delete())
-            throw new IOException(file.getPath() + " could not be deleted");
-    }
-
-    public static boolean mkdirs(String dirPath) {
-        return new File(dirPath).mkdirs();
-    }
-
-    public static long getLastModified(String filePath) {
-        return new File(filePath).lastModified();
-    }
-
-    public static long getLength(String filePath) {
-        return new File(filePath).length();
-    }
-
-    public static String getExtension(String filePath) {
-        String filename = getName(filePath);
-        int i = filename.lastIndexOf('.');
-        if (i < 0)
-            return "";
-        return filename.substring(i);
-    }
-
-    public static String tryMakeRelative(String rootPath, String path) {
-        if (isContained(rootPath, path))
-            return path.substring(rootPath.length() + 1);
-        else
-            return path;
-    }
-
-    public static String resolvePath(String rootPath, String relativeOrAbsolutePath) {
-        String res = resolvePath0(rootPath, relativeOrAbsolutePath);
-        Log.d(TAG,"Resolved (" + rootPath + ", " + relativeOrAbsolutePath + ") to " + res);
-        return res;
-    }
-
-    private static String resolvePath0(String rootPath, String relativeOrAbsolutePath) {
-        String relPath = relativeOrAbsolutePath;
-        relPath = relPath.replace("\\\\", "/");
-        relPath = relPath.replace("\\", "/");
-        if (!relPath.contains("/"))
-            return rootPath + "/" + relPath;
-
-        if (relPath.startsWith("/"))
-            relPath = ".." + relPath;
-
-        String tryRelative = getCanonicalPathPreservingSymlinks(new File(rootPath, relPath));
-        if (new File(tryRelative).exists())
-            return tryRelative;
-        return relativeOrAbsolutePath;
-    }
-
-    public static String getCanonicalPathPreservingSymlinks(File f) {
-        List<String> canonicalPathComponents = new ArrayList<>();
-        String absolutePath = f.getAbsolutePath();
-        String[] absPathComponents = absolutePath.split("[/\\\\]");
-        for (String absPathComponent : absPathComponents) {
-            if (absPathComponent.length() != 0 && !".".equals(absPathComponent)) {
-                if ("..".equals(absPathComponent)) {
-                    if (canonicalPathComponents.isEmpty()) {
-                        return absolutePath;
-                    } else
-                        canonicalPathComponents.remove(canonicalPathComponents.size() - 1);
-                } else
-                    canonicalPathComponents.add(absPathComponent);
-            }
-        }
-        StringBuilder resBuilder = new StringBuilder();
-        for (String canonicalPathComponent : canonicalPathComponents) {
-            resBuilder.append("/");
-            resBuilder.append(canonicalPathComponent);
-        }
-        if (absolutePath.endsWith("/")) resBuilder.append("/");
-        return resBuilder.toString();
-    }
-
-
-    public static String getEnclosingDir(String path, String dirName) {
-        path = getParentDirPath(path);
-        while (path != null) {
-            if (getName(path).equals(dirName))
-                return path;
-            path = getParentDirPath(path);
-        }
-        return null;
-    }
-
-    public static boolean isValidFilePath(String path) {
-        return path.startsWith("/") && isNormalDirectory(getParentDirPath(path));
-    }
-
-    public static int getContainedFileCount(String path, int maxCount, String... suffixes) {
-        if (isNormalDirectory(path)) {
-            int count = 0;
-            List<String> entries;
-            entries = getChildEntries(path);
-            for (String childPath : entries) {
-                count += getContainedFileCount(childPath, maxCount, suffixes);
-                if (count >= maxCount)
-                    return count;
-            }
-            return count;
-        } else if (isNormalFile(path)) {
-            for (String suffix : suffixes) {
-                if (path.endsWith(suffix))
-                    return 1;
-            }
-            return 0;
-        } else {
-            return 0;
-        }
-    }
-
-    public static void extractZipFile(InputStream zipIn, String targetPath) throws IOException {
-        ZipInputStream zipStream = new ZipInputStream(zipIn);
-        ZipEntry entry;
-        while ((entry = zipStream.getNextEntry()) != null) {
-            String entryPath = entry.getName();
-            String entryTargetPath = targetPath + File.separator + entryPath;
-            if (entry.isDirectory()) {
-                new File(entryTargetPath).mkdirs();
-            } else if (!new File(entryTargetPath).isFile()) {
-                new File(entryTargetPath).getParentFile().mkdirs();
-                FileOutputStream fileOut = new FileOutputStream(entryTargetPath);
-                IOUtils.copyBytes(zipStream,fileOut);
-                fileOut.close();
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/apkide/ui/IDEApplication.java b/app/src/main/java/com/apkide/ui/IDEApplication.java
index 70aa162..b8888f1 100644
--- a/app/src/main/java/com/apkide/ui/IDEApplication.java
+++ b/app/src/main/java/com/apkide/ui/IDEApplication.java
@@ -1,10 +1,128 @@
 package com.apkide.ui;
 
+import static com.apkide.common.io.IOUtils.copyBytes;
+import static com.apkide.common.io.IOUtils.safeClose;
+import static java.io.File.separator;
+
+import android.content.Context;
+import android.os.Build;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
 import androidx.multidex.MultiDexApplication;
 
+import com.apkide.common.FileSystem;
+import com.apkide.common.SafeRunner;
+import com.apkide.common.app.AppLog;
+import com.apkide.common.app.Application;
+import com.apkide.common.io.FileUtils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+
+
 public class IDEApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        Application.set(new Application() {
+
+            @NonNull
+            @Override
+            public File foundBinary(@NonNull String binaryName) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    String binaryPath = getContext().getApplicationInfo().nativeLibraryDir
+                            + separator + "lib" + binaryName + ".so";
+                    AppLog.s(String.format("%s binary file found.", binaryPath));
+                    return new File(binaryPath);
+                }
+                String targetName = FileUtils.getFileName(binaryName);
+                String arch = "";
+                String[] abis=Build.SUPPORTED_ABIS;
+                label:
+                for (String abi : abis) {
+                    switch (abi) {
+                        case "armeabi-v7a":
+                            arch = "arm";
+                            break label;
+                        case "arm64-v8a":
+                            arch = "arm64";
+                            break label;
+                        case "x86":
+                        case "x86_64":
+                            arch = "x86";
+                            break label;
+                    }
+                }
+
+                File targetFile = new File(getContext().getFilesDir(), targetName);
+                if (TextUtils.isEmpty(arch)) {
+                    AppLog.e(String.format("Unsupported processor architecture %s.",
+                            Arrays.toString(abis)));
+                    return targetFile;
+                }
+
+                if (targetFile.exists()) {
+                    AppLog.s(String.format("%s binary file found.", targetFile.getAbsolutePath()));
+                    return FileUtils.setExecutable(targetFile);
+                }
+
+                String fullFileName = "bin" + separator + arch + separator + binaryName;
+
+                AppLog.s(String.format("Extract binary file %s to %s from assets.", fullFileName, targetFile.getAbsolutePath()));
+                SafeRunner.run(() -> {
+                    FileSystem.createFile(targetFile.getAbsolutePath());
+                    InputStream inputStream = getContext().getAssets().open(fullFileName);
+                    FileOutputStream outputStream = new FileOutputStream(targetFile);
+                    copyBytes(inputStream, outputStream);
+                    safeClose(inputStream, outputStream);
+                });
+
+                AppLog.s(String.format("%s binary found.", targetFile.getAbsolutePath()));
+                return FileUtils.setExecutable(targetFile);
+            }
+
+            @NonNull
+            @Override
+            public File foundFile(@NonNull String fileName) {
+                String targetName = FileUtils.getFileName(fileName);
+                File targetFile = new File(getContext().getFilesDir(), targetName);
+                if (targetFile.exists()) {
+                    AppLog.s(String.format("%s file found.", targetFile.getAbsolutePath()));
+                    return targetFile;
+                }
+
+                AppLog.s(String.format("Extract file %s to %s.",
+                        fileName, targetFile.getAbsolutePath()));
+                SafeRunner.run(() -> {
+                    InputStream inputStream = getContext().getAssets().open(fileName);
+                    if (inputStream == null)
+                        inputStream = this.getClass().getResourceAsStream(fileName);
+                    if (inputStream != null) {
+                        FileOutputStream outputStream = new FileOutputStream(targetFile);
+                        copyBytes(inputStream, outputStream);
+                        safeClose(inputStream, outputStream);
+                    }
+                });
+
+                return targetFile;
+            }
+
+            @NonNull
+            @Override
+            public File getTempDirectory() {
+                return getApplicationContext().getExternalFilesDir(".temp");
+            }
+
+            @NonNull
+            @Override
+            public Context getContext() {
+                return getApplicationContext();
+            }
+        });
+
+        AppPreferences.init(getApplicationContext());
     }
 }
diff --git a/app/src/main/java/com/apkide/ui/IDEEditor.java b/app/src/main/java/com/apkide/ui/IDEEditor.java
index 71d7e4b..c17a510 100644
--- a/app/src/main/java/com/apkide/ui/IDEEditor.java
+++ b/app/src/main/java/com/apkide/ui/IDEEditor.java
@@ -1,186 +1,88 @@
 package com.apkide.ui;
 
+import static com.apkide.ui.AppCommands.ShortcutKeyCommand;
+
 import android.content.Context;
 import android.util.AttributeSet;
 
-import androidx.annotation.NonNull;
-
-import com.apkide.common.AppLog;
-import com.apkide.common.FileHighlights;
-import com.apkide.common.IOUtils;
-import com.apkide.common.KeyStroke;
-import com.apkide.common.KeyStrokeDetector;
-import com.apkide.ui.services.file.OpenFileModel;
+import com.apkide.common.keybinding.KeyStroke;
+import com.apkide.common.keybinding.KeyStrokeDetector;
+import com.apkide.ui.services.file.OpenFileService.OpenFileModel;
 import com.apkide.ui.views.CodeEditText;
-import com.apkide.ui.views.KeyStrokeCommand;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
 import java.util.List;
 
 public class IDEEditor extends CodeEditText {
-    public IDEEditor(Context context) {
-        super(context);
-        initView();
-    }
-
-    public IDEEditor(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView();
-    }
-
-    public IDEEditor(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        initView();
-    }
-
-    private void initView() {
-
-    }
-
-    public void makeCaretVisible() {
-        getScrollView().scrollToCaretVisible();
-    }
-
-    @Override
-    protected void onKeyStroke() {
-        getScrollView().updateCaret();
-    }
-
-    @Override
-    protected List<KeyStroke> foundKeys(KeyStrokeCommand command) {
-        return App.getKeyBindingService().getKeys(command);
-    }
-
-    @Override
-    public KeyStrokeDetector getKeyStrokeDetector() {
-        return App.getMainUI().getKeyStrokeDetector();
-    }
-
-    public IDEEditorModel getEditorModel() {
-        return (IDEEditorModel) getEditorView().getCodeEditTextEditorModel();
-    }
-
-    public IDEEditorPager getEditorPager() {
-        return App.getMainUI().getEditorPager();
-    }
-
-    public int getIndentation(int line) {
-        return getEditorModel().getIndentation(line);
-    }
-
-    public OpenFileModel openFile(String filePath) {
-        OpenFileModel openFileModel = null;//TODO:// Cache opened file;
-        if (openFileModel == null) {
-            openFileModel = createFileModel(filePath);
-        }
-        getEditorView().setModel((IDEEditorModel) openFileModel);
-        getEditorView().setEditable(true);
-        return openFileModel;
-    }
-
-    public OpenFileModel createFileModel(String filePath) {
-        try {
-            return new IDEEditorModel(filePath);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    public class IDEEditorModel extends CodeEditTextEditorModel implements OpenFileModel {
-
-        private final String myFilePath;
-        private long myLastModified;
-
-
-        public IDEEditorModel(String filePath) throws IOException {
-            super(FileSystem.readFile(filePath));
-            myFilePath = filePath;
-            myLastModified = FileSystem.getLastModified(filePath);
-        }
-
-        @Override
-        public void highlighting(FileHighlights highlights) {
-            highlighting(highlights.kinds,
-                    highlights.startLines,
-                    highlights.startColumns,
-                    highlights.endLines,
-                    highlights.endColumns,
-                    highlights.size);
-
-        }
-
-        @Override
-        public void semanticHighlighting(FileHighlights highlights) {
-            semanticHighlighting(highlights.kinds,
-                    highlights.startLines,
-                    highlights.startColumns,
-                    highlights.endLines,
-                    highlights.endColumns,
-                    highlights.size);
-        }
-
-        @NonNull
-        @Override
-        public List<String> getContents() {
-            List<String> list = new ArrayList<>(getLineCount());
-            try {
-                BufferedReader reader = new BufferedReader(getReader());
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    list.add(line);
-                }
-            } catch (IOException e) {
-                AppLog.e(e);
-            }
-            return list;
-        }
-
-        @NonNull
-        public String getFilePath() {
-            return myFilePath;
-        }
-
-        @Override
-        public void close() {
-
-        }
-
-        private String getText(int startLine, int startColumn, int endLine, int endColumn) {
-            Reader reader = getReader(startLine, startColumn, endLine, endColumn);
-            String text = "";
-            try {
-                text = IOUtils.readString(reader, true);
-            } catch (IOException e) {
-                AppLog.e(e);
-            }
-            return text;
-        }
-
-        public int getIndentation(int line) {
-            line--;
-            if (line < 0) {
-                return 0;
-            }
-            int indent = 0;
-            int length = getLineLength(line);
-            for (int column = 0; column < length; column++) {
-                char c = getChar(line, column);
-                if (c == '\t') {
-                    int tabSize = getTabSize();
-                    indent = ((indent + tabSize) / tabSize) * tabSize;
-                } else if (c != ' ') {
-                    return indent;
-                } else {
-                    indent++;
-                }
-            }
-            return indent;
-        }
-
-
-    }
+	public IDEEditor(Context context) {
+		super(context);
+		initView();
+	}
+
+	public IDEEditor(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public IDEEditor(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+
+	}
+
+
+	public void makeCaretVisible() {
+		getScrollView().scrollToCaretVisible();
+	}
+
+	@Override
+	protected void onKeyStroke() {
+		getScrollView().updateCaret();
+	}
+
+	@Override
+	protected List<KeyStroke> foundKeys(ShortcutKeyCommand command) {
+		return App.getKeyBindingService().getKeys(command);
+	}
+
+	@Override
+	public KeyStrokeDetector getKeyStrokeDetector() {
+		return App.getMainUI().getKeyStrokeDetector();
+	}
+
+	public IDEEditorModel getEditorModel() {
+		return (IDEEditorModel) getEditorView().getCodeEditTextEditorModel();
+	}
+
+	public IDEEditorPager getEditorPager() {
+		return App.getMainUI().getEditorPager();
+	}
+
+	public int getIndentation(int line) {
+		return getEditorModel().getIndentation(line);
+	}
+
+	public OpenFileModel openFile(String filePath) {
+		OpenFileModel openFileModel = App.getOpenFileService().getFileModel(filePath);
+		if (openFileModel == null) {
+			openFileModel = createFileModel(filePath);
+		}
+		getEditorView().setModel((IDEEditorModel) openFileModel);
+		getEditorView().setEditable(true);
+		requestLayout();
+		return openFileModel;
+	}
+
+	public OpenFileModel createFileModel(String filePath) {
+		try {
+			return new IDEEditorModel(this, filePath);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+
 }
diff --git a/app/src/main/java/com/apkide/ui/IDEEditorModel.java b/app/src/main/java/com/apkide/ui/IDEEditorModel.java
new file mode 100644
index 0000000..7d51e74
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/IDEEditorModel.java
@@ -0,0 +1,97 @@
+package com.apkide.ui;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.common.FileHighlights;
+import com.apkide.common.FileSystem;
+import com.apkide.common.app.AppLog;
+import com.apkide.common.io.IOUtils;
+import com.apkide.ui.services.file.OpenFileService;
+import com.apkide.ui.views.CodeEditTextEditorModel;
+
+import java.io.IOException;
+import java.io.Reader;
+
+public class IDEEditorModel extends CodeEditTextEditorModel implements OpenFileService.OpenFileModel {
+
+	private final IDEEditor myEditor;
+	private final String myFilePath;
+
+
+	public IDEEditorModel(IDEEditor editor, String filePath) throws IOException {
+		super(editor, FileSystem.readFile(filePath));
+		myEditor = editor;
+		myFilePath = filePath;
+	}
+
+	@Override
+	public void highlighting(FileHighlights highlights) {
+		highlighting(highlights.kinds,
+				highlights.startLines,
+				highlights.startColumns,
+				highlights.endLines,
+				highlights.endColumns,
+				highlights.size);
+
+	}
+
+	@Override
+	public void semanticHighlighting(FileHighlights highlights) {
+		semanticHighlighting(highlights.kinds,
+				highlights.startLines,
+				highlights.startColumns,
+				highlights.endLines,
+				highlights.endColumns,
+				highlights.size);
+	}
+
+	@NonNull
+	public String getFilePath() {
+		return myFilePath;
+	}
+
+	@Override
+	public long getLastModified() {
+		return 0;
+	}
+
+	@Override
+	public void close() {
+
+	}
+
+	@NonNull
+	private String getText(int startLine, int startColumn, int endLine, int endColumn) {
+		Reader reader = getReader(startLine, startColumn, endLine, endColumn);
+		String text = "";
+		try {
+			text = IOUtils.readString(reader, true);
+		} catch (IOException e) {
+			AppLog.e(e);
+		}
+		return text;
+	}
+
+	public int getIndentation(int line) {
+		line--;
+		if (line < 0) {
+			return 0;
+		}
+		int indent = 0;
+		int length = getLineLength(line);
+		for (int column = 0; column < length; column++) {
+			char c = getChar(line, column);
+			if (c == '\t') {
+				int tabSize = myEditor.getTabSize();
+				indent = ((indent + tabSize) / tabSize) * tabSize;
+			} else if (c != ' ') {
+				return indent;
+			} else {
+				indent++;
+			}
+		}
+		return indent;
+	}
+
+
+}
diff --git a/app/src/main/java/com/apkide/ui/IDEEditorPager.java b/app/src/main/java/com/apkide/ui/IDEEditorPager.java
index 4de1535..03c2e68 100644
--- a/app/src/main/java/com/apkide/ui/IDEEditorPager.java
+++ b/app/src/main/java/com/apkide/ui/IDEEditorPager.java
@@ -16,150 +16,177 @@
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.apkide.ui.services.file.OpenFileModel;
-import com.apkide.ui.services.file.OpenFileProvider;
+import com.apkide.ui.services.file.OpenFileService;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-public class IDEEditorPager extends ViewPager implements OpenFileProvider {
-    public IDEEditorPager(@NonNull Context context) {
-        super(context);
-        initView();
-    }
-
-    public IDEEditorPager(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        initView();
-    }
-
-    private final List<View> myViews = new ArrayList<>();
-
-    private void initView() {
-        try {
-            Field declaredField = requireNonNull(getClass().getSuperclass()).getDeclaredField("mTouchSlop");
-            declaredField.setAccessible(true);
-            declaredField.setInt(this, 15);
-        } catch (Exception ignored) {
-        }
-
-        setPageMargin((int) getContext().getResources().getDisplayMetrics().density);
-        setPageMarginDrawable(new ColorDrawable(getContext().getColor(R.color.colorSecondaryVariant)));
-
-        setAdapter(new PagerAdapter() {
-            @Override
-            public int getCount() {
-                return myViews.size();
-            }
-
-            @Override
-            public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-                return view.equals(object);
-            }
-
-            @NonNull
-            @Override
-            public Object instantiateItem(@NonNull ViewGroup container, int position) {
-                View view = myViews.get(position);
-                container.addView(view);
-                return view;
-            }
-
-            @Override
-            public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-                container.removeView((View) object);
-            }
-
-            private int index = -1;
-
-            @Override
-            public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-                super.setPrimaryItem(container, position, object);
-                if (this.index != position) {
-                    this.index = position;
-                }
-            }
-
-        });
-    }
-
-    public int getEditorCount() {
-        return myViews.size();
-    }
-
-    public IDEEditor getCurrentEditor() {
-        int currentItem = getCurrentItem();
-        if (currentItem < 0) {
-            return null;
-        }
-        return getEditor(currentItem);
-    }
-
-    public IDEEditor getEditor(int index) {
-        if (index < 0 || index >= myViews.size()) {
-            return null;
-        }
-        return myViews.get(index).findViewById(R.id.editorComponent);
-    }
-
-    public List<IDEEditor> getEditors() {
-        List<IDEEditor> editors = new ArrayList<>(myViews.size());
-        for (int i = 0; i < myViews.size(); i++) {
-            editors.add(getEditor(i));
-        }
-        return editors;
-    }
-
-    @SuppressLint("InflateParams")
-    @Override
-    public OpenFileModel openFile(String filePath) {
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.editor, null);
-        IDEEditor editor = view.findViewById(R.id.editorComponent);
-        OpenFileModel fileModel=  editor.openFile(filePath);
-        myViews.add(view);
-        requireNonNull(getAdapter()).notifyDataSetChanged();
-        requestLayout();
-        return fileModel;
-    }
-
-    @Override
-    public OpenFileModel closeFile(String filePath) {
-
-        return null;
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (isMouseButtonEvent(ev)){
-            return false;
-        }
-        if (ev.getAction() == 0 && getCurrentEditor() != null &&
-                getCurrentEditor().isTouchEventInsideHandle(ev)) {
-            return false;
-        }
-
-        return super.onInterceptTouchEvent(ev);
-    }
-
-    private boolean isMouseButtonEvent(MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_DOWN ||
-                event.getAction() == MotionEvent.ACTION_CANCEL ||
-                event.getAction() == MotionEvent.ACTION_MOVE) {
-            if (event.getButtonState() == 0) {
-                return true;
-            }
-        }
-
-        if (event.getToolType(0) == 3) {
-            return true;
-        }
-        switch (event.getSource()) {
-            case 8194:
-            case 1048584:
-                return true;
-            default:
-                return false;
-        }
-    }
+public class IDEEditorPager extends ViewPager implements OpenFileService.OpenFileEditor {
+	public IDEEditorPager(@NonNull Context context) {
+		super(context);
+		initView();
+	}
+
+	public IDEEditorPager(@NonNull Context context, @Nullable AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	private final List<View> myViews = new ArrayList<>();
+
+	private void initView() {
+		try {
+			Field declaredField = requireNonNull(getClass().getSuperclass()).getDeclaredField("mTouchSlop");
+			declaredField.setAccessible(true);
+			declaredField.setInt(this, 15);
+		} catch (Exception ignored) {
+		}
+
+		setPageMargin((int) getContext().getResources().getDisplayMetrics().density);
+		setPageMarginDrawable(new ColorDrawable(getContext().getColor(R.color.colorSecondaryVariant)));
+
+		setAdapter(new PagerAdapter() {
+			@Override
+			public int getCount() {
+				return myViews.size();
+			}
+
+			@Override
+			public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+				return view.equals(object);
+			}
+
+			@NonNull
+			@Override
+			public Object instantiateItem(@NonNull ViewGroup container, int position) {
+				View view = myViews.get(position);
+				container.addView(view);
+				return view;
+			}
+
+			@Override
+			public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+				container.removeView((View) object);
+			}
+
+			private int index = -1;
+
+			@Override
+			public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+				super.setPrimaryItem(container, position, object);
+				if (this.index != position) {
+					this.index = position;
+				}
+			}
+
+		});
+		App.getOpenFileService().setFileEditor(this);
+	}
+
+	public int getEditorCount() {
+		return myViews.size();
+	}
+
+	public IDEEditor getCurrentEditor() {
+		int currentItem = getCurrentItem();
+		if (currentItem < 0) {
+			return null;
+		}
+		return getEditor(currentItem);
+	}
+
+	public IDEEditor getEditor(int index) {
+		if (index < 0 || index >= myViews.size()) {
+			return null;
+		}
+		return myViews.get(index).findViewById(R.id.editorComponent);
+	}
+
+	public List<IDEEditor> getEditors() {
+		List<IDEEditor> editors = new ArrayList<>(myViews.size());
+		for (int i = 0; i < myViews.size(); i++) {
+			editors.add(getEditor(i));
+		}
+		return editors;
+	}
+
+	private int foundEditor(String filePath) {
+		for (int i = 0; i < myViews.size(); i++) {
+			if (getEditor(i).getEditorModel().getFilePath().equals(filePath)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+
+
+	@SuppressLint("InflateParams")
+	@Override
+	public OpenFileService.OpenFileModel openFile(String filePath) {
+		for (IDEEditor editor : getEditors()) {
+			if (editor.getEditorModel().getFilePath().equals(filePath)) {
+				int index = foundEditor(filePath);
+				setCurrentItem(index);
+				return editor.getEditorModel();
+			}
+		}
+		View view = LayoutInflater.from(getContext()).inflate(R.layout.editor, null);
+		IDEEditor editor = view.findViewById(R.id.editorComponent);
+		OpenFileService.OpenFileModel model = editor.openFile(filePath);
+		myViews.add(view);
+		requireNonNull(getAdapter()).notifyDataSetChanged();
+		requestLayout();
+		postDelayed(() -> {
+			editor.makeCaretVisible();
+			editor.getEditorView().redraw();
+		}, 50L);
+		return model;
+	}
+
+	@Override
+	public void openEditor(String filePath) {
+		int index = foundEditor(filePath);
+		setCurrentItem(index);
+	}
+
+	@Override
+	public void closeFile(String filePath) {
+		List<IDEEditor> editors = getEditors();
+		for (int i = 0; i < editors.size(); i++) {
+			if (editors.get(i).getEditorModel().getFilePath().equals(filePath)) {
+				myViews.remove(i);
+				requireNonNull(getAdapter()).notifyDataSetChanged();
+				requestLayout();
+				return;
+			}
+		}
+	}
+
+	@Override
+	public String getVisibleFile() {
+		if (getCurrentEditor() != null)
+			return getCurrentEditor().getEditorModel().getFilePath();
+		return null;
+	}
+
+	@Override
+	public OpenFileService.OpenFileModel getFile(String filePath) {
+		for (IDEEditor editor : getEditors()) {
+			if (editor.getEditorModel().getFilePath().equals(filePath)) {
+				return editor.getEditorModel();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public boolean onInterceptTouchEvent(MotionEvent ev) {
+		if (ev.getAction() == 0 && getCurrentEditor() != null &&
+				getCurrentEditor().isTouchEventInsideHandle(ev)) {
+			return false;
+		}
+
+		return super.onInterceptTouchEvent(ev);
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/IDEInitializer.java b/app/src/main/java/com/apkide/ui/IDEInitializer.java
deleted file mode 100644
index bbbbc8a..0000000
--- a/app/src/main/java/com/apkide/ui/IDEInitializer.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.apkide.ui;
-
-import static com.apkide.common.IOUtils.copyBytes;
-import static com.apkide.common.IOUtils.safeClose;
-import static java.io.File.separator;
-
-import android.annotation.SuppressLint;
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.text.TextUtils;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.apkide.common.AppLog;
-import com.apkide.common.ApplicationProvider;
-import com.apkide.common.FileUtils;
-import com.apkide.common.SafeRunner;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-
-import brut.util.OSDetection;
-
-@Keep
-public class IDEInitializer extends ContentProvider {
-    @SuppressLint("StaticFieldLeak")
-    private static Context sContext;
-
-    @Override
-    public boolean onCreate() {
-        sContext = getContext();
-        init();
-        return true;
-    }
-
-    private void init() {
-        ApplicationProvider.set(new ApplicationProvider() {
-
-            @Override
-            public File foundBinary(String binaryName) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    String binaryPath = sContext.getApplicationInfo().nativeLibraryDir
-                            + separator + "lib" + binaryName + ".so";
-                    AppLog.s(String.format("%s binary file found.", binaryPath));
-                    return new File(binaryPath);
-                }
-                String targetName = FileUtils.getFileName(binaryName);
-                String arch = "";
-                if (OSDetection.isAarch64())
-                    arch = "arm64";
-                else if (OSDetection.isAarch32())
-                    arch = "arm";
-                else if (OSDetection.isX86_64() || OSDetection.isX86())
-                    arch = "x86";
-
-                File targetFile = new File(sContext.getFilesDir(), targetName);
-                if (TextUtils.isEmpty(arch)) {
-                    AppLog.e(String.format("Unsupported processor architecture %s.", Arrays.toString(OSDetection.getArchitectures())));
-                    return null;
-                }
-
-                if (targetFile.exists()) {
-                    AppLog.s(String.format("%s binary file found.", targetFile.getAbsolutePath()));
-                    return FileUtils.setExecutable(targetFile);
-                }
-
-                String fullFileName = "bin" + separator + arch + separator + binaryName;
-
-                AppLog.s(String.format("Extract binary file %s to %s from assets.", fullFileName, targetFile.getAbsolutePath()));
-                SafeRunner.run(() -> {
-                    FileSystem.createFile(targetFile.getAbsolutePath());
-                    InputStream inputStream = sContext.getAssets().open(fullFileName);
-                    FileOutputStream outputStream = new FileOutputStream(targetFile);
-                    copyBytes(inputStream, outputStream);
-                    safeClose(inputStream, outputStream);
-                });
-
-                AppLog.s(String.format("%s binary found.", targetFile.getAbsolutePath()));
-                return FileUtils.setExecutable(targetFile);
-            }
-
-            @Override
-            public File foundFile(String fileName) {
-                String targetName = FileUtils.getFileName(fileName);
-                File targetFile = new File(sContext.getFilesDir(), targetName);
-                if (targetFile.exists()) {
-                    AppLog.s(String.format("%s file found.", targetFile.getAbsolutePath()));
-                    return targetFile;
-                }
-
-                AppLog.s(String.format("Extract file %s to %s from assets.", fileName, targetFile.getAbsolutePath()));
-                SafeRunner.run(() -> {
-                    InputStream inputStream = sContext.getAssets().open(fileName);
-                    FileOutputStream outputStream = new FileOutputStream(targetFile);
-                    copyBytes(inputStream, outputStream);
-                    safeClose(inputStream, outputStream);
-                });
-
-                return targetFile;
-            }
-
-            @Override
-            public File foundAndroidFrameworkFile() {
-                return foundFile("android.jar");
-            }
-
-            @Override
-            public File getTempDirectory() {
-                return sContext.getExternalFilesDir(".temp");
-            }
-
-            @Override
-            public Context getContext() {
-                return sContext;
-            }
-        });
-
-        AppPreferences.init(sContext);
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull Uri uri) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
-        return null;
-    }
-
-    @Override
-    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
-        return 0;
-    }
-
-    @Override
-    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
-        return 0;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/JavaHighlighting.java b/app/src/main/java/com/apkide/ui/JavaHighlighting.java
deleted file mode 100644
index ccec42c..0000000
--- a/app/src/main/java/com/apkide/ui/JavaHighlighting.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.apkide.ui;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.FileHighlights;
-import com.apkide.common.SyntaxKind;
-import com.apkide.ui.views.editor.Model;
-import com.apkide.ui.views.editor.ModelListener;
-import com.apkide.ui.views.editor.SyncRunner;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class JavaHighlighting {
-
-    private static final FileHighlights sHighlights = new FileHighlights();
-    private static final JavaLexer sLexer = new JavaLexer();
-    private static final ExecutorService sExecutor = Executors.newSingleThreadExecutor();
-    private static IDEEditor sEditor;
-    private static final SyncRunner sLexerRunner = new SyncRunner(new Runnable() {
-        @Override
-        public void run() {
-            try {
-                sHighlights.clear();
-                sLexer.reset(sEditor.getEditorModel().getReader());
-                boolean inDocComment = false;
-                int firstLine = -1;
-                int firstColumn = -1;
-                while (true) {
-                    SyntaxKind kind = sLexer.nextToken();
-                    int line = sLexer.getLine();
-                    int column = sLexer.getColumn();
-                    if (kind == SyntaxKind.DocComment) {
-                        firstLine = line;
-                        firstColumn = column;
-                        inDocComment = true;
-                    } else {
-                        if (inDocComment) {
-                            sHighlights.highlight(SyntaxKind.DocComment, firstLine, firstColumn, line, column);
-                            inDocComment = false;
-                        }
-                    }
-
-                    int endColumn = column + sLexer.yylength();
-                    if (kind == null) break;
-                    sHighlights.highlight(kind, line, column, line, endColumn);
-                }
-                sEditor.getEditorModel().highlighting(sHighlights);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    });
-
-    public static void setEditor(IDEEditor editor) {
-        sEditor = editor;
-        sExecutor.execute(sLexerRunner::run);
-
-        sEditor.getEditorModel().addModelListener(new ModelListener() {
-            @Override
-            public void insertUpdate(@NonNull Model model, int startLine, int startColumn, int endLine, int endColumn) {
-                sExecutor.execute(sLexerRunner::run);
-            }
-
-            @Override
-            public void removeUpdate(@NonNull Model model, int startLine, int startColumn, int endLine, int endColumn) {
-                sExecutor.execute(sLexerRunner::run);
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/JavaLexer.java b/app/src/main/java/com/apkide/ui/JavaLexer.java
deleted file mode 100644
index 98dfeee..0000000
--- a/app/src/main/java/com/apkide/ui/JavaLexer.java
+++ /dev/null
@@ -1,1363 +0,0 @@
-// DO NOT EDIT
-// Generated by JFlex 1.9.1 http://jflex.de/
-// source: _JavaLexer.flex
-
-package com.apkide.ui;
-
-
-import static com.apkide.common.SyntaxKind.Comment;
-import static com.apkide.common.SyntaxKind.DocComment;
-import static com.apkide.common.SyntaxKind.Keyword;
-import static com.apkide.common.SyntaxKind.Literal;
-import static com.apkide.common.SyntaxKind.Operator;
-import static com.apkide.common.SyntaxKind.Plain;
-import static com.apkide.common.SyntaxKind.Separator;
-import static com.apkide.common.SyntaxKind.TypeIdentifier;
-
-import com.apkide.common.SyntaxKind;
-
-import java.io.IOException;
-import java.io.Reader;
-
-
-@SuppressWarnings("fallthrough")
-public class JavaLexer {
-
-  /** This character denotes the end of file. */
-  public static final int YYEOF = -1;
-
-  /** Initial size of the lookahead buffer. */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  // Lexical states.
-  public static final int YYINITIAL = 0;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = {
-     0, 0
-  };
-
-  /**
-   * Top-level table for translating characters to character classes
-   */
-  private static final int [] ZZ_CMAP_TOP = zzUnpackcmap_top();
-
-  private static final String ZZ_CMAP_TOP_PACKED_0 =
-    "\1\0\1\u0100\1\u0200\1\u0300\1\u0400\1\u0500\1\u0600\1\u0700"+
-    "\1\u0800\1\u0900\1\u0a00\1\u0b00\1\u0c00\1\u0d00\1\u0e00\1\u0f00"+
-    "\1\u1000\1\u0100\1\u1100\1\u1200\1\u1300\1\u0100\1\u1400\1\u1500"+
-    "\1\u1600\1\u1700\1\u1800\1\u1900\1\u1a00\1\u1b00\1\u0100\1\u1c00"+
-    "\1\u1d00\1\u1e00\12\u1f00\1\u2000\1\u2100\1\u2200\1\u1f00\1\u2300"+
-    "\1\u2400\2\u1f00\31\u0100\1\u2500\121\u0100\1\u2600\4\u0100\1\u2700"+
-    "\1\u0100\1\u2800\1\u2900\1\u2a00\1\u2b00\1\u2c00\1\u2d00\53\u0100"+
-    "\1\u2e00\10\u2f00\31\u1f00\1\u0100\1\u3000\1\u3100\1\u0100\1\u3200"+
-    "\1\u3300\1\u3400\1\u3500\1\u3600\1\u3700\1\u3800\1\u3900\1\u3a00"+
-    "\1\u0100\1\u3b00\1\u3c00\1\u3d00\1\u3e00\1\u3f00\1\u4000\1\u4100"+
-    "\1\u4200\1\u4300\1\u4400\1\u4500\1\u4600\1\u4700\1\u4800\1\u4900"+
-    "\1\u4a00\1\u4b00\1\u4c00\1\u4d00\1\u4e00\1\u1f00\1\u4f00\1\u5000"+
-    "\1\u5100\1\u5200\3\u0100\1\u5300\1\u5400\1\u5500\12\u1f00\4\u0100"+
-    "\1\u5600\17\u1f00\2\u0100\1\u5700\41\u1f00\2\u0100\1\u5800\1\u5900"+
-    "\2\u1f00\1\u5a00\1\u5b00\27\u0100\1\u5c00\4\u0100\1\u5d00\1\u5e00"+
-    "\42\u1f00\1\u0100\1\u5f00\1\u6000\11\u1f00\1\u6100\24\u1f00\1\u6200"+
-    "\1\u6300\1\u1f00\1\u6400\1\u6500\1\u6600\1\u6700\2\u1f00\1\u6800"+
-    "\5\u1f00\1\u6900\1\u6a00\1\u6b00\5\u1f00\1\u6c00\1\u6d00\2\u1f00"+
-    "\1\u6e00\1\u1f00\1\u6f00\14\u1f00\1\u7000\4\u1f00\246\u0100\1\u7100"+
-    "\20\u0100\1\u7200\1\u7300\25\u0100\1\u7400\34\u0100\1\u7500\14\u1f00"+
-    "\2\u0100\1\u7600\5\u1f00\23\u0100\1\u7700\u0aec\u1f00\1\u7800\1\u7900"+
-    "\u02fe\u1f00";
-
-  private static int [] zzUnpackcmap_top() {
-    int [] result = new int[4352];
-    int offset = 0;
-    offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackcmap_top(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /**
-   * Second-level tables for translating characters to character classes
-   */
-  private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
-
-  private static final String ZZ_CMAP_BLOCKS_PACKED_0 =
-    "\11\0\1\1\1\2\1\3\1\1\1\2\16\0\4\4"+
-    "\1\1\1\5\1\6\1\4\1\7\1\5\1\10\1\11"+
-    "\2\12\1\13\1\14\1\12\1\15\1\16\1\17\1\20"+
-    "\11\21\1\22\1\12\1\23\1\24\1\25\1\26\1\27"+
-    "\1\30\1\31\1\30\1\32\1\33\1\32\5\7\1\34"+
-    "\3\7\1\35\7\7\1\36\2\7\1\12\1\37\1\12"+
-    "\1\5\1\40\1\4\1\41\1\42\1\43\1\44\1\45"+
-    "\1\46\1\47\1\50\1\51\1\7\1\52\1\53\1\54"+
-    "\1\55\1\56\1\57\1\7\1\60\1\61\1\62\1\63"+
-    "\1\64\1\65\1\66\1\67\1\70\1\12\1\71\1\12"+
-    "\1\26\6\0\1\72\32\0\2\4\4\7\4\4\1\7"+
-    "\2\4\1\0\7\4\1\7\4\4\1\7\5\4\27\7"+
-    "\1\4\37\7\1\4\u01ca\7\4\4\14\7\16\4\5\7"+
-    "\7\4\1\7\1\4\1\7\21\4\160\0\5\7\1\4"+
-    "\2\7\2\4\4\7\1\4\1\7\6\4\1\7\1\4"+
-    "\3\7\1\4\1\7\1\4\24\7\1\4\123\7\1\4"+
-    "\213\7\1\4\5\0\2\4\246\7\1\4\46\7\2\4"+
-    "\1\7\6\4\51\7\6\4\1\7\1\4\55\0\1\4"+
-    "\1\0\1\4\2\0\1\4\2\0\1\4\1\0\10\4"+
-    "\33\7\4\4\4\7\15\4\6\0\5\4\1\7\4\4"+
-    "\13\0\1\4\1\0\3\4\53\7\37\0\4\4\2\7"+
-    "\1\0\143\7\1\4\1\7\10\0\1\4\6\0\2\7"+
-    "\2\0\1\4\4\0\2\7\12\0\3\7\2\4\1\7"+
-    "\17\4\1\0\1\7\1\0\36\7\33\0\2\4\131\7"+
-    "\13\0\1\7\16\4\12\0\41\7\11\0\2\7\4\4"+
-    "\1\7\2\4\1\0\30\7\4\0\1\7\11\0\1\7"+
-    "\3\0\1\7\5\0\22\4\31\7\3\0\4\4\13\7"+
-    "\65\4\25\7\1\4\22\7\13\4\61\0\66\7\3\0"+
-    "\1\7\22\0\1\7\7\0\12\7\2\0\2\4\12\0"+
-    "\1\4\20\7\3\0\1\4\10\7\2\4\2\7\2\4"+
-    "\26\7\1\4\7\7\1\4\1\7\3\4\4\7\2\4"+
-    "\1\0\1\7\7\0\2\4\2\0\2\4\3\0\1\7"+
-    "\10\4\1\0\4\4\2\7\1\4\3\7\2\0\2\4"+
-    "\12\0\4\7\7\4\2\7\1\4\1\0\2\4\3\0"+
-    "\1\4\6\7\4\4\2\7\2\4\26\7\1\4\7\7"+
-    "\1\4\2\7\1\4\2\7\1\4\2\7\2\4\1\0"+
-    "\1\4\5\0\4\4\2\0\2\4\3\0\3\4\1\0"+
-    "\7\4\4\7\1\4\1\7\7\4\14\0\3\7\1\0"+
-    "\13\4\3\0\1\4\11\7\1\4\3\7\1\4\26\7"+
-    "\1\4\7\7\1\4\2\7\1\4\5\7\2\4\1\0"+
-    "\1\7\10\0\1\4\3\0\1\4\3\0\2\4\1\7"+
-    "\17\4\2\7\2\0\2\4\12\0\1\4\1\7\7\4"+
-    "\1\7\6\0\1\4\3\0\1\4\10\7\2\4\2\7"+
-    "\2\4\26\7\1\4\7\7\1\4\2\7\1\4\5\7"+
-    "\2\4\1\0\1\7\7\0\2\4\2\0\2\4\3\0"+
-    "\7\4\3\0\4\4\2\7\1\4\3\7\2\0\2\4"+
-    "\12\0\1\4\1\7\20\4\1\0\1\7\1\4\6\7"+
-    "\3\4\3\7\1\4\4\7\3\4\2\7\1\4\1\7"+
-    "\1\4\2\7\3\4\2\7\3\4\3\7\3\4\14\7"+
-    "\4\4\5\0\3\4\3\0\1\4\4\0\2\4\1\7"+
-    "\6\4\1\0\16\4\12\0\11\4\1\7\6\4\5\0"+
-    "\10\7\1\4\3\7\1\4\27\7\1\4\20\7\3\4"+
-    "\1\7\7\0\1\4\3\0\1\4\4\0\7\4\2\0"+
-    "\1\4\3\7\5\4\2\7\2\0\2\4\12\0\20\4"+
-    "\1\7\3\0\1\4\10\7\1\4\3\7\1\4\27\7"+
-    "\1\4\12\7\1\4\5\7\2\4\1\0\1\7\7\0"+
-    "\1\4\3\0\1\4\4\0\7\4\2\0\7\4\1\7"+
-    "\1\4\2\7\2\0\2\4\12\0\1\4\2\7\15\4"+
-    "\4\0\11\7\1\4\3\7\1\4\51\7\2\0\1\7"+
-    "\7\0\1\4\3\0\1\4\4\0\1\7\5\4\3\7"+
-    "\1\0\7\4\3\7\2\0\2\4\12\0\12\4\6\7"+
-    "\1\4\3\0\1\4\22\7\3\4\30\7\1\4\11\7"+
-    "\1\4\1\7\2\4\7\7\3\4\1\0\4\4\6\0"+
-    "\1\4\1\0\1\4\10\0\6\4\12\0\2\4\2\0"+
-    "\15\4\60\7\1\0\2\7\7\0\4\4\10\7\10\0"+
-    "\1\4\12\0\47\4\2\7\1\4\1\7\1\4\5\7"+
-    "\1\4\30\7\1\4\1\7\1\4\12\7\1\0\2\7"+
-    "\11\0\1\7\2\4\5\7\1\4\1\7\1\4\6\0"+
-    "\2\4\12\0\2\4\4\7\40\4\1\7\27\4\2\0"+
-    "\6\4\12\0\13\4\1\0\1\4\1\0\1\4\1\0"+
-    "\4\4\2\0\10\7\1\4\44\7\4\4\24\0\1\4"+
-    "\2\0\5\7\13\0\1\4\44\0\11\4\1\0\71\4"+
-    "\53\7\24\0\1\7\12\0\6\4\6\7\4\0\4\7"+
-    "\3\0\1\7\3\0\2\7\7\0\3\7\4\0\15\7"+
-    "\14\0\1\7\17\0\2\4\46\7\1\4\1\7\5\4"+
-    "\1\7\2\4\53\7\1\4\115\7\1\4\4\7\2\4"+
-    "\7\7\1\4\1\7\1\4\4\7\2\4\51\7\1\4"+
-    "\4\7\2\4\41\7\1\4\4\7\2\4\7\7\1\4"+
-    "\1\7\1\4\4\7\2\4\17\7\1\4\71\7\1\4"+
-    "\4\7\2\4\103\7\2\4\3\0\40\4\20\7\20\4"+
-    "\126\7\2\4\6\7\3\4\u016c\7\2\4\21\7\1\4"+
-    "\32\7\5\4\113\7\3\4\13\7\7\4\15\7\1\4"+
-    "\4\7\3\0\13\4\22\7\3\0\13\4\22\7\2\0"+
-    "\14\4\15\7\1\4\3\7\1\4\2\0\14\4\64\7"+
-    "\40\0\3\4\1\7\3\4\2\7\1\0\2\4\12\0"+
-    "\41\4\4\0\1\4\12\0\6\4\131\7\7\4\5\7"+
-    "\2\0\42\7\1\0\1\7\5\4\106\7\12\4\37\7"+
-    "\1\4\14\0\4\4\14\0\12\4\12\0\36\7\2\4"+
-    "\5\7\13\4\54\7\4\4\32\7\6\4\12\0\46\4"+
-    "\27\7\5\0\4\4\65\7\12\0\1\4\35\0\2\4"+
-    "\13\0\6\4\12\0\15\4\1\7\10\4\16\0\1\4"+
-    "\2\0\77\4\5\0\57\7\21\0\7\7\4\4\12\0"+
-    "\21\4\11\0\14\4\3\0\36\7\15\0\2\7\12\0"+
-    "\54\7\16\0\14\4\44\7\24\0\10\4\12\0\3\4"+
-    "\3\7\12\0\44\7\2\4\11\7\7\4\53\7\2\4"+
-    "\3\7\20\4\3\0\1\4\25\0\4\7\1\0\6\7"+
-    "\1\0\2\7\3\0\1\7\5\4\300\7\72\0\1\4"+
-    "\5\0\26\7\2\4\6\7\2\4\46\7\2\4\6\7"+
-    "\2\4\10\7\1\4\1\7\1\4\1\7\1\4\1\7"+
-    "\1\4\37\7\2\4\65\7\1\4\7\7\1\4\1\7"+
-    "\3\4\3\7\1\4\7\7\3\4\4\7\2\4\6\7"+
-    "\4\4\15\7\5\4\3\7\1\4\7\7\16\4\5\0"+
-    "\30\4\2\3\5\0\20\4\2\7\23\4\1\7\13\4"+
-    "\5\0\1\4\12\0\1\4\1\7\15\4\1\7\20\4"+
-    "\15\7\3\4\40\7\20\4\15\0\4\4\1\0\3\4"+
-    "\14\0\21\4\1\7\4\4\1\7\2\4\12\7\1\4"+
-    "\1\7\3\4\5\7\6\4\1\7\1\4\1\7\1\4"+
-    "\1\7\1\4\4\7\1\4\13\7\2\4\4\7\5\4"+
-    "\5\7\4\4\1\7\21\4\51\7\u0177\4\57\7\1\4"+
-    "\57\7\1\4\205\7\6\4\4\7\3\0\2\7\14\4"+
-    "\46\7\1\4\1\7\5\4\1\7\2\4\70\7\7\4"+
-    "\1\7\17\4\1\0\27\7\11\4\7\7\1\4\7\7"+
-    "\1\4\7\7\1\4\7\7\1\4\7\7\1\4\7\7"+
-    "\1\4\7\7\1\4\7\7\1\4\40\0\57\4\1\7"+
-    "\325\4\3\7\31\4\11\7\6\0\1\4\5\7\2\4"+
-    "\5\7\4\4\126\7\2\4\2\0\2\4\3\7\1\4"+
-    "\132\7\1\4\4\7\5\4\53\7\1\4\136\7\21\4"+
-    "\40\7\60\4\320\7\100\4\375\7\3\4\215\7\103\4"+
-    "\56\7\2\4\15\7\3\4\20\7\12\0\2\7\24\4"+
-    "\57\7\1\0\4\4\12\0\1\4\37\7\2\0\120\7"+
-    "\2\0\45\4\11\7\2\4\147\7\2\4\65\7\2\4"+
-    "\11\7\52\4\15\7\1\0\3\7\1\0\4\7\1\0"+
-    "\27\7\5\0\4\4\1\0\13\4\1\7\7\4\64\7"+
-    "\14\4\2\0\62\7\22\0\12\4\12\0\6\4\22\0"+
-    "\6\7\3\4\1\7\1\4\2\7\13\0\34\7\10\0"+
-    "\2\4\27\7\15\0\14\4\35\7\3\4\4\0\57\7"+
-    "\16\0\16\4\1\7\12\0\6\4\5\7\1\0\12\7"+
-    "\12\0\5\7\1\4\51\7\16\0\11\4\3\7\1\0"+
-    "\10\7\2\0\2\4\12\0\6\4\27\7\3\4\1\7"+
-    "\3\0\62\7\1\0\1\7\3\0\2\7\2\0\5\7"+
-    "\2\0\1\7\1\0\1\7\30\4\3\7\2\4\13\7"+
-    "\5\0\2\4\3\7\2\0\12\4\6\7\2\4\6\7"+
-    "\2\4\6\7\11\4\7\7\1\4\7\7\1\4\53\7"+
-    "\1\4\16\7\6\4\163\7\10\0\1\4\2\0\2\4"+
-    "\12\0\6\4\244\7\14\4\27\7\4\4\61\7\4\4"+
-    "\u0100\3\156\7\2\4\152\7\46\4\7\7\14\4\5\7"+
-    "\5\4\1\7\1\0\12\7\1\4\15\7\1\4\5\7"+
-    "\1\4\1\7\1\4\2\7\1\4\2\7\1\4\154\7"+
-    "\41\4\153\7\22\4\100\7\2\4\66\7\50\4\15\7"+
-    "\3\4\20\0\20\4\20\0\3\4\2\7\30\4\3\7"+
-    "\31\4\1\7\6\4\5\7\1\4\207\7\2\4\1\0"+
-    "\4\4\1\7\13\4\12\0\7\4\32\7\4\4\1\7"+
-    "\1\4\32\7\13\4\131\7\3\4\6\7\2\4\6\7"+
-    "\2\4\6\7\2\4\3\7\3\4\2\7\3\4\2\7"+
-    "\22\4\3\0\4\4\14\7\1\4\32\7\1\4\23\7"+
-    "\1\4\2\7\1\4\17\7\2\4\16\7\42\4\173\7"+
-    "\105\4\65\7\210\4\1\0\202\4\35\7\3\4\61\7"+
-    "\17\4\1\0\37\4\40\7\15\4\36\7\5\4\46\7"+
-    "\5\0\5\4\36\7\2\4\44\7\4\4\10\7\1\4"+
-    "\5\7\52\4\236\7\2\4\12\0\6\4\44\7\4\4"+
-    "\44\7\4\4\50\7\10\4\64\7\234\4\67\7\11\4"+
-    "\26\7\12\4\10\7\230\4\6\7\2\4\1\7\1\4"+
-    "\54\7\1\4\2\7\3\4\1\7\2\4\27\7\12\4"+
-    "\27\7\11\4\37\7\101\4\23\7\1\4\2\7\12\4"+
-    "\26\7\12\4\32\7\106\4\70\7\6\4\2\7\100\4"+
-    "\1\7\3\0\1\4\2\0\5\4\4\0\4\7\1\4"+
-    "\3\7\1\4\35\7\2\4\3\0\4\4\1\0\40\4"+
-    "\35\7\3\4\35\7\43\4\10\7\1\4\34\7\2\0"+
-    "\31\4\66\7\12\4\26\7\12\4\23\7\15\4\22\7"+
-    "\156\4\111\7\67\4\63\7\15\4\63\7\15\4\44\7"+
-    "\4\0\10\4\12\0\u0146\4\52\7\1\4\2\0\3\4"+
-    "\2\7\116\4\35\7\12\4\1\7\10\4\26\7\13\0"+
-    "\137\4\25\7\33\4\27\7\11\4\3\0\65\7\17\0"+
-    "\37\4\12\0\17\4\4\0\55\7\13\0\2\4\1\0"+
-    "\17\4\1\0\2\4\31\7\7\4\12\0\6\4\3\0"+
-    "\44\7\16\0\1\4\12\0\4\4\1\7\2\0\1\7"+
-    "\10\4\43\7\1\0\2\4\1\7\11\4\3\0\60\7"+
-    "\16\0\4\7\4\4\4\0\1\4\14\0\1\7\1\4"+
-    "\1\7\43\4\22\7\1\4\31\7\14\0\6\4\1\0"+
-    "\101\4\7\7\1\4\1\7\1\4\4\7\1\4\17\7"+
-    "\1\4\12\7\7\4\57\7\14\0\5\4\12\0\6\4"+
-    "\4\0\1\4\10\7\2\4\2\7\2\4\26\7\1\4"+
-    "\7\7\1\4\2\7\1\4\5\7\1\4\2\0\1\7"+
-    "\7\0\2\4\2\0\2\4\3\0\2\4\1\7\6\4"+
-    "\1\0\5\4\5\7\2\0\2\4\7\0\3\4\5\0"+
-    "\213\4\65\7\22\0\4\7\5\4\12\0\4\4\1\0"+
-    "\3\7\36\4\60\7\24\0\2\7\1\4\1\7\10\4"+
-    "\12\0\246\4\57\7\7\0\2\4\11\0\27\4\4\7"+
-    "\2\0\42\4\60\7\21\0\3\4\1\7\13\4\12\0"+
-    "\46\4\53\7\15\0\1\7\7\4\12\0\66\4\33\7"+
-    "\2\4\17\0\4\4\12\0\306\4\54\7\17\0\145\4"+
-    "\100\7\12\0\25\4\10\7\2\4\1\7\2\4\10\7"+
-    "\1\4\2\7\1\4\30\7\6\0\1\4\2\0\2\4"+
-    "\4\0\1\7\1\0\1\7\2\0\14\4\12\0\106\4"+
-    "\10\7\2\4\47\7\7\0\2\4\7\0\1\7\1\4"+
-    "\1\7\1\0\33\4\1\7\12\0\50\7\7\0\1\7"+
-    "\4\0\10\4\1\0\10\4\1\7\13\0\56\7\20\0"+
-    "\3\4\1\7\42\4\71\7\7\4\11\7\1\4\45\7"+
-    "\10\0\1\4\10\0\1\7\17\4\12\0\30\4\36\7"+
-    "\2\4\26\0\1\4\16\0\111\4\7\7\1\4\2\7"+
-    "\1\4\46\7\6\0\3\4\1\0\1\4\2\0\1\4"+
-    "\7\0\1\7\1\0\10\4\12\0\6\4\6\7\1\4"+
-    "\2\7\1\4\40\7\5\0\1\4\2\0\1\4\5\0"+
-    "\1\7\7\4\12\0\u0136\4\23\7\4\0\271\4\1\7"+
-    "\54\4\4\7\37\4\232\7\146\4\157\7\21\4\304\7"+
-    "\274\4\57\7\1\4\11\0\307\4\107\7\271\4\71\7"+
-    "\7\4\37\7\1\4\12\0\146\4\36\7\2\4\5\0"+
-    "\13\4\60\7\7\0\11\4\4\7\14\4\12\0\11\4"+
-    "\25\7\5\4\23\7\260\4\100\7\200\4\113\7\4\4"+
-    "\1\0\1\7\67\0\7\4\4\0\15\7\100\4\2\7"+
-    "\1\4\1\7\1\0\13\4\2\0\16\4\370\7\10\4"+
-    "\326\7\52\4\11\7\367\4\37\7\61\4\3\7\21\4"+
-    "\4\7\10\4\u018c\7\4\4\153\7\5\4\15\7\3\4"+
-    "\11\7\7\4\12\7\3\4\2\0\1\4\4\0\301\4"+
-    "\5\0\3\4\26\0\2\4\7\0\36\4\4\0\224\4"+
-    "\3\0\273\4\125\7\1\4\107\7\1\4\2\7\2\4"+
-    "\1\7\2\4\2\7\2\4\4\7\1\4\14\7\1\4"+
-    "\1\7\1\4\7\7\1\4\101\7\1\4\4\7\2\4"+
-    "\10\7\1\4\7\7\1\4\34\7\1\4\4\7\1\4"+
-    "\5\7\1\4\1\7\3\4\7\7\1\4\u0154\7\2\4"+
-    "\31\7\1\4\31\7\1\4\37\7\1\4\31\7\1\4"+
-    "\37\7\1\4\31\7\1\4\37\7\1\4\31\7\1\4"+
-    "\37\7\1\4\31\7\1\4\10\7\2\4\151\0\4\4"+
-    "\62\0\10\4\1\0\16\4\1\0\26\4\5\0\1\4"+
-    "\17\0\120\4\7\0\1\4\21\0\2\4\7\0\1\4"+
-    "\2\0\1\4\5\0\325\4\55\7\3\4\7\0\7\7"+
-    "\2\4\12\0\4\4\1\7\u0171\4\54\7\16\0\5\4"+
-    "\306\7\13\4\7\0\51\4\104\7\7\0\1\7\4\4"+
-    "\12\0\u0156\4\1\7\117\4\4\7\1\4\33\7\1\4"+
-    "\2\7\1\4\1\7\2\4\1\7\1\4\12\7\1\4"+
-    "\4\7\1\4\1\7\1\4\1\7\6\4\1\7\4\4"+
-    "\1\7\1\4\1\7\1\4\1\7\1\4\3\7\1\4"+
-    "\2\7\1\4\1\7\2\4\1\7\1\4\1\7\1\4"+
-    "\1\7\1\4\1\7\1\4\1\7\1\4\2\7\1\4"+
-    "\1\7\2\4\4\7\1\4\7\7\1\4\4\7\1\4"+
-    "\4\7\1\4\1\7\1\4\12\7\1\4\21\7\5\4"+
-    "\3\7\1\4\5\7\1\4\21\7\u0134\4\12\0\6\4"+
-    "\336\7\42\4\65\7\13\4\336\7\2\4\u0182\7\16\4"+
-    "\u0131\7\37\4\36\7\342\4\113\7\266\4\1\0\36\4"+
-    "\140\0\200\4\360\0\20\4";
-
-  private static int [] zzUnpackcmap_blocks() {
-    int [] result = new int[31232];
-    int offset = 0;
-    offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackcmap_blocks(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /**
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\1\0\2\1\1\2\1\3\1\1\1\2\1\3\1\4"+
-    "\2\2\1\4\1\2\2\3\3\2\21\1\1\2\3\3"+
-    "\1\0\1\3\2\5\3\3\1\6\12\1\1\7\10\1"+
-    "\1\7\23\1\1\5\1\10\1\3\1\0\1\3\21\1"+
-    "\1\7\24\1\1\0\2\10\1\0\10\1\1\11\20\1"+
-    "\1\5\1\0\6\1\1\7\11\1\1\7\2\1\1\12"+
-    "\25\1";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[201];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /**
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\73\0\166\0\261\0\354\0\u0127\0\u0162\0\u019d"+
-    "\0\73\0\u01d8\0\u0213\0\u024e\0\u0289\0\u02c4\0\u02ff\0\u033a"+
-    "\0\u0375\0\73\0\u03b0\0\u03eb\0\u0426\0\u0461\0\u049c\0\u04d7"+
-    "\0\u0512\0\u054d\0\u0588\0\u05c3\0\u05fe\0\u0639\0\u0674\0\u06af"+
-    "\0\u06ea\0\u0725\0\u0760\0\u079b\0\73\0\u07d6\0\u0811\0\u084c"+
-    "\0\u0887\0\u08c2\0\u08fd\0\u0938\0\u0973\0\u09ae\0\u09e9\0\u0a24"+
-    "\0\u0a5f\0\u0a9a\0\u0ad5\0\u0b10\0\u0b4b\0\u0b86\0\u0bc1\0\u0bfc"+
-    "\0\u0c37\0\u0c72\0\u0cad\0\u0ce8\0\u0d23\0\u0d5e\0\u0d99\0\u0dd4"+
-    "\0\u0e0f\0\u0e4a\0\u0127\0\u0e85\0\u0ec0\0\u0efb\0\u0f36\0\u0f71"+
-    "\0\u0fac\0\u0fe7\0\u1022\0\u105d\0\u1098\0\u10d3\0\u110e\0\u1149"+
-    "\0\u1184\0\u11bf\0\u11fa\0\u1235\0\u1270\0\u12ab\0\u12e6\0\u1321"+
-    "\0\u135c\0\u1397\0\u13d2\0\u140d\0\u1448\0\u1483\0\u14be\0\u14f9"+
-    "\0\u1534\0\u156f\0\u15aa\0\u15e5\0\u1620\0\u165b\0\u1696\0\u16d1"+
-    "\0\u170c\0\u1747\0\u1782\0\u17bd\0\u17f8\0\u1833\0\u186e\0\u18a9"+
-    "\0\u18e4\0\u191f\0\u195a\0\u1995\0\u19d0\0\u1a0b\0\u1a46\0\u1a81"+
-    "\0\u1abc\0\u1af7\0\u1b32\0\u1b6d\0\u1ba8\0\u1be3\0\u1c1e\0\u1c59"+
-    "\0\u1c94\0\u1ccf\0\u1d0a\0\73\0\u1d45\0\u1d80\0\u1dbb\0\u1df6"+
-    "\0\u1e31\0\u1e6c\0\u1ea7\0\u1ee2\0\u1f1d\0\u0127\0\u1f58\0\u1f93"+
-    "\0\u1fce\0\u2009\0\u2044\0\u207f\0\u20ba\0\u20f5\0\u2130\0\u216b"+
-    "\0\u21a6\0\u21e1\0\u221c\0\u2257\0\u2292\0\u22cd\0\73\0\u2308"+
-    "\0\u2343\0\u237e\0\u23b9\0\u23f4\0\u242f\0\u246a\0\u24a5\0\u24e0"+
-    "\0\u251b\0\u2556\0\u2591\0\u25cc\0\u2607\0\u2642\0\u267d\0\u26b8"+
-    "\0\u1b6d\0\u26f3\0\u272e\0\u0127\0\u2769\0\u27a4\0\u27df\0\u281a"+
-    "\0\u2855\0\u2890\0\u28cb\0\u2906\0\u2941\0\u297c\0\u29b7\0\u29f2"+
-    "\0\u2a2d\0\u2a68\0\u2aa3\0\u2ade\0\u2b19\0\u2b54\0\u2b8f\0\u2bca"+
-    "\0\u2c05";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[201];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length() - 1;
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /**
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpacktrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\2\2\3\1\0\1\2\1\4\1\5\1\6\1\7"+
-    "\1\10\1\11\1\4\1\12\1\13\1\14\1\15\1\16"+
-    "\1\17\1\20\1\21\1\4\2\22\1\23\7\6\1\2"+
-    "\1\6\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+
-    "\1\6\1\33\1\6\1\34\1\6\1\35\1\6\1\36"+
-    "\1\37\1\40\1\41\1\6\1\42\1\43\3\6\1\44"+
-    "\75\0\2\3\114\0\1\22\46\0\2\5\1\0\3\5"+
-    "\1\45\30\5\1\46\33\5\1\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\31\6\1\0\1\6\10\0"+
-    "\1\22\13\0\1\22\46\0\2\10\1\0\6\10\1\45"+
-    "\25\10\1\47\33\10\14\0\1\22\7\0\1\22\63\0"+
-    "\1\22\6\0\2\22\63\0\1\50\1\0\2\51\64\0"+
-    "\1\52\3\0\1\53\4\0\1\22\64\0\1\51\1\0"+
-    "\2\17\7\0\1\54\1\45\1\55\1\45\1\0\1\56"+
-    "\1\0\1\17\1\0\1\54\1\0\1\45\1\55\1\45"+
-    "\4\0\1\45\12\0\1\56\22\0\1\51\1\0\2\17"+
-    "\10\0\1\45\1\55\1\45\3\0\1\17\3\0\1\45"+
-    "\1\55\1\45\4\0\1\45\41\0\1\22\73\0\1\4"+
-    "\1\22\55\0\1\57\20\0\7\57\1\0\31\57\2\0"+
-    "\1\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\2\6\1\60\16\6\1\61\7\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\62"+
-    "\1\6\1\63\6\6\1\64\1\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\65"+
-    "\6\6\1\66\2\6\1\67\2\6\1\70\12\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\5\6\1\71\10\6\1\72\12\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\13\6\1\73"+
-    "\1\6\1\74\10\6\1\75\2\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\76"+
-    "\7\6\1\77\1\6\1\100\2\6\1\101\12\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\16\6\1\102\12\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\6\6\1\103\5\6\1\104"+
-    "\1\105\13\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\16\6\1\106\12\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\1\6"+
-    "\1\107\3\6\1\110\15\6\1\111\5\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\1\6"+
-    "\1\112\16\6\1\113\2\6\1\114\5\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\5\6"+
-    "\1\115\23\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\10\6\1\116\11\6\1\117\1\120"+
-    "\1\6\1\121\1\6\1\122\1\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\10\6\1\123"+
-    "\7\6\1\124\10\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\16\6\1\125\12\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\10\6\1\126\20\6\1\0\1\6\24\0\1\22\44\0"+
-    "\1\22\1\0\2\5\1\0\70\5\2\10\1\0\70\10"+
-    "\16\0\1\11\74\0\2\51\10\0\1\45\1\55\4\0"+
-    "\1\51\3\0\1\45\1\55\1\45\24\0\13\127\1\130"+
-    "\57\127\2\53\1\0\70\53\20\0\2\54\12\0\1\45"+
-    "\3\0\1\54\12\0\1\45\33\0\2\131\2\0\2\131"+
-    "\10\0\1\45\5\0\1\131\3\0\1\45\1\0\1\45"+
-    "\42\0\1\132\1\0\2\133\6\0\4\133\1\45\3\0"+
-    "\7\133\4\0\1\45\17\0\1\57\6\0\1\57\10\0"+
-    "\2\57\6\0\7\57\1\0\31\57\1\0\1\57\1\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\21\6"+
-    "\1\134\7\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\21\6\1\135\7\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\16\6"+
-    "\1\136\12\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\5\6\1\137\23\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\22\6"+
-    "\1\140\6\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\21\6\1\140\1\141\6\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\1\6\1\101\27\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\1\6\1\142\27\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\15\6\1\143\13\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\6\6\1\144\22\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\23\6\1\145\5\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\21\6\1\140\7\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\23\6\1\146\5\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\22\6\1\147\6\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\13\6\1\73\15\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\15\6\1\150\13\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\16\6\1\151\12\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\20\6\1\103\10\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\22\6\1\152\6\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\17\6\1\153\11\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\21\6\1\154\1\155\6\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\15\6\1\156\13\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\22\6\1\157\6\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\25\6\1\103\3\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\13\6\1\160\15\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\3\6\1\161\25\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\11\6\1\162\4\6\1\163\12\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\2\6"+
-    "\1\164\26\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\22\6\1\165\6\6\1\0\2\6"+
-    "\6\0\1\6\10\0\2\6\6\0\7\6\1\0\16\6"+
-    "\1\166\12\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\1\6\1\167\16\6\1\170\10\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\17\6\1\171\11\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\11\6\1\172\17\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\15\6\1\173\13\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\11\6\1\174\6\6"+
-    "\1\175\10\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\1\6\1\176\21\6\1\140\3\6"+
-    "\1\103\1\6\1\0\2\6\6\0\1\6\10\0\2\6"+
-    "\6\0\7\6\1\0\11\6\1\177\1\6\1\200\15\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\11\6\1\201\17\6\1\0\1\6\13\127\1\202"+
-    "\57\127\13\203\1\130\3\203\1\204\53\203\20\0\2\131"+
-    "\10\0\1\45\5\0\1\131\3\0\1\45\1\0\1\45"+
-    "\44\0\2\205\6\0\4\205\4\0\7\205\42\0\1\205"+
-    "\1\0\2\133\6\0\4\133\1\45\1\55\2\0\7\133"+
-    "\4\0\1\45\3\0\1\55\13\0\1\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\22\6\1\206\6\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\5\6\1\207\23\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\13\6\1\210\15\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\1\6\1\211\27\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\5\6\1\103\23\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\3\6\1\212\25\6\1\0\2\6\6\0\1\6"+
-    "\10\0\2\6\6\0\7\6\1\0\21\6\1\174\7\6"+
-    "\1\0\2\6\6\0\1\6\10\0\2\6\6\0\7\6"+
-    "\1\0\21\6\1\213\1\214\6\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\215"+
-    "\27\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\2\6\1\201\26\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\14\6\1\216"+
-    "\14\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\5\6\1\217\23\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\1\6\1\220"+
-    "\27\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\1\6\1\213\27\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\103"+
-    "\12\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\13\6\1\221\2\6\1\166\12\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\22\6\1\222\6\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\5\6\1\223\23\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\7\6\1\103\21\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\11\6\1\224\17\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\13\6\1\103\15\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\12\6\1\225\16\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\24\6\1\226\4\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\22\6\1\227\6\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\13\6\1\230\15\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\23\6\1\231\5\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\20\6\1\213\10\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\22\6\1\230\6\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\11\6\1\232\17\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\5\6\1\101\23\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\22\6\1\141\6\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\3\6\1\233\25\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\21\6\1\103\7\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\16\6\1\234\12\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\15\6\1\235\13\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\4\6\1\103\24\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\1\6\1\236\27\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\13\6\1\140\15\6\1\0"+
-    "\1\6\13\127\1\202\3\127\1\237\53\127\13\203\1\240"+
-    "\57\203\20\0\2\205\6\0\4\205\1\0\1\55\2\0"+
-    "\7\205\10\0\1\55\13\0\1\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\20\6\1\241\10\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\20\6\1\242\10\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\5\6\1\243\23\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\12\6\1\103\16\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\10\6\1\103\20\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\22\6\1\103\6\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\11\6\1\244\17\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\23\6\1\245\5\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\15\6\1\246\13\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\13\6\1\247\15\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\5\6\1\250\23\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\1\6\1\251\27\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\20\6\1\252\10\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\24\6\1\140\4\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\1\6\1\253\27\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\1\6\1\64\27\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\5\6\1\254\23\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\11\6\1\255\17\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\20\6\1\256\10\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\3\6\1\257\25\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\10\6\1\260\20\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\25\6\1\261\3\6\1\0\2\6\6\0\1\6\10\0"+
-    "\2\6\6\0\7\6\1\0\21\6\1\262\7\6\1\0"+
-    "\2\6\6\0\1\6\10\0\2\6\6\0\7\6\1\0"+
-    "\22\6\1\126\6\6\1\0\1\6\13\203\1\240\3\203"+
-    "\1\204\53\203\1\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\1\6\1\263\27\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\22\6\1\264"+
-    "\6\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\1\6\1\256\27\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\265"+
-    "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\13\6\1\213\15\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\4\6\1\174"+
-    "\24\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\13\6\1\266\15\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\14\6\1\267"+
-    "\14\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\15\6\1\270\13\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\6\6\1\271"+
-    "\22\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\7\6\1\140\21\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\272"+
-    "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\3\6\1\103\25\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\103"+
-    "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\22\6\1\273\6\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\20\6\1\274"+
-    "\10\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\11\6\1\275\17\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\213"+
-    "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\23\6\1\140\5\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\27\6\1\103"+
-    "\1\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\5\6\1\276\23\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\277"+
-    "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\1\6\1\300\27\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\22\6\1\301"+
-    "\6\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\6\6\1\302\22\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\303"+
-    "\12\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\5\6\1\304\23\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\305"+
-    "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\5\6\1\306\23\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\3\6\1\140"+
-    "\25\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\5\6\1\177\23\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\17\6\1\103"+
-    "\11\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\15\6\1\307\13\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\15\6\1\213"+
-    "\13\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\22\6\1\174\6\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\16\6\1\310"+
-    "\12\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\11\6\1\311\17\6\1\0\2\6\6\0"+
-    "\1\6\10\0\2\6\6\0\7\6\1\0\6\6\1\103"+
-    "\22\6\1\0\2\6\6\0\1\6\10\0\2\6\6\0"+
-    "\7\6\1\0\30\6\1\301\1\0\1\6";
-
-  private static int [] zzUnpacktrans() {
-    int [] result = new int[11328];
-    int offset = 0;
-    offset = zzUnpacktrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpacktrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** Error code for "Unknown internal scanner error". */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  /** Error code for "could not match input". */
-  private static final int ZZ_NO_MATCH = 1;
-  /** Error code for "pushback value was too large". */
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-
-  /**
-   * Error messages for {@link #ZZ_UNKNOWN_ERROR}, {@link #ZZ_NO_MATCH}, and
-   * {@link #ZZ_PUSHBACK_2BIG} respectively.
-   */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unknown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\0\1\11\6\1\1\11\10\1\1\11\22\1\1\11"+
-    "\2\1\1\0\61\1\1\0\47\1\1\0\1\1\1\11"+
-    "\1\0\31\1\1\11\1\0\51\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[201];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** Input device. */
-  private Reader zzReader;
-
-  /** Current state of the DFA. */
-  private int zzState;
-
-  /** Current lexical state. */
-  private int zzLexicalState = YYINITIAL;
-
-  /**
-   * This buffer contains the current text to be matched and is the source of the {@link #yytext()}
-   * string.
-   */
-  private char zzBuffer[] = new char[Math.min(ZZ_BUFFERSIZE, zzMaxBufferLen())];
-
-  /** Text position at the last accepting state. */
-  private int zzMarkedPos;
-
-  /** Current text position in the buffer. */
-  private int zzCurrentPos;
-
-  /** Marks the beginning of the {@link #yytext()} string in the buffer. */
-  private int zzStartRead;
-
-  /** Marks the last character in the buffer, that has been read from input. */
-  private int zzEndRead;
-
-  /**
-   * Whether the scanner is at the end of file.
-   * @see #yyatEOF
-   */
-  private boolean zzAtEOF;
-
-  /**
-   * The number of occupied positions in {@link #zzBuffer} beyond {@link #zzEndRead}.
-   *
-   * <p>When a lead/high surrogate has been read from the input stream into the final
-   * {@link #zzBuffer} position, this will have a value of 1; otherwise, it will have a value of 0.
-   */
-  private int zzFinalHighSurrogate = 0;
-
-  /** Number of newlines encountered up to the start of the matched text. */
-  private int yyline;
-
-  /** Number of characters from the last newline up to the start of the matched text. */
-  private int yycolumn;
-
-  /** Number of characters up to the start of the matched text. */
-  @SuppressWarnings("unused")
-  private long yychar;
-
-  /** Whether the scanner is currently at the beginning of a line. */
-  @SuppressWarnings("unused")
-  private boolean zzAtBOL = true;
-
-  /** Whether the user-EOF-code has already been executed. */
-  @SuppressWarnings("unused")
-  private boolean zzEOFDone;
-
-  /* user code: */
-    private boolean myAssertKeyword;
-    private boolean myEnumKeyword;
-
-    public JavaLexer(){
- 	     this(8);
-    }
-
-    public JavaLexer(int level) {
-        this((Reader)null);
-        myAssertKeyword = level >= 4;
-        myEnumKeyword =level >= 5;
-   }
-
-    public void setReader(Reader reader){
-		zzReader=reader;
-	}
-
-  	public void reset(Reader reader){
-  		yyreset(reader);
-  	}
-
-  	public int getState(){
-  		return yystate()+1;
-  	}
-
-  	public void setState(int state){
-  		yybegin(state-1);
-  	}
-
-    public int getDefaultState(){
-  		return YYINITIAL+1;
-  	}
-
-  	public SyntaxKind nextToken()throws IOException{
-  		return yylex();
-  	}
-
-    public int getLine(){
-  		return yyline;
-  	}
-
-  	public int getColumn(){
-  		return yycolumn;
-  	}
-
-
-
-  /**
-   * Creates a new scanner
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  public JavaLexer(Reader in) {
-    this.zzReader = in;
-  }
-
-
-  /** Returns the maximum size of the scanner buffer, which limits the size of tokens. */
-  private int zzMaxBufferLen() {
-    return Integer.MAX_VALUE;
-  }
-
-  /**  Whether the scanner buffer can grow to accommodate a larger token. */
-  private boolean zzCanGrow() {
-    return true;
-  }
-
-  /**
-   * Translates raw input code points to DFA table row
-   */
-  private static int zzCMap(int input) {
-    int offset = input & 255;
-    return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];
-  }
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return {@code false} iff there was new input.
-   * @exception IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws IOException {
-
-    /* first: make room (if you can) */
-    if (zzStartRead > 0) {
-      zzEndRead += zzFinalHighSurrogate;
-      zzFinalHighSurrogate = 0;
-      System.arraycopy(zzBuffer, zzStartRead,
-                       zzBuffer, 0,
-                       zzEndRead - zzStartRead);
-
-      /* translate stored positions */
-      zzEndRead -= zzStartRead;
-      zzCurrentPos -= zzStartRead;
-      zzMarkedPos -= zzStartRead;
-      zzStartRead = 0;
-    }
-
-    /* is the buffer big enough? */
-    if (zzCurrentPos >= zzBuffer.length - zzFinalHighSurrogate && zzCanGrow()) {
-      /* if not, and it can grow: blow it up */
-      char newBuffer[] = new char[Math.min(zzBuffer.length * 2, zzMaxBufferLen())];
-      System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
-      zzBuffer = newBuffer;
-      zzEndRead += zzFinalHighSurrogate;
-      zzFinalHighSurrogate = 0;
-    }
-
-    /* fill the buffer with new input */
-    int requested = zzBuffer.length - zzEndRead;
-    int numRead = zzReader.read(zzBuffer, zzEndRead, requested);
-
-    /* not supposed to occur according to specification of java.io.Reader */
-    if (numRead == 0) {
-      if (requested == 0) {
-        throw new java.io.EOFException("Scan buffer limit reached ["+zzBuffer.length+"]");
-      }
-      else {
-        throw new IOException(
-            "Reader returned 0 characters. See JFlex examples/zero-reader for a workaround.");
-      }
-    }
-    if (numRead > 0) {
-      zzEndRead += numRead;
-      if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
-        if (numRead == requested) { // We requested too few chars to encode a full Unicode character
-          --zzEndRead;
-          zzFinalHighSurrogate = 1;
-        } else {                    // There is room in the buffer for at least one more char
-          int c = zzReader.read();  // Expecting to read a paired low surrogate char
-          if (c == -1) {
-            return true;
-          } else {
-            zzBuffer[zzEndRead++] = (char)c;
-          }
-        }
-      }
-      /* potentially more input available */
-      return false;
-    }
-
-    /* numRead < 0 ==> end of stream */
-    return true;
-  }
-
-
-  /**
-   * Closes the input reader.
-   *
-   * @throws IOException if the reader could not be closed.
-   */
-  public final void yyclose() throws IOException {
-    zzAtEOF = true; // indicate end of file
-    zzEndRead = zzStartRead; // invalidate buffer
-
-    if (zzReader != null) {
-      zzReader.close();
-    }
-  }
-
-
-  /**
-   * Resets the scanner to read from a new input stream.
-   *
-   * <p>Does not close the old reader.
-   *
-   * <p>All internal variables are reset, the old input stream <b>cannot</b> be reused (internal
-   * buffer is discarded and lost). Lexical state is set to {@code ZZ_INITIAL}.
-   *
-   * <p>Internal scan buffer is resized down to its initial length, if it has grown.
-   *
-   * @param reader The new input stream.
-   */
-  public final void yyreset(Reader reader) {
-    zzReader = reader;
-    zzEOFDone = false;
-    yyResetPosition();
-    zzLexicalState = YYINITIAL;
-    int initBufferSize = Math.min(ZZ_BUFFERSIZE, zzMaxBufferLen());
-    if (zzBuffer.length > initBufferSize) {
-      zzBuffer = new char[initBufferSize];
-    }
-  }
-
-  /**
-   * Resets the input position.
-   */
-  private final void yyResetPosition() {
-      zzAtBOL  = true;
-      zzAtEOF  = false;
-      zzCurrentPos = 0;
-      zzMarkedPos = 0;
-      zzStartRead = 0;
-      zzEndRead = 0;
-      zzFinalHighSurrogate = 0;
-      yyline = 0;
-      yycolumn = 0;
-      yychar = 0L;
-  }
-
-
-  /**
-   * Returns whether the scanner has reached the end of the reader it reads from.
-   *
-   * @return whether the scanner has reached EOF.
-   */
-  public final boolean yyatEOF() {
-    return zzAtEOF;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   *
-   * @return the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state.
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   *
-   * @return the matched text.
-   */
-  public final String yytext() {
-    return new String(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);
-  }
-
-
-  /**
-   * Returns the character at the given position from the matched text.
-   *
-   * <p>It is equivalent to {@code yytext().charAt(pos)}, but faster.
-   *
-   * @param position the position of the character to fetch. A value from 0 to {@code yylength()-1}.
-   *
-   * @return the character at {@code position}.
-   */
-  public final char yycharat(int position) {
-    return zzBuffer[zzStartRead + position];
-  }
-
-
-  /**
-   * How many characters were matched.
-   *
-   * @return the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occurred while scanning.
-   *
-   * <p>In a well-formed scanner (no or only correct usage of {@code yypushback(int)} and a
-   * match-all fallback rule) this method will only be called with things that
-   * "Can't Possibly Happen".
-   *
-   * <p>If this method is called, something is seriously wrong (e.g. a JFlex bug producing a faulty
-   * scanner etc.).
-   *
-   * <p>Usual syntax/scanner level error handling should be done in error fallback rules.
-   *
-   * @param errorCode the code of the error message to display.
-   */
-  private static void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    } catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * <p>They will be read again by then next call of the scanning method.
-   *
-   * @param number the number of characters to be read again. This number must not be greater than
-   *     {@link #yylength()}.
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched, the end of input is encountered
-   * or an I/O-Error occurs.
-   *
-   * @return the next token.
-   * @exception IOException if any I/O-Error occurs.
-   */
-  public SyntaxKind yylex() throws IOException
-  {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    char[] zzBufferL = zzBuffer;
-
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      boolean zzR = false;
-      int zzCh;
-      int zzCharCount;
-      for (zzCurrentPosL = zzStartRead  ;
-           zzCurrentPosL < zzMarkedPosL ;
-           zzCurrentPosL += zzCharCount ) {
-        zzCh = Character.codePointAt(zzBufferL, zzCurrentPosL, zzMarkedPosL);
-        zzCharCount = Character.charCount(zzCh);
-        switch (zzCh) {
-        case '\u000B':  // fall through
-        case '\u000C':  // fall through
-        case '\u0085':  // fall through
-        case '\u2028':  // fall through
-        case '\u2029':
-          yyline++;
-          yycolumn = 0;
-          zzR = false;
-          break;
-        case '\r':
-          yyline++;
-          yycolumn = 0;
-          zzR = true;
-          break;
-        case '\n':
-          if (zzR)
-            zzR = false;
-          else {
-            yyline++;
-            yycolumn = 0;
-          }
-          break;
-        default:
-          zzR = false;
-          yycolumn += zzCharCount;
-        }
-      }
-
-      if (zzR) {
-        // peek one character ahead if it is
-        // (if we have counted one line too much)
-        boolean zzPeek;
-        if (zzMarkedPosL < zzEndReadL)
-          zzPeek = zzBufferL[zzMarkedPosL] == '\n';
-        else if (zzAtEOF)
-          zzPeek = false;
-        else {
-          boolean eof = zzRefill();
-          zzEndReadL = zzEndRead;
-          zzMarkedPosL = zzMarkedPos;
-          zzBufferL = zzBuffer;
-          if (eof)
-            zzPeek = false;
-          else
-            zzPeek = zzBufferL[zzMarkedPosL] == '\n';
-        }
-        if (zzPeek) yyline--;
-      }
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-      zzState = ZZ_LEXSTATE[zzLexicalState];
-
-      // set up zzAction for empty match case:
-      int zzAttributes = zzAttrL[zzState];
-      if ( (zzAttributes & 1) == 1 ) {
-        zzAction = zzState;
-      }
-
-
-      zzForAction: {
-        while (true) {
-
-          if (zzCurrentPosL < zzEndReadL) {
-            zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
-            zzCurrentPosL += Character.charCount(zzInput);
-          }
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
-              zzCurrentPosL += Character.charCount(zzInput);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMap(zzInput) ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-        zzAtEOF = true;
-              {
-                return null;
-              }
-      }
-      else {
-        switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-          case 1:
-            { return Plain;
-            }
-          // fall through
-          case 11: break;
-          case 2:
-            { return Operator;
-            }
-          // fall through
-          case 12: break;
-          case 3:
-            { return Literal;
-            }
-          // fall through
-          case 13: break;
-          case 4:
-            { return Separator;
-            }
-          // fall through
-          case 14: break;
-          case 5:
-            { return Comment;
-            }
-          // fall through
-          case 15: break;
-          case 6:
-            { return TypeIdentifier;
-            }
-          // fall through
-          case 16: break;
-          case 7:
-            { return Keyword;
-            }
-          // fall through
-          case 17: break;
-          case 8:
-            { return DocComment;
-            }
-          // fall through
-          case 18: break;
-          case 9:
-            { return myEnumKeyword ? Keyword : Plain;
-            }
-          // fall through
-          case 19: break;
-          case 10:
-            { return myAssertKeyword ? Keyword : Plain;
-            }
-          // fall through
-          case 20: break;
-          default:
-            zzScanError(ZZ_NO_MATCH);
-        }
-      }
-    }
-  }
-
-
-}
diff --git a/app/src/main/java/com/apkide/ui/MainUI.java b/app/src/main/java/com/apkide/ui/MainUI.java
index a78cd35..116358c 100644
--- a/app/src/main/java/com/apkide/ui/MainUI.java
+++ b/app/src/main/java/com/apkide/ui/MainUI.java
@@ -1,10 +1,12 @@
 package com.apkide.ui;
 
 import static android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import static com.apkide.ui.browsers.BrowserPager.BUILD_BROWSER;
-import static com.apkide.ui.browsers.BrowserPager.FILE_BROWSER;
-import static com.apkide.ui.browsers.BrowserPager.FIND_BROWSER;
-import static com.apkide.ui.browsers.BrowserPager.PROBLEM_BROWSER;
+import static com.apkide.ui.AppCommands.ActionBarCommand;
+import static com.apkide.ui.AppCommands.MenuCommand;
+import static com.apkide.ui.AppCommands.TitleMenuCommand;
+import static com.apkide.ui.AppCommands.VisibleMenuCommand;
+import static com.apkide.ui.AppCommands.foundActionBarCommand;
+import static com.apkide.ui.AppCommands.foundMenuCommand;
 import static java.lang.System.currentTimeMillis;
 
 import android.annotation.SuppressLint;
@@ -26,8 +28,7 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
-import com.apkide.common.ApplicationProvider;
-import com.apkide.common.KeyStrokeDetector;
+import com.apkide.common.keybinding.KeyStrokeDetector;
 import com.apkide.ui.browsers.BrowserPager;
 import com.apkide.ui.databinding.UiMainBinding;
 
@@ -93,11 +94,6 @@ public void handleOnBackPressed() {
         });
 
         restoreBrowser();
-        //Test Editor
-        getEditorPager().openFile(ApplicationProvider.get().foundFile("JavaLexer.java").getAbsolutePath());
-        JavaHighlighting.setEditor(getEditorPager().getCurrentEditor());
-        getEditorPager().getCurrentEditor().getEditorModel().insertChar(0,0,'1');
-        getEditorPager().getCurrentEditor().select(0,0,1,1);
     }
 
     public void exitApp() {
@@ -135,28 +131,6 @@ private void restoreBrowser() {
             toggleBrowser(current, true);
     }
 
-
-    public void toggleFileBrowser() {
-
-        toggleBrowser(FILE_BROWSER, false);
-    }
-
-    public void toggleProblemBrowser() {
-
-        toggleBrowser(PROBLEM_BROWSER, false);
-    }
-
-    public void toggleBuildBrowser() {
-
-        toggleBrowser(BUILD_BROWSER, false);
-    }
-
-    public void toggleFindBrowser() {
-
-        toggleBrowser(FIND_BROWSER, false);
-    }
-
-
     public void toggleBrowser(int index, boolean refresh) {
         if (!isDrawerOpened()) {
             openDrawer();
@@ -168,7 +142,6 @@ public BrowserPager getBrowserPager() {
         return mainBinding.mainBrowserPager;
     }
 
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_options, menu);
@@ -177,27 +150,55 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-
+        boolean r = super.onPrepareOptionsMenu(menu);
+        menu.clear();
+        getMenuInflater().inflate(R.menu.main_options, menu);
         if (!App.isShutdown()) {
-            if (AppCommands.menuCommandPreExec(menu)) {
-                return true;
-            }
+            applyMenu(menu);
         }
-
-        return super.onPrepareOptionsMenu(menu);
+        return r;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+    private void applyMenu(Menu menu) {
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
 
-        if (!App.isShutdown()) {
-            if (AppCommands.menuCommandExec(item))
-                return true;
+            MenuCommand menuCommand = foundMenuCommand(item.getItemId());
+            if (menuCommand != null) {
+                item.setEnabled(menuCommand.isEnabled());
+                if (menuCommand instanceof VisibleMenuCommand)
+                    item.setVisible(((VisibleMenuCommand) menuCommand).getVisible(false));
+
+                if (menuCommand instanceof TitleMenuCommand)
+                    item.setTitle(((TitleMenuCommand) menuCommand).getTitle());
+            }
+
+            ActionBarCommand actionBarCommand = foundActionBarCommand(item.getItemId());
+            if (actionBarCommand != null) {
+                item.setEnabled(actionBarCommand.isEnabled());
+                item.setVisible(actionBarCommand.isVisible());
+            }
+
+            if (item.hasSubMenu()) {
+                applyMenu(item.getSubMenu());
+            }
         }
+    }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        MenuCommand menuCommand = foundMenuCommand(item.getItemId());
+        if (menuCommand != null && menuCommand.isEnabled()) {
+            menuCommand.run();
+            return true;
+        }
+        ActionBarCommand actionBarCommand = foundActionBarCommand(item.getItemId());
+        if (actionBarCommand != null && actionBarCommand.isVisible()) {
+            actionBarCommand.run();
+            return true;
+        }
         return super.onOptionsItemSelected(item);
     }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/apkide/ui/StyledUI.java b/app/src/main/java/com/apkide/ui/StyledUI.java
index cf6f08e..3475397 100644
--- a/app/src/main/java/com/apkide/ui/StyledUI.java
+++ b/app/src/main/java/com/apkide/ui/StyledUI.java
@@ -17,138 +17,142 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 
-import com.apkide.ui.util.RunCallback;
-import com.kongzue.dialogx.dialogs.MessageDialog;
+import com.apkide.common.app.AppLog;
 
 
 public class StyledUI extends AppCompatActivity {
 
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        applyTheme();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
-    private void applyTheme() {
-        boolean darkMode = isNightMode();
-        WindowInsetsControllerCompat compat =
-                new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
-        compat.setAppearanceLightStatusBars(!darkMode);
-        compat.setAppearanceLightStatusBars(!darkMode);
-    }
-
-    private boolean isNightModeActive(int uiMode) {
-        return (uiMode & UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES;
-    }
-
-    public boolean isNightMode() {
-        if (SDK_INT >= VERSION_CODES.R) {
-            return getResources().getConfiguration().isNightModeActive();
-        }
-        return isNightModeActive(getResources().getConfiguration().uiMode);
-    }
-
-    private static final int REQUEST_PERMISSION_CODE = 1234;
-
-    private RunCallback callback;
-
-    public void runOnStorageOperation(RunCallback callback) {
-        if (callback == null)
-            throw new IllegalArgumentException("callback is null.");
-
-        if (this.callback != null)
-            this.callback.cancel();
-
-        this.callback = callback;
-        if (SDK_INT >= VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager()) {
-                requestManageStoragePermission();
-                return;
-            }
-        } else {
-            if (ActivityCompat.checkSelfPermission(this,
-                    WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this,
-                        new String[]{WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION_CODE);
-                return;
-            }
-        }
-        this.callback.done();
-        this.callback = null;
-    }
-
-
-    @RequiresApi(api = VERSION_CODES.R)
-    private void requestManageStoragePermission() {
-        MessageDialog.show("缺少必要权限",
-                        getString(R.string.app_name) + ": 需要获得访问文件和媒体的权限")
-                .setOkButton("同意", (dialog, v) -> {
-                    try {
-                        Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
-                        intent.setData(Uri.parse("package:" + getPackageName()));
-                        startActivity(intent);
-                        ActivityCompat.startActivityForResult(StyledUI.this, intent, REQUEST_PERMISSION_CODE, null);
-                    } catch (ActivityNotFoundException e) {
-                        if (callback != null) {
-                            callback.fail(e);
-                            callback = null;
-                        }
-                    }
-                    return true;
-                })
-                .setCancelButton("", (dialog, v) -> {
-                    dialog.dismiss();
-                    if (callback != null) {
-                        callback.cancel();
-                        callback = null;
-                    }
-                    return true;
-                });
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (SDK_INT >= VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager()) {
-                if (callback != null) {
-                    callback.fail(new Exception("获取存储权限失败!"));
-                    callback = null;
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		applyTheme();
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+	}
+
+	private void applyTheme() {
+		boolean darkMode = isNightMode();
+		WindowInsetsControllerCompat compat =
+				new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+		compat.setAppearanceLightStatusBars(!darkMode);
+		compat.setAppearanceLightStatusBars(!darkMode);
+	}
+
+	private boolean isNightModeActive(int uiMode) {
+		return (uiMode & UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES;
+	}
+
+	public boolean isNightMode() {
+		if (SDK_INT >= VERSION_CODES.R) {
+			return getResources().getConfiguration().isNightModeActive();
+		}
+		return isNightModeActive(getResources().getConfiguration().uiMode);
+	}
+
+	private static final int REQUEST_PERMISSION_CODE = 1234;
+
+
+	public void requestStorage() {
+		if (SDK_INT >= VERSION_CODES.R) {
+			if (!Environment.isExternalStorageManager()) {
+				requestManageStoragePermission();
+			}
+		} else {
+			if (ActivityCompat.checkSelfPermission(this,
+					WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
+				ActivityCompat.requestPermissions(this,
+						new String[]{WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION_CODE);
+			}
+		}
+	}
+
+	private Runnable myStorageRunnable;
+
+	public void runOnStorage(@NonNull Runnable runnable) {
+		myStorageRunnable = runnable;
+		if (SDK_INT >= VERSION_CODES.R) {
+			if (!Environment.isExternalStorageManager()) {
+				requestManageStoragePermission();
+				return;
+			}
+		} else {
+			if (ActivityCompat.checkSelfPermission(this,
+					WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
+				ActivityCompat.requestPermissions(this,
+						new String[]{WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION_CODE);
+				return;
+			}
+		}
+		myStorageRunnable.run();
+	}
+
+
+	@RequiresApi(api = VERSION_CODES.R)
+	private void requestManageStoragePermission() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle("缺少必要权限");
+		builder.setMessage(getString(R.string.app_name) + ": 需要获得访问文件和媒体的权限");
+		builder.setPositiveButton("同意", (dialog, which) -> {
+			dialog.dismiss();
+			try {
+				Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+				intent.setData(Uri.parse("package:" + getPackageName()));
+				startActivity(intent);
+				ActivityCompat.startActivityForResult(this, intent, REQUEST_PERMISSION_CODE, null);
+			} catch (ActivityNotFoundException e) {
+				AppLog.e(e);
+			}
+		});
+		builder.setNegativeButton("拒绝", (dialog, which) -> {
+			dialog.dismiss();
+		});
+		builder.setCancelable(false);
+		builder.create().show();
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == REQUEST_PERMISSION_CODE) {
+			if (SDK_INT >= VERSION_CODES.R) {
+				if (Environment.isExternalStorageManager()) {
+                    if (myStorageRunnable != null)
+                        myStorageRunnable.run();
                 }
-            } else {
-                if (callback != null) {
-                    callback.done();
-                    callback = null;
+			} else {
+				if (ActivityCompat.checkSelfPermission(this, WRITE_EXTERNAL_STORAGE)
+						!= PERMISSION_GRANTED) {
+                    if (myStorageRunnable != null)
+                        myStorageRunnable.run();
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		if (requestCode == REQUEST_PERMISSION_CODE) {
+			if (SDK_INT >= VERSION_CODES.R) {
+				if (Environment.isExternalStorageManager()) {
+                    if (myStorageRunnable != null)
+                        myStorageRunnable.run();
                 }
-            }
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_PERMISSION_CODE) {
-            if (ActivityCompat.checkSelfPermission(this, WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
-                if (callback != null) {
-                    callback.fail(new Exception("获取存储权限失败!"));
-                    callback = null;
-                }
-            } else {
-                if (callback != null) {
-                    callback.done();
-                    callback = null;
-                }
-            }
-        }
-    }
+			} else {
+				if (ActivityCompat.checkSelfPermission(this, WRITE_EXTERNAL_STORAGE)
+						!= PERMISSION_GRANTED) {
+					if (myStorageRunnable != null)
+						myStorageRunnable.run();
+				}
+			}
+		}
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/Browser.java b/app/src/main/java/com/apkide/ui/browsers/Browser.java
index 7c5900a..927e42d 100644
--- a/app/src/main/java/com/apkide/ui/browsers/Browser.java
+++ b/app/src/main/java/com/apkide/ui/browsers/Browser.java
@@ -1,5 +1,5 @@
 package com.apkide.ui.browsers;
 
 public interface Browser {
-    void onSyncing();
+    void onApply();
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/BrowserLayout.java b/app/src/main/java/com/apkide/ui/browsers/BrowserLayout.java
index de44410..e0cf2b3 100644
--- a/app/src/main/java/com/apkide/ui/browsers/BrowserLayout.java
+++ b/app/src/main/java/com/apkide/ui/browsers/BrowserLayout.java
@@ -1,31 +1,47 @@
 package com.apkide.ui.browsers;
 
+import static android.view.LayoutInflater.from;
+
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 
 import com.apkide.ui.App;
+import com.apkide.ui.databinding.BrowserHeaderBinding;
 
 public abstract class BrowserLayout extends LinearLayout implements Browser {
-    private SharedPreferences preferences;
-
-    public BrowserLayout(Context context) {
-        super(context);
-    }
-
-    public abstract String getPreferencesName();
-
-    @NonNull
-    public SharedPreferences getPreferences() {
-        if (preferences == null)
-            preferences = App.getPreferences(getPreferencesName());
-        return preferences;
-    }
-
-    @Override
-    public void onSyncing() {
-
-    }
+	private SharedPreferences preferences;
+	private final BrowserHeaderBinding myHeaderBinding;
+
+	public BrowserLayout(Context context) {
+		super(context);
+		removeAllViews();
+		setOrientation(VERTICAL);
+		LayoutInflater inflater = from(getContext());
+		myHeaderBinding = BrowserHeaderBinding.inflate(inflater, this, false);
+		addView(myHeaderBinding.getRoot());
+	}
+
+	@NonNull
+	public final BrowserHeaderBinding getHeader() {
+		return myHeaderBinding;
+	}
+
+	@NonNull
+	public abstract String getPreferencesName();
+
+	@NonNull
+	public SharedPreferences getPreferences() {
+		if (preferences == null)
+			preferences = App.getPreferences(getPreferencesName());
+		return preferences;
+	}
+
+	@Override
+	public void onApply() {
+		requestFocus();
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/BrowserPager.java b/app/src/main/java/com/apkide/ui/browsers/BrowserPager.java
index f9eb5c0..60f2314 100644
--- a/app/src/main/java/com/apkide/ui/browsers/BrowserPager.java
+++ b/app/src/main/java/com/apkide/ui/browsers/BrowserPager.java
@@ -18,8 +18,8 @@
 import com.apkide.ui.R;
 import com.apkide.ui.browsers.build.BuildBrowser;
 import com.apkide.ui.browsers.file.FileBrowser;
-import com.apkide.ui.browsers.find.FindBrowser;
 import com.apkide.ui.browsers.problem.ProblemBrowser;
+import com.apkide.ui.browsers.search.SearchBrowser;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -39,16 +39,16 @@ public BrowserPager(@NonNull Context context, @Nullable AttributeSet attrs) {
     private static final String PREF_NAME = "browserPager";
     private SharedPreferences preferences;
     public static final int FILE_BROWSER = 0;
-    public static final int PROBLEM_BROWSER = 1;
-    public static final int FIND_BROWSER = 2;
+    public static final int SEARCH_BROWSER = 1;
+    public static final int PROBLEM_BROWSER = 2;
     public static final int BUILD_BROWSER = 3;
     private final List<View> browsers = new ArrayList<>();
 
     private void initView() {
         browsers.add(new FileBrowser(getContext()));
+        browsers.add(new SearchBrowser(getContext()));
         browsers.add(new ProblemBrowser(getContext()));
         browsers.add(new BuildBrowser(getContext()));
-        browsers.add(new FindBrowser(getContext()));
 
         try {
             Field declaredField = requireNonNull(getClass().getSuperclass()).getDeclaredField("mTouchSlop");
@@ -93,7 +93,7 @@ public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull
                     index = position;
                     postDelayed(() -> {
                         Browser browser = (Browser) browsers.get(index);
-                        browser.onSyncing();
+                        browser.onApply();
                         getPreferences().edit().putInt("currentIndex", index).apply();
                     }, 100L);
                 }
@@ -121,8 +121,8 @@ public BuildBrowser getBuildBrowser() {
         return (BuildBrowser) browserAt(BUILD_BROWSER);
     }
 
-    public FindBrowser getFindBrowser() {
-        return (FindBrowser) browserAt(FIND_BROWSER);
+    public SearchBrowser getFindBrowser() {
+        return (SearchBrowser) browserAt(SEARCH_BROWSER);
     }
 
 
diff --git a/app/src/main/java/com/apkide/ui/browsers/build/BuildBrowser.java b/app/src/main/java/com/apkide/ui/browsers/build/BuildBrowser.java
index 441119d..678763c 100644
--- a/app/src/main/java/com/apkide/ui/browsers/build/BuildBrowser.java
+++ b/app/src/main/java/com/apkide/ui/browsers/build/BuildBrowser.java
@@ -1,17 +1,19 @@
 package com.apkide.ui.browsers.build;
 
 import android.content.Context;
-import android.widget.LinearLayout;
 
-import com.apkide.ui.browsers.Browser;
+import androidx.annotation.NonNull;
 
-public class BuildBrowser extends LinearLayout implements Browser {
-    public BuildBrowser(Context context) {
-        super(context);
-    }
+import com.apkide.ui.browsers.BrowserLayout;
 
-    @Override
-    public void onSyncing() {
+public class BuildBrowser extends BrowserLayout {
+	public BuildBrowser(Context context) {
+		super(context);
+	}
 
-    }
+	@NonNull
+	@Override
+	public String getPreferencesName() {
+		return "BuildBrowser";
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/build/OutputView.java b/app/src/main/java/com/apkide/ui/browsers/build/OutputView.java
deleted file mode 100644
index b01e7d8..0000000
--- a/app/src/main/java/com/apkide/ui/browsers/build/OutputView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.apkide.ui.browsers.build;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.apkide.ui.views.CodeEditText;
-
-public class OutputView extends CodeEditText {
-    public OutputView(Context context) {
-        super(context);
-        initView();
-    }
-
-    public OutputView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView();
-    }
-
-    public OutputView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        initView();
-    }
-
-    private void initView() {
-        
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileBrowser.java b/app/src/main/java/com/apkide/ui/browsers/file/FileBrowser.java
index 5cb8880..4c2c3d8 100644
--- a/app/src/main/java/com/apkide/ui/browsers/file/FileBrowser.java
+++ b/app/src/main/java/com/apkide/ui/browsers/file/FileBrowser.java
@@ -1,76 +1,148 @@
 package com.apkide.ui.browsers.file;
 
 import static android.view.LayoutInflater.from;
+import static com.apkide.ui.browsers.file.FileBrowserService.FileBrowserServiceListener;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
+import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.apkide.common.EntryListAdapter;
+import com.apkide.common.FileSystem;
+import com.apkide.common.app.AppLog;
+import com.apkide.ui.App;
+import com.apkide.ui.AppCommands;
 import com.apkide.ui.R;
-import com.apkide.ui.browsers.Browser;
+import com.apkide.ui.browsers.BrowserLayout;
 import com.apkide.ui.databinding.BrowserFileBinding;
-import com.apkide.ui.databinding.BrowserHeaderBinding;
-import com.apkide.ui.util.EntryAdapter;
-
-
-@SuppressLint("InflateParams")
-public class FileBrowser extends LinearLayout implements Browser, PopupMenu.OnMenuItemClickListener, EntryAdapter.EntryClickListener, EntryAdapter.EntryLongPressListener {
-
-    private BrowserHeaderBinding myHeaderBinding;
-    private BrowserFileBinding myBinding;
-    private final FileEntryAdapter myAdapter=new FileEntryAdapter();
-
-    @SuppressLint("ClickableViewAccessibility")
-    public FileBrowser(Context context) {
-        super(context);
-        removeAllViews();
-        setOrientation(VERTICAL);
-        LayoutInflater inflater = from(getContext());
-        myHeaderBinding = BrowserHeaderBinding.inflate(inflater, this, false);
-        myBinding = BrowserFileBinding.inflate(inflater, this, false);
-        addView(myHeaderBinding.getRoot());
-        addView(myBinding.getRoot());
-
-        myHeaderBinding.browserHeaderLabel.setText("Files");
-        myHeaderBinding.browserHeaderIcon.setImageResource(R.mipmap.folder);
-        myHeaderBinding.browserHeaderHelp.setOnClickListener(v -> {
-            PopupMenu menu = new PopupMenu(getContext(), v);
-            menu.inflate(R.menu.filebrowser_options);
-            menu.setOnMenuItemClickListener(FileBrowser.this);
-            menu.show();
-        });
-
-        myBinding.filebrowserListView.setNestedScrollingEnabled(false);
-        myBinding.filebrowserListView.setLayoutManager(new LinearLayoutManager(getContext()));
-        myBinding.filebrowserListView.setAdapter(myAdapter);
-        myAdapter.setClickListener(this);
-        myAdapter.setLongPressListener(this);
-    }
-
-
-    @Override
-    public void onSyncing() {
-
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        return false;
-    }
-
-    @Override
-    public void entryClicked(EntryAdapter.Entry entry, View view, int position) {
-
-    }
-
-    @Override
-    public boolean entryLongPressed(EntryAdapter.Entry entry, View view, int position) {
-        return false;
-    }
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileBrowser extends BrowserLayout implements
+		FileBrowserServiceListener,
+		EntryListAdapter.OnEntryClickListener,
+		EntryListAdapter.OnEntryLongPressListener {
+
+	private BrowserFileBinding myBinding;
+	private EntryListAdapter myListAdapter;
+
+	public FileBrowser(Context context) {
+		super(context);
+		LayoutInflater inflater = from(getContext());
+		myBinding = BrowserFileBinding.inflate(inflater, this, false);
+		addView(myBinding.getRoot(),new ViewGroup.LayoutParams(-1,-1));
+		getHeader().browserHeaderLabel.setText("Files");
+		getHeader().browserHeaderIcon.setImageResource(R.mipmap.folder);
+		getHeader().browserHeaderHelp.setOnClickListener(v -> {
+
+		});
+		myListAdapter = new FileEntryAdapter();
+		myListAdapter.setClickListener(this);
+		myListAdapter.setLongPressListener(this);
+		myBinding.fileListView.setLayoutManager(new LinearLayoutManager(getContext()));
+		myBinding.fileListView.setNestedScrollingEnabled(false);
+		myBinding.fileListView.setAdapter(myListAdapter);
+		App.getFileBrowserService().setFileBrowserServiceListener(this);
+		syncFormDisk();
+	}
+
+	@NonNull
+	@Override
+	public String getPreferencesName() {
+		return "FileBrowser";
+	}
+
+	@Override
+	public void folderOpened(String folderPath) {
+		AppLog.d(folderPath);
+		syncFormDisk();
+	}
+
+	public void syncFormDisk() {
+		App.getMainUI().runOnStorage(() -> {
+
+			String dir = App.getFileBrowserService().getFolderPath();
+
+			getHeader().browserHeaderLabel.setText(dir);
+			List<FileEntry> entries = new ArrayList<>();
+			String parentDir = FileSystem.getParentDirPath(dir);
+			if (parentDir != null) {
+				if (!parentDir.endsWith(App.getFileBrowserService().getDefaultFolderPath()))
+					entries.add(new FileEntry(parentDir, "...", false));
+			}
+
+			for (AppCommands.BrowserCommand command : AppCommands.getBrowserCommands()) {
+				if (command.getVisible(false)) {
+					entries.add(new FileEntry(command));
+				}
+			}
+
+			List<String> files = FileSystem.getChildEntries(dir);
+			files.sort((o1, o2) -> {
+				boolean isDir = FileSystem.isDirectory(o1);
+				boolean isDir2 = FileSystem.isDirectory(o2);
+				String fileName = FileSystem.getName(o1);
+				String fileName2 = FileSystem.getName(o2);
+				if (isDir && !isDir2) {
+					return -1;
+				}
+
+				if (isDir || !isDir2) {
+					if (isDir) {
+						boolean isHidden = FileEntry.isHidden(o1);
+						boolean isHidden2 = FileEntry.isHidden(o2);
+						if (isHidden && !isHidden2) return -1;
+						return fileName.compareTo(fileName2);
+					}
+					return fileName.compareTo(fileName2);
+				}
+				return 1;
+
+			});
+
+			for (String file : files) {
+				entries.add(new FileEntry(file, FileSystem.getName(file), FileSystem.isFile(file)));
+			}
+			myListAdapter.updateEntries(entries);
+		});
+	}
+
+	@Override
+	public void onEntryClicked(EntryListAdapter.Entry entry, View view, int position) {
+		if (entry == null) return;
+
+		if (entry instanceof FileEntry) {
+			FileEntry fileEntry = (FileEntry) entry;
+			if (fileEntry.getCommand() != null) {
+				if (fileEntry.getCommand().getVisible(false)) {
+					fileEntry.getCommand().run();
+				}
+			} else if (fileEntry.isFile()) {
+				String filePath = fileEntry.getFilePath();
+				App.getOpenFileService().openFile(filePath,true);
+					//App.getMainUI().openFile(filePath);
+			} else if (fileEntry.isBackEntry()) {
+				String dir = fileEntry.getFilePath();
+				if (dir != null)
+					App.getFileBrowserService().folderOpen(dir);
+
+			} else {
+				String path = fileEntry.getFilePath();
+				if (path != null) {
+
+					App.getFileBrowserService().folderOpen(path);
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean onEntryLongPressed(EntryListAdapter.Entry entry, View view, int position) {
+		return false;
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileBrowserService.java b/app/src/main/java/com/apkide/ui/browsers/file/FileBrowserService.java
new file mode 100644
index 0000000..eab451e
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/browsers/file/FileBrowserService.java
@@ -0,0 +1,51 @@
+package com.apkide.ui.browsers.file;
+
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.common.FileSystem;
+import com.apkide.ui.App;
+
+public class FileBrowserService {
+
+	public interface FileBrowserServiceListener {
+		void folderOpened(String folderPath);
+	}
+
+	private SharedPreferences myPreferences;
+	private FileBrowserServiceListener myListener;
+
+
+	public void setFileBrowserServiceListener(FileBrowserServiceListener listener) {
+		myListener = listener;
+	}
+
+	public void folderOpen(@NonNull String folderPath) {
+		if (!FileSystem.isDirectory(folderPath)) return;
+		getPreferences().edit().putString("open.folder", folderPath).apply();
+		if (myListener != null)
+			myListener.folderOpened(folderPath);
+	}
+
+	@NonNull
+	public String getFolderPath() {
+		String path = getPreferences().getString("open.folder", null);
+		if (path == null || !FileSystem.isDirectory(path)) {
+			path = getDefaultFolderPath();
+			FileSystem.mkdirs(path);
+		}
+		return path;
+	}
+
+	@NonNull
+	public String getDefaultFolderPath() {
+		return App.getHomeDir().getAbsolutePath();
+	}
+
+	private SharedPreferences getPreferences() {
+		if (myPreferences == null)
+			myPreferences = App.getPreferences("FileBrowserService");
+		return myPreferences;
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileEntry.java b/app/src/main/java/com/apkide/ui/browsers/file/FileEntry.java
index ecb63b9..fa81a69 100644
--- a/app/src/main/java/com/apkide/ui/browsers/file/FileEntry.java
+++ b/app/src/main/java/com/apkide/ui/browsers/file/FileEntry.java
@@ -1,161 +1,83 @@
 package com.apkide.ui.browsers.file;
 
-import com.apkide.ui.FileSystem;
-import com.apkide.ui.R;
-import com.apkide.ui.util.EntryAdapter;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.List;
-
-public class FileEntry implements EntryAdapter.Entry, Comparable<FileEntry> {
-
-    private final String myFilePath;
-
-    public FileEntry(String filePath) {
-        myFilePath = filePath;
-    }
-
-    public boolean isBinary() {
-        return FileSystem.isBinary(myFilePath);
-    }
-
-    public boolean exists() {
-        return FileSystem.exists(myFilePath);
-    }
-
-    public boolean isFile() {
-        return FileSystem.isFile(myFilePath);
-    }
-
-    public boolean isNormalFile() {
-        return FileSystem.isNormalFile(myFilePath);
-    }
-
-    public boolean isDirectory() {
-        return FileSystem.isDirectory(myFilePath);
-    }
-
-    public boolean isNormalDirectory() {
-        return FileSystem.isNormalDirectory(myFilePath);
-    }
-
-    public boolean isJarEntry() {
-        return FileSystem.isJarEntry(myFilePath);
-    }
-
-    public boolean isJarFile() {
-        return FileSystem.isJar(myFilePath);
-    }
-
-    public boolean isJarFileEntry() {
-        return FileSystem.isJarFileEntry(myFilePath);
-    }
-
-    public boolean isJarDirectoryEntry() {
-        return FileSystem.isJarDirectoryEntry(myFilePath);
-    }
 
-    public String getJarFilePath() {
-        return FileSystem.getEnclosingJar(myFilePath);
-    }
-
-    public String getParentPath(String dirName) {
-        return FileSystem.getEnclosingDir(myFilePath, dirName);
-    }
-
-    public Reader getReader() throws IOException {
-        return FileSystem.readFile(myFilePath);
-    }
-
-    public void delete() throws IOException {
-        FileSystem.delete(myFilePath);
-    }
-
-    public void rename(String newFileName) throws IOException {
-        FileSystem.rename(myFilePath, getParentPath() + File.separator + newFileName);
-    }
-
-    public long getLength() {
-        return FileSystem.getLength(myFilePath);
-    }
-
-    public long getLastModified() {
-        return FileSystem.getLastModified(myFilePath);
-    }
-
-    public String getName() {
-        return FileSystem.getName(myFilePath);
-    }
-
-    public String getExtensionName() {
-        return FileSystem.getExtension(myFilePath);
-    }
-
-    public String getFilePath() {
-        return myFilePath;
-    }
-
-    public String getParentPath() {
-        return FileSystem.getParentDirPath(myFilePath);
-    }
-
-    public List<String> getChildren() {
-        return FileSystem.getChildEntries(myFilePath);
-    }
-
-    @Override
-    public int compareTo(FileEntry o) {
-        //TODO: 文件类型排序
-        return 0;
-    }
-
-
-    public int getIcon() {
-        if (isJarFile()) {
-            return R.mipmap.file_type_unknown;
-        }
+import com.apkide.common.EntryListAdapter;
+import com.apkide.common.FileSystem;
+import com.apkide.ui.App;
+import com.apkide.ui.AppCommands;
+import com.apkide.ui.R;
 
-        if (isDirectory()) {
-            if (getName().startsWith(".")) {
-                return R.mipmap.folder_hidden;
-            }
-            return R.mipmap.folder;
-        }
-        String name = getName();
-        switch (name) {
-            case "build.gradle":
-            case "settings.gradle":
-            case "gradle.properties":
-            case ".classpath":
-            case ".project":
-            case "apktool.yml":
-                return R.mipmap.project_properties;
-        }
-        String extension = getExtensionName();
-        switch (extension) {
-            case ".java":
-            case ".class":
-                return R.mipmap.file_type_java;
-            case ".c":
-                return R.mipmap.file_type_c;
-            case ".cpp":
-                return R.mipmap.file_type_cpp;
-            case ".css":
-                return R.mipmap.file_type_css;
-            case ".h":
-                return R.mipmap.file_type_h;
-            case ".html":
-                return R.mipmap.file_type_html;
-            case ".xml":
-                return R.mipmap.file_type_xml;
-            case ".js":
-                return R.mipmap.file_type_js;
-            case ".txt":
-                return R.mipmap.file_type_txt;
-            default:
-                return R.mipmap.file_type_unknown;
-        }
-    }
+public class FileEntry implements EntryListAdapter.Entry {
+
+	private String filePath;
+	private String label;
+	private int icon;
+	private boolean isFile;
+	private AppCommands.BrowserCommand command;
+
+	public FileEntry(String filePath, String label, boolean isFile) {
+		this.filePath = filePath;
+		this.label = label;
+		if (isFile) {
+			this.icon = FileIcons.getIcon(filePath);
+		} else if (!isBackEntry()) {
+			if (isHidden(filePath)) {
+				this.icon = R.mipmap.folder_hidden;
+			} else {
+				this.icon = R.mipmap.folder;
+			}
+		} else {
+			this.icon = R.mipmap.folder_open;
+		}
+		this.isFile = isFile;
+	}
+
+	public FileEntry(AppCommands.BrowserCommand command) {
+		this.command = command;
+
+		icon = command.getIcon();
+		int label = command.getLabel();
+		if (label != 0) {
+			this.label = App.getContext().getResources().getString(label);
+		}
+	}
+
+	public static boolean isHidden(String filePath) {
+		String name = FileSystem.getName(filePath);
+		return name.startsWith(".") ||
+				name.startsWith("bin") ||
+				name.startsWith(".obj") ||
+				name.startsWith("build") ||
+				name.startsWith("gradle");
+	}
+
+	public boolean isBackEntry() {
+		if (isFile) return false;
+		return label.equals("...");
+	}
+
+	public boolean isDir() {
+		if (isFile) return false;
+		return !isBackEntry();
+	}
+
+	public boolean isFile() {
+		return isFile;
+	}
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public int getIcon() {
+		return icon;
+	}
+
+	public AppCommands.BrowserCommand getCommand() {
+		return command;
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileEntryAdapter.java b/app/src/main/java/com/apkide/ui/browsers/file/FileEntryAdapter.java
index 7663d6c..e5de64d 100644
--- a/app/src/main/java/com/apkide/ui/browsers/file/FileEntryAdapter.java
+++ b/app/src/main/java/com/apkide/ui/browsers/file/FileEntryAdapter.java
@@ -1,33 +1,36 @@
 package com.apkide.ui.browsers.file;
 
+import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.apkide.common.EntryListAdapter;
 import com.apkide.ui.R;
-import com.apkide.ui.util.EntryAdapter;
 
-public class FileEntryAdapter extends EntryAdapter {
-    @Override
-    protected int getEntryType(@NonNull Entry entry, int position) {
-        return 0;
-    }
+public class FileEntryAdapter extends EntryListAdapter {
+	@Override
+	protected int getEntryType(@NonNull Entry entry, int position) {
+		return 0;
+	}
 
-    @NonNull
-    @Override
-    protected RecyclerView.ViewHolder holderCreated(@NonNull ViewGroup parent, int entryType) {
-        return new FileEntryHolder(foundView(R.layout.browser_file_entry));
-    }
+	@NonNull
+	@Override
+	protected RecyclerView.ViewHolder holderCreated(@NonNull ViewGroup parent, int entryType) {
+		return new FileEntryViewHolder(foundView(R.layout.browser_file_entry));
+	}
 
-    @Override
-    protected void holderBound(@NonNull Entry entry, @NonNull RecyclerView.ViewHolder holder, int position) {
-        if (entry instanceof FileEntry) {
-            FileEntry fileEntry = (FileEntry) entry;
-            FileEntryHolder entryHolder = (FileEntryHolder) holder;
-
-            entryHolder.myIcon.setImageResource(fileEntry.getIcon());
-            entryHolder.myLabel.setText(fileEntry.getName());
-        }
-    }
+	@Override
+	protected void holderBound(@NonNull Entry entry, @NonNull RecyclerView.ViewHolder holder, int position) {
+		if (entry instanceof FileEntry){
+			FileEntryViewHolder viewHolder= (FileEntryViewHolder) holder;
+			if (((FileEntry) entry).getIcon()!=0) {
+				viewHolder.icon.setImageResource(((FileEntry) entry).getIcon());
+			}else{
+				viewHolder.icon.setVisibility(View.GONE);
+			}
+			viewHolder.label.setText(((FileEntry) entry).getLabel());
+		}
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileEntryHolder.java b/app/src/main/java/com/apkide/ui/browsers/file/FileEntryHolder.java
deleted file mode 100644
index 2639cdb..0000000
--- a/app/src/main/java/com/apkide/ui/browsers/file/FileEntryHolder.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.apkide.ui.browsers.file;
-
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.apkide.ui.R;
-
-public class FileEntryHolder extends RecyclerView.ViewHolder {
-    public TextView myLabel;
-    public ImageView myIcon;
-
-    public FileEntryHolder(@NonNull View itemView) {
-        super(itemView);
-        myLabel = itemView.findViewById(R.id.fileEntryLabel);
-        myIcon = itemView.findViewById(R.id.fileEntryIcon);
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileEntryViewHolder.java b/app/src/main/java/com/apkide/ui/browsers/file/FileEntryViewHolder.java
new file mode 100644
index 0000000..ce15204
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/browsers/file/FileEntryViewHolder.java
@@ -0,0 +1,21 @@
+package com.apkide.ui.browsers.file;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.apkide.ui.R;
+
+
+public class FileEntryViewHolder extends RecyclerView.ViewHolder {
+	public TextView label;
+	public ImageView icon;
+	public FileEntryViewHolder(@NonNull View itemView) {
+		super(itemView);
+		label=itemView.findViewById(R.id.fileEntryLabel);
+		icon=itemView.findViewById(R.id.fileEntryIcon);
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/browsers/file/FileIcons.java b/app/src/main/java/com/apkide/ui/browsers/file/FileIcons.java
new file mode 100644
index 0000000..e852bda
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/browsers/file/FileIcons.java
@@ -0,0 +1,43 @@
+package com.apkide.ui.browsers.file;
+
+
+import com.apkide.common.FileSystem;
+import com.apkide.ui.R;
+
+public class FileIcons {
+
+
+	public static int getIcon(String name){
+		String ext= FileSystem.getExtension(name).toLowerCase();
+		switch (ext){
+			case ".java":
+				return R.mipmap.file_type_java;
+			case ".xml":
+				return R.mipmap.file_type_xml;
+			case ".c":
+				return R.mipmap.file_type_c;
+			case ".cpp":
+			case ".cxx":
+				return R.mipmap.file_type_cpp;
+			case ".h":
+			case ".hpp":
+				return R.mipmap.file_type_h;
+			case ".html":
+				return R.mipmap.file_type_html;
+			case ".css":
+				return R.mipmap.file_type_css;
+			case ".js":
+				return R.mipmap.file_type_js;
+			case ".txt":
+			case ".log":
+				return R.mipmap.file_type_txt;
+			case ".classpath":
+			case ".project":
+			case ".pom":
+			case ".gradle":
+				return R.mipmap.project_properties;
+			default:
+				return R.mipmap.file_type_unknown;
+		}
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/browsers/find/FindBrowser.java b/app/src/main/java/com/apkide/ui/browsers/find/FindBrowser.java
deleted file mode 100644
index dfbd7df..0000000
--- a/app/src/main/java/com/apkide/ui/browsers/find/FindBrowser.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.apkide.ui.browsers.find;
-
-import android.content.Context;
-import android.widget.LinearLayout;
-
-import com.apkide.ui.browsers.Browser;
-
-public class FindBrowser extends LinearLayout implements Browser {
-    public FindBrowser(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void onSyncing() {
-
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/browsers/problem/ProblemBrowser.java b/app/src/main/java/com/apkide/ui/browsers/problem/ProblemBrowser.java
index 7364183..6abbdff 100644
--- a/app/src/main/java/com/apkide/ui/browsers/problem/ProblemBrowser.java
+++ b/app/src/main/java/com/apkide/ui/browsers/problem/ProblemBrowser.java
@@ -1,17 +1,20 @@
 package com.apkide.ui.browsers.problem;
 
 import android.content.Context;
-import android.widget.LinearLayout;
 
-import com.apkide.ui.browsers.Browser;
+import androidx.annotation.NonNull;
 
-public class ProblemBrowser extends LinearLayout implements Browser {
-    public ProblemBrowser(Context context) {
-        super(context);
-    }
+import com.apkide.ui.browsers.BrowserLayout;
 
-    @Override
-    public void onSyncing() {
+public class ProblemBrowser extends BrowserLayout {
 
-    }
+	public ProblemBrowser(Context context) {
+		super(context);
+	}
+
+	@NonNull
+	@Override
+	public String getPreferencesName() {
+		return "ProblemBrowser";
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/browsers/search/SearchBrowser.java b/app/src/main/java/com/apkide/ui/browsers/search/SearchBrowser.java
new file mode 100644
index 0000000..f4a04f1
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/browsers/search/SearchBrowser.java
@@ -0,0 +1,20 @@
+package com.apkide.ui.browsers.search;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.ui.browsers.BrowserLayout;
+
+public class SearchBrowser extends BrowserLayout {
+
+	public SearchBrowser(Context context) {
+		super(context);
+	}
+
+	@NonNull
+	@Override
+	public String getPreferencesName() {
+		return "SearchBrowser";
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/commands/ExitApp.java b/app/src/main/java/com/apkide/ui/commands/ExitApp.java
deleted file mode 100644
index eb2d35d..0000000
--- a/app/src/main/java/com/apkide/ui/commands/ExitApp.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.apkide.ui.commands;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.App;
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class ExitApp implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionExit;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Exit";
-    }
-
-    @Override
-    public boolean run() {
-        App.getMainUI().exitApp();
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/ExitCommand.java b/app/src/main/java/com/apkide/ui/commands/ExitCommand.java
new file mode 100644
index 0000000..66699b0
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/commands/ExitCommand.java
@@ -0,0 +1,21 @@
+package com.apkide.ui.commands;
+
+import com.apkide.ui.AppCommands;
+import com.apkide.ui.R;
+
+public class ExitCommand implements AppCommands.MenuCommand {
+	@Override
+	public int getId() {
+		return R.id.mainActionExit;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	@Override
+	public boolean run() {
+		return false;
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/commands/GotoSettings.java b/app/src/main/java/com/apkide/ui/commands/GotoSettings.java
deleted file mode 100644
index 3e7ba1f..0000000
--- a/app/src/main/java/com/apkide/ui/commands/GotoSettings.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.apkide.ui.commands;
-
-import android.content.Intent;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.App;
-import com.apkide.ui.R;
-import com.apkide.ui.preferences.PreferencesUI;
-import com.apkide.ui.util.MenuCommand;
-
-public class GotoSettings implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionSettings;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Settings";
-    }
-
-    @Override
-    public boolean run() {
-        App.getMainUI().startActivity(new Intent(App.getMainUI(), PreferencesUI.class));
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/MakeProject.java b/app/src/main/java/com/apkide/ui/commands/MakeProject.java
deleted file mode 100644
index f70ec59..0000000
--- a/app/src/main/java/com/apkide/ui/commands/MakeProject.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.apkide.ui.commands;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class MakeProject implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionRun;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Make";
-    }
-
-    @Override
-    public boolean run() {
-        return false;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/Redo.java b/app/src/main/java/com/apkide/ui/commands/Redo.java
deleted file mode 100644
index 2b6073a..0000000
--- a/app/src/main/java/com/apkide/ui/commands/Redo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.apkide.ui.commands;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class Redo implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionRedo;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Redo";
-    }
-
-    @Override
-    public boolean run() {
-        return false;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/Undo.java b/app/src/main/java/com/apkide/ui/commands/Undo.java
deleted file mode 100644
index 6939593..0000000
--- a/app/src/main/java/com/apkide/ui/commands/Undo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.apkide.ui.commands;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class Undo implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionUndo;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Undo";
-    }
-
-    @Override
-    public boolean run() {
-        return false;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/view/ViewBuild.java b/app/src/main/java/com/apkide/ui/commands/view/ViewBuild.java
deleted file mode 100644
index a9a2545..0000000
--- a/app/src/main/java/com/apkide/ui/commands/view/ViewBuild.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.apkide.ui.commands.view;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.App;
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class ViewBuild implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionViewBuild;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Build";
-    }
-
-    @Override
-    public boolean run() {
-        App.getMainUI().toggleBuildBrowser();
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/view/ViewFiles.java b/app/src/main/java/com/apkide/ui/commands/view/ViewFiles.java
deleted file mode 100644
index 5c8f49c..0000000
--- a/app/src/main/java/com/apkide/ui/commands/view/ViewFiles.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.apkide.ui.commands.view;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.App;
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class ViewFiles implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionViewFiles;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Files";
-    }
-
-    @Override
-    public boolean run() {
-        App.getMainUI().toggleFileBrowser();
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/view/ViewFind.java b/app/src/main/java/com/apkide/ui/commands/view/ViewFind.java
deleted file mode 100644
index 436aa37..0000000
--- a/app/src/main/java/com/apkide/ui/commands/view/ViewFind.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.apkide.ui.commands.view;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.App;
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class ViewFind implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionViewFind;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Find";
-    }
-
-    @Override
-    public boolean run() {
-        App.getMainUI().toggleFindBrowser();
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/commands/view/ViewProblem.java b/app/src/main/java/com/apkide/ui/commands/view/ViewProblem.java
deleted file mode 100644
index c41248b..0000000
--- a/app/src/main/java/com/apkide/ui/commands/view/ViewProblem.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.apkide.ui.commands.view;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.ui.App;
-import com.apkide.ui.R;
-import com.apkide.ui.util.MenuCommand;
-
-public class ViewProblem implements MenuCommand {
-    @Override
-    public int getId() {
-        return R.id.mainActionViewProblems;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Problems";
-    }
-
-    @Override
-    public boolean run() {
-        App.getMainUI().toggleProblemBrowser();
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/editor/CodeEditText.java b/app/src/main/java/com/apkide/ui/editor/CodeEditText.java
new file mode 100644
index 0000000..6ad6831
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/CodeEditText.java
@@ -0,0 +1,33 @@
+package com.apkide.ui.editor;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+
+public class CodeEditText extends ViewGroup {
+	public CodeEditText(Context context) {
+		super(context);
+		initView();
+	}
+
+	public CodeEditText(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public CodeEditText(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b) {
+		getChildAt(0).layout(0,0,r-l,b-t);
+	}
+
+
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/CodeEditTextEditorModel.java b/app/src/main/java/com/apkide/ui/editor/CodeEditTextEditorModel.java
new file mode 100644
index 0000000..4bdbfe4
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/CodeEditTextEditorModel.java
@@ -0,0 +1,9 @@
+package com.apkide.ui.editor;
+
+import com.apkide.ui.editor.internal.EditorModel;
+
+public class CodeEditTextEditorModel extends EditorModel {
+	public CodeEditTextEditorModel(){
+		super();
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/CodeEditTextHorizontalScrollView.java b/app/src/main/java/com/apkide/ui/editor/CodeEditTextHorizontalScrollView.java
new file mode 100644
index 0000000..cc070f2
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/CodeEditTextHorizontalScrollView.java
@@ -0,0 +1,26 @@
+package com.apkide.ui.editor;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.HorizontalScrollView;
+
+public class CodeEditTextHorizontalScrollView extends HorizontalScrollView {
+	public CodeEditTextHorizontalScrollView(Context context) {
+		super(context);
+		initView();
+	}
+
+	public CodeEditTextHorizontalScrollView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public CodeEditTextHorizontalScrollView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+		
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/CodeEditTextScrollView.java b/app/src/main/java/com/apkide/ui/editor/CodeEditTextScrollView.java
new file mode 100644
index 0000000..7f749d0
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/CodeEditTextScrollView.java
@@ -0,0 +1,26 @@
+package com.apkide.ui.editor;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+public class CodeEditTextScrollView extends ScrollView {
+	public CodeEditTextScrollView(Context context) {
+		super(context);
+		initView();
+	}
+
+	public CodeEditTextScrollView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public CodeEditTextScrollView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+		
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/CodeEditorView.java b/app/src/main/java/com/apkide/ui/editor/CodeEditorView.java
new file mode 100644
index 0000000..41f3d66
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/CodeEditorView.java
@@ -0,0 +1,28 @@
+package com.apkide.ui.editor;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.apkide.ui.editor.internal.EditorView;
+
+public class CodeEditorView extends EditorView {
+
+	public CodeEditorView(Context context) {
+		super(context);
+		initView();
+	}
+
+	public CodeEditorView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public CodeEditorView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+		
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/Model.java b/app/src/main/java/com/apkide/ui/editor/Model.java
new file mode 100644
index 0000000..a6ede2a
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/Model.java
@@ -0,0 +1,93 @@
+package com.apkide.ui.editor;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.common.Color;
+import com.apkide.common.TextStyle;
+
+import java.io.Reader;
+
+public interface Model {
+
+	void addModelListener(@NonNull ModelListener listener);
+
+	void removeModelListener(@NonNull ModelListener listener);
+
+	void insertLineBreak(int line, int column);
+
+	void insert(int line, int column, @NonNull CharSequence text);
+
+	void removeLineBreak(int line);
+
+	void remove(int line, int column);
+
+	void remove(int startLine, int startColumn, int endLine, int endColumn);
+
+	void replace(int startLine, int startColumn, int endLine, int endColumn, @NonNull CharSequence text);
+
+	char getChar(int line, int column);
+
+	@NonNull
+	String getText();
+
+	@NonNull
+	String getText(int startLine, int startColumn, int endLine, int endColumn);
+
+	@NonNull
+	Reader getReader();
+
+	@NonNull
+	Reader getReader(int startLine, int startColumn, int endLine, int endColumn);
+
+	int getLineCount();
+
+	int getLineLength(int line);
+
+	int getFullLineLength(int line);
+
+	@NonNull
+	String getLineText(int line);
+
+	@NonNull
+	String getFullLineText(int line);
+
+	@NonNull
+	String getLineBreak(int line);
+
+	@NonNull
+	String getLineBreak();
+
+	void setReadOnly(boolean readOnly);
+
+	boolean isReadOnly();
+
+	long getEditTimestamps();
+
+	void beginBatchEdit();
+
+	void endBatchEdit();
+
+	boolean isBatchEdit();
+
+	boolean canUndo();
+
+	boolean canRedo();
+
+	void undo();
+
+	void redo();
+
+	int getStyle(int line, int column);
+
+	TextStyle getDefaultTextStyle(int style);
+
+	boolean isColor(int line, int column);
+
+	Color getColor(int line, int column);
+
+	boolean isWarning(int line, int column);
+
+	boolean isError(int line, int column);
+
+	boolean isDeprecated(int line, int column);
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/ModelListener.java b/app/src/main/java/com/apkide/ui/editor/ModelListener.java
new file mode 100644
index 0000000..7d3a8ec
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/ModelListener.java
@@ -0,0 +1,8 @@
+package com.apkide.ui.editor;
+
+import androidx.annotation.NonNull;
+
+public interface ModelListener {
+	void insertUpdate(@NonNull Model model,int startLine,int startColumn,int endLine,int endColumn);
+	void removeUpdate(@NonNull Model model,int startLine,int startColumn,int endLine,int endColumn);
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/Buffers.java b/app/src/main/java/com/apkide/ui/editor/internal/Buffers.java
new file mode 100644
index 0000000..5023703
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/Buffers.java
@@ -0,0 +1,72 @@
+package com.apkide.ui.editor.internal;
+
+class Buffers {
+	 static char[] chars(int len) {
+		char[] buf;
+
+		synchronized (Buffers.class) {
+			buf = sChars;
+			sChars = null;
+		}
+
+		if (buf == null || buf.length < len)
+			buf = new char[len];
+		return buf;
+	}
+
+	 static float[] floats(int len) {
+		float[] buf;
+
+		synchronized (Buffers.class) {
+			buf = sFloats;
+			sFloats = null;
+		}
+
+		if (buf == null || buf.length < len)
+			buf = new float[len];
+		return buf;
+	}
+
+	public static int[] ints(int len) {
+		int[] buf;
+
+		synchronized (Buffers.class) {
+			buf = sInts;
+			sInts = null;
+		}
+
+		if (buf == null || buf.length < len)
+			buf = new int[len];
+		return buf;
+	}
+
+	 static void recycle(int[] temp) {
+		if (temp.length > 8192) return;
+
+		synchronized (Buffers.class) {
+			sInts = temp;
+		}
+	}
+
+	 static void recycle(float[] temp) {
+		if (temp.length > 8192) return;
+
+		synchronized (Buffers.class) {
+			sFloats = temp;
+		}
+	}
+
+
+	 static void recycle(char[] temp) {
+		if (temp.length > 8192) return;
+
+		synchronized (Buffers.class) {
+			sChars = temp;
+		}
+	}
+
+	private static int[] sInts = null;
+	private static char[] sChars = null;
+	private static float[] sFloats = null;
+
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/ConsoleView.java b/app/src/main/java/com/apkide/ui/editor/internal/ConsoleView.java
new file mode 100644
index 0000000..057ed17
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/ConsoleView.java
@@ -0,0 +1,26 @@
+package com.apkide.ui.editor.internal;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class ConsoleView extends View {
+	public ConsoleView(Context context) {
+		super(context);
+		initView();
+	}
+
+	public ConsoleView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public ConsoleView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+		
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/EditorModel.java b/app/src/main/java/com/apkide/ui/editor/internal/EditorModel.java
new file mode 100644
index 0000000..c118d54
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/EditorModel.java
@@ -0,0 +1,7 @@
+package com.apkide.ui.editor.internal;
+
+public class EditorModel extends TextModel{
+	public EditorModel(){
+		super();
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/EditorView.java b/app/src/main/java/com/apkide/ui/editor/internal/EditorView.java
new file mode 100644
index 0000000..ce7c186
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/EditorView.java
@@ -0,0 +1,25 @@
+package com.apkide.ui.editor.internal;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class EditorView extends ConsoleView{
+	public EditorView(Context context) {
+		super(context);
+		initView();
+	}
+
+	public EditorView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initView();
+	}
+
+	public EditorView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initView();
+	}
+
+	private void initView() {
+		
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/TextLine.java b/app/src/main/java/com/apkide/ui/editor/internal/TextLine.java
new file mode 100644
index 0000000..178acfc
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/TextLine.java
@@ -0,0 +1,53 @@
+package com.apkide.ui.editor.internal;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.text.GetChars;
+
+import androidx.annotation.NonNull;
+
+public interface TextLine extends GetChars, CharSequence {
+	void set(@NonNull CharSequence text);
+
+	void append(@NonNull CharSequence text);
+
+	void insert(int index, @NonNull CharSequence text);
+
+	void remove(int index);
+
+	void remove(int start, int end);
+
+	void setDelimiter(@NonNull String delimiter);
+
+	@NonNull
+	String getDelimiter();
+
+	@Override
+	char charAt(int index);
+
+	@Override
+	int length();
+
+	int getFullLength();
+
+	@NonNull
+	@Override
+	CharSequence subSequence(int start, int end);
+
+	@NonNull
+	String getText();
+
+	@NonNull
+	String getFullText();
+
+	@NonNull
+	@Override
+	String toString();
+
+	void drawText(@NonNull Canvas canvas, int start, int end, float x, float y,@NonNull Paint paint);
+
+	float measureText(int start, int end,@NonNull Paint paint);
+
+	void getTextWidths(int start, int end,@NonNull float[] widths,@NonNull Paint paint);
+
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/TextLineBuffer.java b/app/src/main/java/com/apkide/ui/editor/internal/TextLineBuffer.java
new file mode 100644
index 0000000..64840b5
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/TextLineBuffer.java
@@ -0,0 +1,138 @@
+package com.apkide.ui.editor.internal;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.os.Build;
+import android.text.SpannableStringBuilder;
+
+import androidx.annotation.NonNull;
+
+
+public class TextLineBuffer implements TextLine {
+	private static final int LIMIT = 32;
+	private final SpannableStringBuilder myBuilder = new SpannableStringBuilder();
+	private String myDelimiter;
+
+	public TextLineBuffer(){
+		this("","");
+	}
+
+	public TextLineBuffer(@NonNull CharSequence text, @NonNull String delimiter) {
+		myBuilder.append(text);
+		myDelimiter = delimiter;
+	}
+
+	@Override
+	public void set(@NonNull CharSequence text) {
+		myBuilder.clear();
+		myBuilder.append(text);
+	}
+
+	@Override
+	public void append(@NonNull CharSequence text) {
+		myBuilder.append(text);
+	}
+
+	@Override
+	public void insert(int index, @NonNull CharSequence text) {
+		myBuilder.insert(index, text);
+	}
+
+	@Override
+	public void remove(int index) {
+		myBuilder.delete(index, index + 1);
+	}
+
+	@Override
+	public void remove(int start, int end) {
+		myBuilder.delete(start, end);
+	}
+
+	@Override
+	public void setDelimiter(@NonNull String delimiter) {
+		myDelimiter = delimiter;
+	}
+
+	@NonNull
+	@Override
+	public String getDelimiter() {
+		return myDelimiter;
+	}
+
+	@Override
+	public char charAt(int index) {
+		if (index < myBuilder.length()) {
+			return myBuilder.charAt(index);
+		}
+		return myDelimiter.charAt(index - myBuilder.length());
+	}
+
+	@Override
+	public int length() {
+		return myBuilder.length();
+	}
+
+	@Override
+	public int getFullLength() {
+		return myBuilder.length() + myDelimiter.length();
+	}
+
+	@NonNull
+	@Override
+	public CharSequence subSequence(int start, int end) {
+		return myBuilder.subSequence(start, end);
+	}
+
+	@NonNull
+	@Override
+	public String getText() {
+		return myBuilder.toString();
+	}
+
+	@NonNull
+	@Override
+	public String getFullText() {
+		return myBuilder.toString() + myDelimiter;
+	}
+
+	@Override
+	public void drawText(@NonNull Canvas canvas, int start, int end, float x, float y, @NonNull Paint paint) {
+		if (length() < LIMIT || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			canvas.drawText(myBuilder, start, end, x, y, paint);
+			return;
+		}
+		char[] temp = Buffers.chars(end - start);
+		getChars(start, end, temp, 0);
+		canvas.drawText(temp, 0, end - start, x, y, paint);
+		Buffers.recycle(temp);
+	}
+
+	@Override
+	public float measureText(int start, int end, @NonNull Paint paint) {
+		if (length() < LIMIT || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			return paint.measureText(myBuilder, start, end);
+		}
+		char[] temp = Buffers.chars(end - start);
+		getChars(start, end, temp, 0);
+		float w = paint.measureText(temp, 0, end - start);
+		Buffers.recycle(temp);
+		return w;
+	}
+
+	@Override
+	public void getTextWidths(int start, int end, @NonNull float[] widths, @NonNull Paint paint) {
+		if (length() < LIMIT || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			paint.getTextWidths(myBuilder, start, end, widths);
+			return;
+		}
+		char[] temp = Buffers.chars(end - start);
+		getChars(start, end, temp, 0);
+		paint.getTextWidths(temp, 0, end - start, widths);
+		Buffers.recycle(temp);
+	}
+
+	@Override
+	public void getChars(int start, int end, char[] dest, int destoff) {
+		myBuilder.getChars(start, end, dest, destoff);
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/TextLineImpl.java b/app/src/main/java/com/apkide/ui/editor/internal/TextLineImpl.java
new file mode 100644
index 0000000..46f3dbc
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/TextLineImpl.java
@@ -0,0 +1,135 @@
+package com.apkide.ui.editor.internal;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.text.GetChars;
+
+import androidx.annotation.NonNull;
+
+public class TextLineImpl implements TextLine {
+
+	private char[] myChars;
+	private String myDelimiter;
+
+	public TextLineImpl(){
+		myChars=new char[0];
+		myDelimiter="";
+	}
+
+	public TextLineImpl(@NonNull CharSequence text, String delimiter) {
+		myChars = new char[text.length()];
+		if (text instanceof GetChars){
+			((GetChars) text).getChars(0,text.length(),myChars,0);
+		}else{
+			for (int i = 0; i < text.length(); i++) {
+				 myChars[i]=text.charAt(i);
+			}
+		}
+		myDelimiter = delimiter;
+	}
+
+	@Override
+	public void set(@NonNull CharSequence text) {
+		myChars = new char[text.length()];
+		if (text instanceof GetChars){
+			((GetChars) text).getChars(0,text.length(),myChars,0);
+		}else{
+			for (int i = 0; i < text.length(); i++) {
+				myChars[i]=text.charAt(i);
+			}
+		}
+	}
+
+	@Override
+	public void append(@NonNull CharSequence text) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void insert(int index, @NonNull CharSequence text) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void remove(int index) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void remove(int start, int end) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setDelimiter(@NonNull String delimiter) {
+		myDelimiter = delimiter;
+	}
+
+	@NonNull
+	@Override
+	public String getDelimiter() {
+		return myDelimiter;
+	}
+
+	@Override
+	public char charAt(int index) {
+		if (index < myChars.length) {
+			return myChars[index];
+		}
+		return myDelimiter.charAt(index - myChars.length);
+	}
+
+	@Override
+	public int length() {
+		return myChars.length;
+	}
+
+	@Override
+	public int getFullLength() {
+		return myChars.length + myDelimiter.length();
+	}
+
+	@NonNull
+	@Override
+	public CharSequence subSequence(int start, int end) {
+		return String.valueOf(myChars, start, end);
+	}
+
+	@NonNull
+	@Override
+	public String getText() {
+		return String.valueOf(myChars);
+	}
+
+	@NonNull
+	@Override
+	public String getFullText() {
+		return String.valueOf(myChars) + myDelimiter;
+	}
+
+	@NonNull
+	@Override
+	public String toString() {
+		return getFullText();
+	}
+
+	@Override
+	public void drawText(@NonNull Canvas canvas, int start, int end, float x, float y, @NonNull Paint paint) {
+		canvas.drawText(myChars, start, end - start, x, y, paint);
+	}
+
+	@Override
+	public float measureText(int start, int end, @NonNull Paint paint) {
+		return paint.measureText(myChars, start, end - start);
+	}
+
+	@Override
+	public void getTextWidths(int start, int end, @NonNull float[] widths, @NonNull Paint paint) {
+		paint.getTextWidths(myChars, start, end - start, widths);
+	}
+
+	@Override
+	public void getChars(int start, int end, char[] dest, int destoff) {
+		System.arraycopy(myChars, start, dest, destoff, end - start);
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/editor/internal/TextModel.java b/app/src/main/java/com/apkide/ui/editor/internal/TextModel.java
new file mode 100644
index 0000000..739d9b3
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/editor/internal/TextModel.java
@@ -0,0 +1,278 @@
+package com.apkide.ui.editor.internal;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.common.Color;
+import com.apkide.common.TextStyle;
+import com.apkide.ui.editor.Model;
+import com.apkide.ui.editor.ModelListener;
+
+import java.io.Reader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+public class TextModel implements Model {
+
+	private final List<TextLine> myLines = new LinkedList<>();
+	private int mySpanLine;
+	private final TextLineBuffer myLineBuffer = new TextLineBuffer();
+	private String myLineBreak;
+	private final Vector<ModelListener> myListeners = new Vector<>(1);
+	private long myEditTimestamps;
+
+	public TextModel() {
+		myLineBreak = System.lineSeparator();
+		myLines.add(new TextLineImpl());
+		myEditTimestamps = -1;
+		switchLine(0);
+	}
+
+	@Override
+	public void addModelListener(@NonNull ModelListener listener) {
+		if (!myListeners.contains(listener)) {
+			myListeners.add(listener);
+		}
+	}
+
+	@Override
+	public void removeModelListener(@NonNull ModelListener listener) {
+		myListeners.remove(listener);
+	}
+
+	private void switchLine(int line) {
+		if (mySpanLine == line) return;
+
+		if (mySpanLine != -1) {
+			myLines.set(mySpanLine, new TextLineImpl(
+					myLineBuffer.getText(),
+					myLineBuffer.getDelimiter()));
+		}
+
+		mySpanLine = line;
+		myLineBuffer.set(myLines.get(line).getText());
+		myLineBuffer.setDelimiter(myLines.get(line).getDelimiter());
+	}
+
+	protected TextLine lineAt(int line) {
+		if (line == mySpanLine) {
+			return myLineBuffer;
+		}
+		return myLines.get(line);
+	}
+
+	@Override
+	public void insertLineBreak(int line, int column) {
+
+	}
+
+	@Override
+	public void insert(int line, int column, @NonNull CharSequence text) {
+		synchronized (this) {
+			switchLine(line);
+
+		}
+	}
+
+	@Override
+	public void removeLineBreak(int line) {
+		synchronized (this) {
+			switchLine(line);
+
+		}
+	}
+
+	@Override
+	public void remove(int line, int column) {
+		synchronized (this) {
+			switchLine(line);
+			myLineBuffer.remove(column);
+		}
+	}
+
+	@Override
+	public void remove(int startLine, int startColumn, int endLine, int endColumn) {
+		synchronized (this) {
+			if (startLine == endLine) {
+				switchLine(startLine);
+				myLineBuffer.remove(startColumn, endColumn);
+			} else {
+
+			}
+		}
+	}
+
+	@Override
+	public void replace(int startLine, int startColumn, int endLine, int endColumn, @NonNull CharSequence text) {
+
+	}
+
+	@Override
+	public char getChar(int line, int column) {
+		return lineAt(line).charAt(column);
+	}
+
+	@NonNull
+	@Override
+	public String getText() {
+		return getText(0, 0, getLineCount(), 0);
+	}
+
+	@NonNull
+	@Override
+	public String getText(int startLine, int startColumn, int endLine, int endColumn) {
+		StringBuilder builder = new StringBuilder();
+
+		if (endLine >= getLineCount()) {
+			endLine = getLineCount() - 1;
+			endColumn = getFullLineLength(endLine);
+		}
+
+		if (endColumn >= getFullLineLength(endLine)) endColumn = getFullLineLength(endLine);
+
+		builder.append(lineAt(startLine).getFullText().substring(startColumn));
+
+		for (int i = startLine + 1; i < endLine; i++) {
+			builder.append(lineAt(i).getFullText());
+		}
+		builder.append(lineAt(endLine).getFullText().substring(0, endColumn));
+		return builder.toString();
+	}
+
+	@NonNull
+	@Override
+	public Reader getReader() {
+		return getReader(0, 0, getLineCount(), 0);
+	}
+
+	@NonNull
+	@Override
+	public Reader getReader(int startLine, int startColumn, int endLine, int endColumn) {
+
+		return null;
+	}
+
+	@Override
+	public int getLineCount() {
+		return myLines.size();
+	}
+
+	@Override
+	public int getLineLength(int line) {
+		return lineAt(line).length();
+	}
+
+	@Override
+	public int getFullLineLength(int line) {
+		return lineAt(line).getFullLength();
+	}
+
+	@NonNull
+	@Override
+	public String getLineText(int line) {
+		return lineAt(line).getText();
+	}
+
+	@NonNull
+	@Override
+	public String getFullLineText(int line) {
+		return lineAt(line).getFullText();
+	}
+
+	@NonNull
+	@Override
+	public String getLineBreak(int line) {
+		return lineAt(line).getDelimiter();
+	}
+
+	@NonNull
+	@Override
+	public String getLineBreak() {
+		return myLineBreak;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return false;
+	}
+
+	@Override
+	public long getEditTimestamps() {
+		return myEditTimestamps;
+	}
+
+	@Override
+	public void beginBatchEdit() {
+
+	}
+
+	@Override
+	public void endBatchEdit() {
+
+	}
+
+	@Override
+	public boolean isBatchEdit() {
+		return false;
+	}
+
+	@Override
+	public boolean canUndo() {
+		return false;
+	}
+
+	@Override
+	public boolean canRedo() {
+		return false;
+	}
+
+	@Override
+	public void undo() {
+
+	}
+
+	@Override
+	public void redo() {
+
+	}
+
+	@Override
+	public int getStyle(int line, int column) {
+		return 0;
+	}
+
+	@Override
+	public TextStyle getDefaultTextStyle(int style) {
+		return null;
+	}
+
+	@Override
+	public boolean isColor(int line, int column) {
+		return false;
+	}
+
+	@Override
+	public Color getColor(int line, int column) {
+		return null;
+	}
+
+	@Override
+	public boolean isWarning(int line, int column) {
+		return false;
+	}
+
+	@Override
+	public boolean isError(int line, int column) {
+		return false;
+	}
+
+	@Override
+	public boolean isDeprecated(int line, int column) {
+		return false;
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/project/ApkToolProject.java b/app/src/main/java/com/apkide/ui/project/ApkToolProject.java
deleted file mode 100644
index e5aa554..0000000
--- a/app/src/main/java/com/apkide/ui/project/ApkToolProject.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.apkide.ui.project;
-
-import static com.apkide.ui.FileSystem.exists;
-import static java.io.File.separator;
-
-
-public class ApkToolProject implements ConfigurationMarker {
-
-    public static boolean isProjectRoot(String filePath) {
-        return exists(getApkToolYml(filePath)) && exists(getAndroidManifestXml(filePath));
-    }
-
-    public static String getApkToolYml(String rootPath) {
-        return rootPath + separator + "apktool.yml";
-    }
-
-    public static String getAndroidManifestXml(String rootPath) {
-        return rootPath + separator + "AndroidManifest.xml";
-    }
-
-    public static String getResourcesArsc(String rootPath) {
-        return rootPath + separator + "resources.arsc";
-    }
-
-    public static String getResDir(String rootPath) {
-        return rootPath + separator + "res";
-    }
-
-    public static String getAssetsDir(String rootPath) {
-        return rootPath + separator + "assets";
-    }
-
-    public static String getOriginalDir(String rootPath) {
-        return rootPath + separator + "original";
-    }
-
-    public static String getSmaliDir(String rootPath) {
-        return rootPath + separator + "smali";
-    }
-
-}
diff --git a/app/src/main/java/com/apkide/ui/project/ConfigurationMarker.java b/app/src/main/java/com/apkide/ui/project/ConfigurationMarker.java
deleted file mode 100644
index ecfb6e5..0000000
--- a/app/src/main/java/com/apkide/ui/project/ConfigurationMarker.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.apkide.ui.project;
-
-public interface ConfigurationMarker {
-}
diff --git a/app/src/main/java/com/apkide/ui/services/file/OpenFileModel.java b/app/src/main/java/com/apkide/ui/services/file/OpenFileModel.java
deleted file mode 100644
index 0d099b8..0000000
--- a/app/src/main/java/com/apkide/ui/services/file/OpenFileModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.apkide.ui.services.file;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.FileHighlights;
-
-import java.util.List;
-
-public interface OpenFileModel {
-
-
-    void highlighting(FileHighlights highlights);
-
-    void semanticHighlighting(FileHighlights highlights);
-
-    @NonNull
-    List<String> getContents();
-
-    @NonNull
-    String getFilePath();
-
-    void close();
-}
diff --git a/app/src/main/java/com/apkide/ui/services/file/OpenFileProvider.java b/app/src/main/java/com/apkide/ui/services/file/OpenFileProvider.java
deleted file mode 100644
index 1f85aa4..0000000
--- a/app/src/main/java/com/apkide/ui/services/file/OpenFileProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.apkide.ui.services.file;
-
-public interface OpenFileProvider {
-
-    OpenFileModel openFile(String filePath);
-
-    OpenFileModel closeFile(String filePath);
-}
diff --git a/app/src/main/java/com/apkide/ui/services/file/OpenFileService.java b/app/src/main/java/com/apkide/ui/services/file/OpenFileService.java
index a59fdb1..5bad856 100644
--- a/app/src/main/java/com/apkide/ui/services/file/OpenFileService.java
+++ b/app/src/main/java/com/apkide/ui/services/file/OpenFileService.java
@@ -1,4 +1,105 @@
 package com.apkide.ui.services.file;
 
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.common.FileHighlights;
+import com.apkide.ui.App;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class OpenFileService {
+
+	public interface OpenFileEditor {
+
+		OpenFileModel openFile(String filePath);
+
+		void openEditor(String filePath);
+
+		void closeFile(String filePath);
+
+		String getVisibleFile();
+
+		OpenFileModel getFile(String filePath);
+	}
+
+	public interface OpenFileModel {
+
+		void highlighting(FileHighlights highlights);
+
+		void semanticHighlighting(FileHighlights highlights);
+
+		String getFilePath();
+
+		long getLastModified();
+
+		void close();
+	}
+
+	private OpenFileEditor myFileEditor;
+
+
+	private final Map<String, OpenFileModel> myOpenFileModelMap = new LinkedHashMap<>();
+	private SharedPreferences myPreferences;
+
+	public void init() {
+
+	}
+
+	public void setFileEditor(OpenFileEditor fileEditor) {
+		myFileEditor = fileEditor;
+	}
+
+	public void openFile(String filePath, boolean openFileEditor) {
+		if (filePath.equals(getFilePath())) {
+			return;
+		}
+		getOpenFileModel(filePath);
+
+		if (openFileEditor)
+			myFileEditor.openEditor(filePath);
+	}
+
+
+	public OpenFileModel getOpenFileModel(String filePath) {
+		OpenFileModel model = myOpenFileModelMap.get(filePath);
+		if (model != null) {
+			return model;
+		}
+		model = myFileEditor.openFile(filePath);
+		myOpenFileModelMap.put(filePath, model);
+		return model;
+	}
+
+	public OpenFileModel getFileModel(String filePath){
+		return myOpenFileModelMap.get(filePath);
+	}
+
+	public String getFilePath() {
+		return "";
+	}
+
+	public boolean isOpenFile(String filePath) {
+		return myOpenFileModelMap.containsKey(filePath);
+	}
+
+	public void closeFile(@NonNull String filePath) {
+		if (myOpenFileModelMap.containsKey(filePath)) {
+			myOpenFileModelMap.get(filePath).close();
+			myOpenFileModelMap.remove(filePath);
+			myFileEditor.closeFile(filePath);
+		}
+	}
+
+	private void update() {
+		getPreferences().edit().putStringSet("open.files", myOpenFileModelMap.keySet()).apply();
+	}
+
+	private SharedPreferences getPreferences() {
+		if (myPreferences == null)
+			myPreferences = App.getPreferences("OpenFileService");
+		return myPreferences;
+	}
 }
diff --git a/app/src/main/java/com/apkide/ui/services/keybinding/KeyBindingService.java b/app/src/main/java/com/apkide/ui/services/keybinding/KeyBindingService.java
index de83fa1..36e6e71 100644
--- a/app/src/main/java/com/apkide/ui/services/keybinding/KeyBindingService.java
+++ b/app/src/main/java/com/apkide/ui/services/keybinding/KeyBindingService.java
@@ -3,9 +3,9 @@
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
 
-import com.apkide.common.KeyStroke;
+import com.apkide.common.keybinding.KeyStroke;
 import com.apkide.ui.App;
-import com.apkide.ui.views.KeyStrokeCommand;
+import com.apkide.ui.AppCommands;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,7 +17,7 @@ public class KeyBindingService {
 	private SharedPreferences myPreferences;
 
 
-	public void bound(KeyStrokeCommand command, KeyStroke key) {
+	public void bound(AppCommands.ShortcutKeyCommand command, KeyStroke key) {
 		if (key == null) {
 			myKeyMaps.remove(command.getClass().getName() + command.getName());
 		} else {
@@ -26,16 +26,13 @@ public void bound(KeyStrokeCommand command, KeyStroke key) {
 		save();
 	}
 
-	public List<KeyStroke> getKeys(KeyStrokeCommand command) {
+	public List<KeyStroke> getKeys(AppCommands.ShortcutKeyCommand command) {
 		ArrayList<KeyStroke> keys = new ArrayList<>();
 		KeyStroke key = myKeyMaps.get(command.getClass().getName() + command.getName());
 		if (key != null) {
 			keys.add(key);
 		} else {
-			keys.add(command.getKey());
-			if (command instanceof MultiKeyStrokeCommand) {
-				keys.addAll(((MultiKeyStrokeCommand) command).getKeys());
-			}
+			keys.add(command.getKeyStroke());
 		}
 		return keys;
 	}
diff --git a/app/src/main/java/com/apkide/ui/services/keybinding/MultiKeyStrokeCommand.java b/app/src/main/java/com/apkide/ui/services/keybinding/MultiKeyStrokeCommand.java
deleted file mode 100644
index a7279b8..0000000
--- a/app/src/main/java/com/apkide/ui/services/keybinding/MultiKeyStrokeCommand.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.apkide.ui.services.keybinding;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.KeyStroke;
-import com.apkide.ui.views.KeyStrokeCommand;
-
-import java.util.List;
-
-public interface MultiKeyStrokeCommand extends KeyStrokeCommand {
-
-
-	@NonNull
-	List<KeyStroke> getKeys();
-}
diff --git a/app/src/main/java/com/apkide/ui/services/project/ProjectService.java b/app/src/main/java/com/apkide/ui/services/project/ProjectService.java
deleted file mode 100644
index ae618ca..0000000
--- a/app/src/main/java/com/apkide/ui/services/project/ProjectService.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.apkide.ui.services.project;
-
-import static java.util.Objects.requireNonNull;
-
-import android.content.SharedPreferences;
-import android.widget.Toast;
-
-import com.apkide.common.ApplicationProvider;
-import com.apkide.ui.App;
-import com.apkide.ui.FileSystem;
-import com.apkide.ui.project.ApkToolProject;
-
-public class ProjectService {
-
-    private SharedPreferences myPreferences;
-    private String myAndroidJar;
-    private String myRootPath;
-
-    public ProjectService() {
-
-    }
-
-    public void init(String filePath) {
-        myAndroidJar = getPreferences().getString("android.sdk", null);
-        if (myAndroidJar != null && !FileSystem.exists(myAndroidJar))
-            myAndroidJar = null;
-
-        if (myAndroidJar == null)
-            myAndroidJar = ApplicationProvider.get().foundFile("android.jar").getAbsolutePath();
-
-        if (filePath != null) {
-            openProject(requireNonNull(getRootPath(filePath)));
-        } else {
-            myRootPath = getPreferences().getString("project.root", null);
-            if (myRootPath != null && !isProjectRoot(myRootPath)) {
-                myRootPath = null;
-            }
-        }
-
-        if (myRootPath != null) {
-            showOpenOrCloseTip();
-        }
-    }
-
-    private void showOpenOrCloseTip() {
-        if (myRootPath == null) {
-            Toast.makeText(App.getContext(), "Opening project " + myRootPath, Toast.LENGTH_SHORT).show();
-        } else {
-            Toast.makeText(App.getContext(), "Closing project", Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    public void openProject(String rootPath) {
-        if (rootPath.equals(getRootPath())) {
-            Toast.makeText(App.getContext(), "Project " + rootPath + " is open", Toast.LENGTH_SHORT).show();
-        } else {
-            doOpenProject(rootPath);
-        }
-    }
-
-    private void doOpenProject(String rootPath) {
-        if (rootPath != null && !rootPath.equals(getRootPath())) {
-            commitProjectRoot(rootPath);
-            showOpenOrCloseTip();
-            updateProject();
-        }
-    }
-
-    private void updateProject() {
-        if (myRootPath != null) {
-            return;
-        }
-    }
-
-    private void commitProjectRoot(String rootPath) {
-        myRootPath = rootPath;
-        getPreferences().edit().putString("project.root", rootPath).apply();
-    }
-
-
-    private String getRootPath(String filePath) {
-        if (!FileSystem.isJarFileEntry(filePath)) {
-            while (filePath != null && !FileSystem.isRoot(filePath)) {
-                if (isProjectRoot(filePath)) {
-                    return filePath;
-                }
-                filePath = FileSystem.getParentDirPath(filePath);
-            }
-        }
-        return null;
-    }
-
-    public String getRootPath() {
-        return myRootPath;
-    }
-
-
-    public boolean isOpened() {
-        return myRootPath != null;
-    }
-
-    public boolean isProjectRoot(String filePath) {
-        return ApkToolProject.isProjectRoot(filePath);
-    }
-
-    public void setAndroidJar(String androidJarPath) {
-        if (FileSystem.exists(androidJarPath)) {
-            getPreferences().edit().putString("android.sdk", androidJarPath).apply();
-
-        }
-    }
-
-    public String getAndroidJarPath() {
-        return myAndroidJar;
-    }
-
-    public SharedPreferences getPreferences() {
-        if (myPreferences == null)
-            myPreferences = App.getPreferences("ProjectService");
-        return myPreferences;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/util/ClassDecompiler.java b/app/src/main/java/com/apkide/ui/util/ClassDecompiler.java
deleted file mode 100644
index 4a63a15..0000000
--- a/app/src/main/java/com/apkide/ui/util/ClassDecompiler.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.apkide.ui.util;
-
-
-import static com.apkide.common.FileUtils.readBytes;
-import static com.apkide.common.FileUtils.readString;
-import static com.apkide.ui.FileSystem.getName;
-import static com.apkide.ui.FileSystem.getParentDirPath;
-import static com.apkide.ui.FileSystem.mkdirs;
-
-import com.apkide.common.AppLog;
-import com.apkide.common.ApplicationProvider;
-import com.apkide.common.FileUtils;
-import com.apkide.common.IOUtils;
-import com.apkide.ui.AppPreferences;
-
-import org.jetbrains.java.decompiler.main.Fernflower;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.jar.Manifest;
-import java.util.zip.ZipFile;
-
-public final class ClassDecompiler {
-
-    private interface ResultSaver extends IResultSaver {
-        @Override
-        default void saveFolder(String path) {
-
-        }
-
-        @Override
-        default void copyFile(String source, String path, String entryName) {
-
-        }
-
-        @Override
-        default void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-
-        }
-
-        @Override
-        default void createArchive(String path, String archiveName, Manifest manifest) {
-
-        }
-
-        @Override
-        default void saveDirEntry(String path, String archiveName, String entryName) {
-
-        }
-
-        @Override
-        default void copyEntry(String source, String path, String archiveName, String entry) {
-
-        }
-
-        @Override
-        default void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-
-        }
-
-        @Override
-        default void closeArchive(String path, String archiveName) {
-
-        }
-    }
-
-    private static final IFernflowerLogger Logger = new IFernflowerLogger() {
-
-        @Override
-        public void writeMessage(String message, Severity severity) {
-
-        }
-
-        @Override
-        public void writeMessage(String message, Severity severity, Throwable t) {
-
-        }
-    };
-
-
-    public static String decompileFromDir(String dirPath, String fileName) {
-        try {
-            StringBuilder builder = new StringBuilder();
-            File file = new File(dirPath + File.separator + fileName);
-            if (file.exists()) {
-                Fernflower fernflower = new Fernflower((externalPath, internalPath) -> readBytes(file), new ResultSaver() {
-                    @Override
-                    public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-                        builder.setLength(0);
-                        builder.append(content);
-                    }
-                }, AppPreferences.getClassDecompileOptions(), Logger);
-                fernflower.addSource(file);
-                fernflower.decompileContext();
-                fernflower.clearContext();
-                return builder.toString();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "Error";
-    }
-
-    public static String decompileFromArchive(ZipFile archiveFile, String archivePath, String entryName) {
-        try {
-            //TODO: 更好的缓存方式实现
-            File tempArchiveDir = new File(ApplicationProvider.get().getTempDirectory(), Integer.toString(archivePath.hashCode()));
-            String tempEntryPath = tempArchiveDir.getAbsolutePath() + File.separator + getParentDirPath(entryName);
-
-            File tempFile = new File(tempEntryPath, getName(entryName));
-            File cachedFile = new File(tempEntryPath, getName(entryName).replace(".class", ".java"));
-
-            if (cachedFile.exists() && cachedFile.length() > 0L)
-                return readString(cachedFile);
-
-            if (!new File(tempEntryPath).exists())
-                mkdirs(tempEntryPath);
-
-            if (!tempFile.exists()) {
-                tempFile.createNewFile();
-                IOUtils.copyBytes(archiveFile.getInputStream(archiveFile.getEntry(entryName)), new FileOutputStream(tempFile));
-            }
-
-            StringBuilder builder = new StringBuilder();
-            StringBuilder log = new StringBuilder();
-            Fernflower decompiler = new Fernflower((externalPath, internalPath) -> readBytes(tempFile), new ResultSaver() {
-                @Override
-                public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-                    builder.setLength(0);
-                    builder.append(content);
-                }
-            }, AppPreferences.getClassDecompileOptions(), Logger);
-            decompiler.addSource(tempFile);
-            decompiler.decompileContext();
-            decompiler.clearContext();
-            if (builder.length() == 4) {
-                return log.toString();
-            }
-            if (!cachedFile.exists())
-                cachedFile.createNewFile();
-            FileUtils.writeString(cachedFile, builder.toString());
-            return builder.toString();
-        } catch (IOException e) {
-            AppLog.e(e);
-        }
-        return "Error";
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/util/ExecCallback.java b/app/src/main/java/com/apkide/ui/util/ExecCallback.java
deleted file mode 100644
index ab39643..0000000
--- a/app/src/main/java/com/apkide/ui/util/ExecCallback.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.apkide.ui.util;
-
-public interface ExecCallback<T> {
-    void done(T result);
-
-    void canceled();
-
-    void failed(Throwable err);
-}
diff --git a/app/src/main/java/com/apkide/ui/util/JarArchiveReader.java b/app/src/main/java/com/apkide/ui/util/JarArchiveReader.java
deleted file mode 100644
index 5438b9c..0000000
--- a/app/src/main/java/com/apkide/ui/util/JarArchiveReader.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.apkide.ui.util;
-
-
-import static java.io.File.separator;
-
-import com.apkide.common.IOUtils;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-
-public class JarArchiveReader  {
-    private ZipFile archiveFile;
-
-    public Reader getArchiveEntryReader(String archivePath, String entryName, String encoding) throws IOException {
-
-        if (new File(archivePath).isDirectory()) {
-            if (entryName.endsWith(".class")) {
-                return new StringReader(ClassDecompiler.decompileFromDir(archivePath, entryName));
-            }
-            FileInputStream inputStream = new FileInputStream(archivePath + separator + entryName);
-            return encoding == null ? new InputStreamReader(inputStream) : new InputStreamReader(inputStream, encoding);
-        } else {
-            if (entryName.endsWith(".class")) {
-                if (archiveFile == null)
-                    archiveFile = new ZipFile(archivePath);
-                return new StringReader(ClassDecompiler.decompileFromArchive(archiveFile, archivePath, entryName));
-            }
-        }
-
-
-        if (archiveFile == null)
-            archiveFile = new ZipFile(archivePath);
-
-        ZipEntry entry = archiveFile.getEntry(entryName);
-        if (entry == null) entry = archiveFile.getEntry("src/" + entryName);
-        if (entry == null) entry = archiveFile.getEntry("src\\" + entryName);
-
-        byte[] bytes = IOUtils.readBytes(archiveFile.getInputStream(entry));
-        return encoding == null ? new InputStreamReader(new ByteArrayInputStream(bytes)) : new InputStreamReader(new ByteArrayInputStream(bytes), encoding);
-    }
-
-    public List<String> getArchiveDirectoryEntries(String archivePath, String entryName) throws IOException {
-        ArrayList<String> entities = new ArrayList<>();
-        Enumeration<? extends ZipEntry> entries;
-        ZipFile zipFile = new ZipFile(archivePath);
-
-        entries = zipFile.entries();
-        while (entries.hasMoreElements()) {
-            ZipEntry next = entries.nextElement();
-            String name = next.getName();
-            if (name.endsWith("/"))
-                name = name.substring(0, name.length() - 1);
-
-            if (name.startsWith(entryName) && !name.equals(entryName) && name.indexOf("/", entryName.length() + 1) == -1) {
-                if (next.isDirectory()) {
-                    entities.add(archivePath + '/' + name);
-                } else {
-                    if (name.lastIndexOf("$") == -1 && name.endsWith(".class")) {
-                        entities.add(archivePath + '/' + name);
-                    } else if (name.endsWith(".java")) {
-                        if (name.startsWith("src/") || name.startsWith("src\\"))
-                            name = name.substring(4);
-                        entities.add(archivePath + '/' + name);
-                    } else {
-                        //忽略除了class,java以外其它的文件类型
-                    }
-                }
-            }
-        }
-        zipFile.close();
-        return entities;
-    }
-
-    public boolean isArchiveFileEntry(String filePath) {
-        return filePath.endsWith(".class") ||
-                filePath.endsWith(".java");
-    }
-
-    public long getArchiveVersion(String archivePath) {
-        return 0;
-    }
-
-
-    public void closeArchive() throws IOException {
-        if (archiveFile != null) {
-            archiveFile.close();
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/apkide/ui/util/MenuCommand.java b/app/src/main/java/com/apkide/ui/util/MenuCommand.java
deleted file mode 100644
index 2a61204..0000000
--- a/app/src/main/java/com/apkide/ui/util/MenuCommand.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.apkide.ui.util;
-
-import com.apkide.common.Command;
-
-public interface MenuCommand extends Command {
-
-    int getId();
-
-    @Override
-    default boolean isEnabled() {
-        return true;
-    }
-
-    default boolean isVisible() {
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/util/ResultRunnable.java b/app/src/main/java/com/apkide/ui/util/ResultRunnable.java
deleted file mode 100644
index bc1fdce..0000000
--- a/app/src/main/java/com/apkide/ui/util/ResultRunnable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.apkide.ui.util;
-
-public interface ResultRunnable<T> {
-    void run(T result);
-}
diff --git a/app/src/main/java/com/apkide/ui/util/RunCallback.java b/app/src/main/java/com/apkide/ui/util/RunCallback.java
deleted file mode 100644
index 4b9baa5..0000000
--- a/app/src/main/java/com/apkide/ui/util/RunCallback.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.apkide.ui.util;
-
-public interface RunCallback {
-    void done();
-
-    void cancel();
-
-    void fail(Throwable err);
-}
diff --git a/app/src/main/java/com/apkide/ui/views/CodeEditText.java b/app/src/main/java/com/apkide/ui/views/CodeEditText.java
index 9903490..03bf3c0 100644
--- a/app/src/main/java/com/apkide/ui/views/CodeEditText.java
+++ b/app/src/main/java/com/apkide/ui/views/CodeEditText.java
@@ -1,8 +1,10 @@
 package com.apkide.ui.views;
 
 import static android.view.KeyEvent.KEYCODE_A;
+import static android.view.KeyEvent.KEYCODE_BUTTON_A;
 import static android.view.KeyEvent.KEYCODE_C;
 import static android.view.KeyEvent.KEYCODE_DEL;
+import static android.view.KeyEvent.KEYCODE_DPAD_CENTER;
 import static android.view.KeyEvent.KEYCODE_DPAD_DOWN;
 import static android.view.KeyEvent.KEYCODE_DPAD_LEFT;
 import static android.view.KeyEvent.KEYCODE_DPAD_RIGHT;
@@ -14,6 +16,7 @@
 import static android.view.KeyEvent.KEYCODE_PAGE_DOWN;
 import static android.view.KeyEvent.KEYCODE_PAGE_UP;
 import static android.view.KeyEvent.KEYCODE_TAB;
+import static com.apkide.ui.AppCommands.ShortcutKeyCommand;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -22,29 +25,28 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-import com.apkide.common.KeyStroke;
-import com.apkide.common.KeyStrokeDetector;
-import com.apkide.common.Styles;
 import com.apkide.common.SyntaxKind;
-import com.apkide.ui.views.editor.Action;
-import com.apkide.ui.views.editor.EditorModel;
-import com.apkide.ui.views.editor.Model;
-import com.apkide.ui.views.editor.ModelListener;
+import com.apkide.common.app.AppLog;
+import com.apkide.common.keybinding.KeyStroke;
+import com.apkide.common.keybinding.KeyStrokeDetector;
+import com.apkide.ui.AppCommands;
+import com.apkide.ui.views.editor.ActionTypes;
 import com.apkide.ui.views.editor.TextStyle;
 
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 
 public class CodeEditText extends ViewGroup {
-    private final List<KeyStrokeCommand> myEditorCommands = new ArrayList<>();
+    private final List<ShortcutKeyCommand> myEditorCommands = new ArrayList<>();
     private final TextStyle[] myStyles = new TextStyle[SyntaxKind.values().length];
     private int myDragHandleColor=0xff0099cc;
     private int myDragHandleDownColor=0xff004e6a;
+    private KeyStrokeDetector.KeyStrokeHandler myStrokeHandler;
 
     public CodeEditText(Context context) {
         super(context);
@@ -66,67 +68,67 @@ private void initView() {
         removeAllViews();
         addView(new EditorView(getContext()));
         myEditorCommands.add(new EditorActionCommand("Copy",
-                new KeyStroke(KEYCODE_C, false, true, false), Action.CopySelection));
+                new KeyStroke(KEYCODE_C, false, true, false), ActionTypes.CopySelection));
         myEditorCommands.add(new EditorActionCommand("Select All",
-                new KeyStroke(KEYCODE_A, false, true, false), Action.SelectAll));
+                new KeyStroke(KEYCODE_A, false, true, false), ActionTypes.SelectAll));
         myEditorCommands.add(new EditorActionCommand("Delete Character",
-                new KeyStroke(KEYCODE_DEL, false, false, false), Action.RemovePrecedingChar));
+                new KeyStroke(KEYCODE_DEL, false, false, false), ActionTypes.RemovePrecedingChar));
         myEditorCommands.add(new EditorActionCommand("Delete Character Right",
-                new KeyStroke(KEYCODE_FORWARD_DEL, false, false, false), Action.RemoveCurrentChar));
+                new KeyStroke(KEYCODE_FORWARD_DEL, false, false, false), ActionTypes.RemoveCurrentChar));
         myEditorCommands.add(new EditorActionCommand("Delete Word",
-                new KeyStroke(KEYCODE_DEL, false, true, false), Action.DeleteWordLeft));
+                new KeyStroke(KEYCODE_DEL, false, true, false), ActionTypes.DeleteWordLeft));
         myEditorCommands.add(new EditorActionCommand("Insert Tab",
-                new KeyStroke(KEYCODE_TAB, false, false, false), Action.InsertTab));
+                new KeyStroke(KEYCODE_TAB, false, false, false), ActionTypes.InsertTab));
         myEditorCommands.add(new EditorActionCommand("Insert LineBreak",
-                new KeyStroke(KEYCODE_ENTER, false, false, false), Action.InsertLineBreak));
+                new KeyStroke(KEYCODE_ENTER, false, false, false), ActionTypes.InsertLineBreak));
         myEditorCommands.add(new EditorActionCommand("Move to Beginning of File",
-                new KeyStroke(KEYCODE_DPAD_UP, false, true, true), Action.MoveCaretToBeginOfText));
+                new KeyStroke(KEYCODE_DPAD_UP, false, true, true), ActionTypes.MoveCaretToBeginOfText));
         myEditorCommands.add(new EditorActionCommand("Move to End of File",
-                new KeyStroke(KEYCODE_DPAD_DOWN, false, true, true), Action.MoveCaretToEndOfText));
+                new KeyStroke(KEYCODE_DPAD_DOWN, false, true, true), ActionTypes.MoveCaretToEndOfText));
         myEditorCommands.add(new EditorActionCommand("Move to Beginning of Line",
-                new KeyStroke(KEYCODE_MOVE_HOME, false, false, false), Action.MoveCaretToBeginOfTextInLine));
+                new KeyStroke(KEYCODE_MOVE_HOME, false, false, false), ActionTypes.MoveCaretToBeginOfTextInLine));
         myEditorCommands.add(new EditorActionCommand("Move to End of Line",
-                new KeyStroke(KEYCODE_MOVE_END, false, false, false), Action.MoveCaretToEndOfLine));
+                new KeyStroke(KEYCODE_MOVE_END, false, false, false), ActionTypes.MoveCaretToEndOfLine));
         myEditorCommands.add(new EditorActionCommand("Select to Beginning of File",
-                new KeyStroke(KEYCODE_DPAD_UP, true, true, true), Action.MoveCaretToBeginOfTextSelect));
+                new KeyStroke(KEYCODE_DPAD_UP, true, true, true), ActionTypes.MoveCaretToBeginOfTextSelect));
         myEditorCommands.add(new EditorActionCommand("Select to End of File",
-                new KeyStroke(KEYCODE_DPAD_DOWN, true, true, true), Action.MoveCaretToEndOfTextSelect));
+                new KeyStroke(KEYCODE_DPAD_DOWN, true, true, true), ActionTypes.MoveCaretToEndOfTextSelect));
         myEditorCommands.add(new EditorActionCommand("Select to Beginning of Line",
-                new KeyStroke(KEYCODE_MOVE_HOME, true, false, false), Action.MoveCaretToBeginOfTextInLineSelect));
+                new KeyStroke(KEYCODE_MOVE_HOME, true, false, false), ActionTypes.MoveCaretToBeginOfTextInLineSelect));
         myEditorCommands.add(new EditorActionCommand("Select to End of Line",
-                new KeyStroke(KEYCODE_MOVE_END, true, false, false), Action.MoveCaretToEndOfLineSelect));
+                new KeyStroke(KEYCODE_MOVE_END, true, false, false), ActionTypes.MoveCaretToEndOfLineSelect));
         myEditorCommands.add(new EditorActionCommand("Move Page Up",
-                new KeyStroke(KEYCODE_PAGE_UP, false, false, false), Action.MoveCaretPageUp));
+                new KeyStroke(KEYCODE_PAGE_UP, false, false, false), ActionTypes.MoveCaretPageUp));
         myEditorCommands.add(new EditorActionCommand("Move Page Down",
-                new KeyStroke(KEYCODE_PAGE_DOWN, false, false, false), Action.MoveCaretPageDown));
+                new KeyStroke(KEYCODE_PAGE_DOWN, false, false, false), ActionTypes.MoveCaretPageDown));
         myEditorCommands.add(new EditorActionCommand("Move Up",
-                new KeyStroke(KEYCODE_DPAD_UP, false, false, false), Action.MoveCaretUp));
+                new KeyStroke(KEYCODE_DPAD_UP, false, false, false), ActionTypes.MoveCaretUp));
         myEditorCommands.add(new EditorActionCommand("Move Down",
-                new KeyStroke(KEYCODE_DPAD_DOWN, false, false, false), Action.MoveCaretDown));
+                new KeyStroke(KEYCODE_DPAD_DOWN, false, false, false), ActionTypes.MoveCaretDown));
         myEditorCommands.add(new EditorActionCommand("Move Left",
-                new KeyStroke(KEYCODE_DPAD_LEFT, false, false, false), Action.MoveCaretLeft));
+                new KeyStroke(KEYCODE_DPAD_LEFT, false, false, false), ActionTypes.MoveCaretLeft));
         myEditorCommands.add(new EditorActionCommand("Move Right",
-                new KeyStroke(KEYCODE_DPAD_RIGHT, false, false, false), Action.MoveCaretRight));
+                new KeyStroke(KEYCODE_DPAD_RIGHT, false, false, false), ActionTypes.MoveCaretRight));
         myEditorCommands.add(new EditorActionCommand("Move Word Left",
-                new KeyStroke(KEYCODE_DPAD_LEFT, false, true, false), Action.MoveCaretWordLeft));
+                new KeyStroke(KEYCODE_DPAD_LEFT, false, true, false), ActionTypes.MoveCaretWordLeft));
         myEditorCommands.add(new EditorActionCommand("Move Word Right",
-                new KeyStroke(KEYCODE_DPAD_RIGHT, false, true, false), Action.MoveCaretWordRight));
+                new KeyStroke(KEYCODE_DPAD_RIGHT, false, true, false), ActionTypes.MoveCaretWordRight));
         myEditorCommands.add(new EditorActionCommand("Select Page Up",
-                new KeyStroke(KEYCODE_PAGE_UP, true, false, false), Action.MoveCaretPageUpSelect));
+                new KeyStroke(KEYCODE_PAGE_UP, true, false, false), ActionTypes.MoveCaretPageUpSelect));
         myEditorCommands.add(new EditorActionCommand("Select Page Down",
-                new KeyStroke(KEYCODE_PAGE_DOWN, true, false, false), Action.MoveCaretPageDownSelect));
+                new KeyStroke(KEYCODE_PAGE_DOWN, true, false, false), ActionTypes.MoveCaretPageDownSelect));
         myEditorCommands.add(new EditorActionCommand("Select Word Left",
-                new KeyStroke(KEYCODE_DPAD_LEFT, true, true, false), Action.MoveCaretWordLeftSelect));
+                new KeyStroke(KEYCODE_DPAD_LEFT, true, true, false), ActionTypes.MoveCaretWordLeftSelect));
         myEditorCommands.add(new EditorActionCommand("Select Word Right",
-                new KeyStroke(KEYCODE_DPAD_RIGHT, true, true, false), Action.MoveCaretWordRightSelect));
+                new KeyStroke(KEYCODE_DPAD_RIGHT, true, true, false), ActionTypes.MoveCaretWordRightSelect));
         myEditorCommands.add(new EditorActionCommand("Select Up",
-                new KeyStroke(KEYCODE_DPAD_UP, true, false, false), Action.MoveCaretUpSelect));
+                new KeyStroke(KEYCODE_DPAD_UP, true, false, false), ActionTypes.MoveCaretUpSelect));
         myEditorCommands.add(new EditorActionCommand("Select Down",
-                new KeyStroke(KEYCODE_DPAD_DOWN, true, false, false), Action.MoveCaretDownSelect));
+                new KeyStroke(KEYCODE_DPAD_DOWN, true, false, false), ActionTypes.MoveCaretDownSelect));
         myEditorCommands.add(new EditorActionCommand("Select Left",
-                new KeyStroke(KEYCODE_DPAD_LEFT, true, false, false), Action.MoveCaretLeftSelect));
+                new KeyStroke(KEYCODE_DPAD_LEFT, true, false, false), ActionTypes.MoveCaretLeftSelect));
         myEditorCommands.add(new EditorActionCommand("Select Right",
-                new KeyStroke(KEYCODE_DPAD_RIGHT, true, false, false), Action.MoveCaretRightSelect));
+                new KeyStroke(KEYCODE_DPAD_RIGHT, true, false, false), ActionTypes.MoveCaretRightSelect));
 
         putTextStyle(SyntaxKind.Plain, new TextStyle(getEditorView().getFontColor()));
         putTextStyle(SyntaxKind.Keyword, new TextStyle(0xff2c82c8, Typeface.BOLD));
@@ -140,6 +142,55 @@ private void initView() {
         putTextStyle(SyntaxKind.FunctionCallIdentifier, new TextStyle(0xff00627A, Typeface.BOLD_ITALIC));
         putTextStyle(SyntaxKind.Comment, new TextStyle(0xff009b00, Typeface.ITALIC));
         putTextStyle(SyntaxKind.DocComment, new TextStyle(0xff009b00, Typeface.BOLD_ITALIC));
+
+        myStrokeHandler = new KeyStrokeDetector.KeyStrokeHandler() {
+
+            private AppCommands.ShortcutKeyCommand foundCommand(KeyStroke key) {
+                List<AppCommands.ShortcutKeyCommand> commands = getEditorCommands();
+                for (AppCommands.ShortcutKeyCommand command : commands) {
+                    List<KeyStroke> keys = foundKeys(command);
+                    if (keys != null) {
+                        for (KeyStroke stroke : keys) {
+                            if (stroke.matches(key)) {
+                                return command;
+                            }
+                        }
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            public boolean onKeyStroke(KeyStroke keyStroke) {
+                AppLog.s("EditorView::onKeyStroke");
+                int keyCode = keyStroke.getKeyCode();
+                if (keyCode != KEYCODE_BUTTON_A && keyCode != KEYCODE_DPAD_CENTER) {
+                    AppCommands.ShortcutKeyCommand command = foundCommand(keyStroke);
+                    if (command != null) {
+                        if (command.isEnabled()) {
+                            command.run();
+                            return true;
+                        }
+                    }
+
+                    if (keyStroke.isChar()) {
+                        AppLog.s(String.valueOf(keyStroke.getChar()));
+                        insertChar(keyStroke.getChar());
+                        return true;
+                    }
+
+                    if (keyCode == KEYCODE_ENTER) {
+                        getEditorView().insertLineBreak();
+                        return true;
+                    } else {
+                        return handleKeyStroke(keyStroke);
+                    }
+                }
+                return false;
+            }
+        };
+        setFocusable(true);
+        setFocusableInTouchMode(true);
     }
 
     public void putTextStyle(SyntaxKind style, TextStyle textStyle) {
@@ -163,7 +214,7 @@ protected void onKeyStroke() {
 
     }
 
-    protected List<KeyStroke> foundKeys(KeyStrokeCommand command) {
+    protected List<KeyStroke> foundKeys(ShortcutKeyCommand command) {
         return null;
     }
 
@@ -247,12 +298,12 @@ public void setDragHandleDownColor(int dragHandleDownColor) {
         myDragHandleDownColor = dragHandleDownColor;
     }
 
-    public void putEditorCommand(KeyStrokeCommand command) {
+    public void putEditorCommand(ShortcutKeyCommand command) {
         myEditorCommands.remove(command);
         myEditorCommands.add(command);
     }
 
-    public List<KeyStrokeCommand> getEditorCommands() {
+    public List<ShortcutKeyCommand> getEditorCommands() {
         return myEditorCommands;
     }
 
@@ -285,12 +336,46 @@ public boolean isTouchEventInsideHandle(MotionEvent event) {
         return getScrollView().isTouchEventInsideHandle(event);
     }
 
-    private class EditorActionCommand implements KeyStrokeCommand {
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        if (getKeyStrokeDetector() != null) {
+            return getKeyStrokeDetector().createInputConnection(this, myStrokeHandler);
+        }
+        return super.onCreateInputConnection(outAttrs);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (getKeyStrokeDetector() != null) {
+            if (getKeyStrokeDetector().onKeyDown(keyCode, event, myStrokeHandler)) {
+                return true;
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (getKeyStrokeDetector() != null) {
+            if (getKeyStrokeDetector().onKeyUp(keyCode, event)) {
+                return true;
+            }
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+
+    private class EditorActionCommand implements ShortcutKeyCommand {
         private final String name;
         private final KeyStroke key;
-        private final Action action;
+        private final ActionTypes action;
 
-        public EditorActionCommand(String name, KeyStroke key, Action action) {
+        public EditorActionCommand(String name, KeyStroke key, ActionTypes action) {
             this.name = name;
             this.key = key;
             this.action = action;
@@ -315,94 +400,9 @@ public boolean run() {
 
         @NonNull
         @Override
-        public KeyStroke getKey() {
+        public KeyStroke getKeyStroke() {
             return key;
         }
     }
 
-    protected class CodeEditTextEditorModel extends EditorModel {
-        private final Object myStylesLock = new Object();
-        private final Object mySemanticStylesLock = new Object();
-        private Styles myStyles = new Styles();
-        private Styles myStylesGUI = new Styles();
-        private Styles mySemanticsStyles = new Styles();
-        private Styles mySemanticsStylesGUI = new Styles();
-
-        public CodeEditTextEditorModel(Reader reader) {
-            super(reader, getTabSize());
-            init();
-        }
-
-        public CodeEditTextEditorModel() {
-            super();
-            init();
-        }
-
-        private void init() {
-            addModelListener(new ModelListener() {
-                @Override
-                public void insertUpdate(@NonNull Model model, int startLine, int startColumn, int endLine, int endColumn) {
-                    synchronized (myStylesLock) {
-                        myStylesGUI.insert(startLine, startColumn, endLine, endColumn);
-                    }
-                    synchronized (mySemanticStylesLock) {
-                        mySemanticsStylesGUI.insert(startLine, startColumn, endLine, endColumn);
-                    }
-                }
-
-                @Override
-                public void removeUpdate(@NonNull Model model, int startLine, int startColumn, int endLine, int endColumn) {
-                    synchronized (myStylesLock) {
-                        myStylesGUI.remove(startLine, startColumn, endLine, endColumn);
-                    }
-                    synchronized (mySemanticStylesLock) {
-                        mySemanticsStylesGUI.remove(startLine, startColumn, endLine, endColumn);
-                    }
-                }
-            });
-        }
-
-
-        @Override
-        public int getStyle(int line, int column) {
-            int style = mySemanticsStylesGUI.getStyle(line, column);
-            if (style == 0) {
-                return myStylesGUI.getStyle(line, column);
-            }
-            return style;
-        }
-
-        @Override
-        public int getStyleCount() {
-            return SyntaxKind.values().length;
-        }
-
-        @Nullable
-        @Override
-        public TextStyle getTextStyle(int style) {
-            return CodeEditText.this.getTextStyle(style);
-        }
-
-
-        public void highlighting(SyntaxKind[] kinds, int[] startLines, int[] startColumns, int[] endLines, int[] endColumns, int size) {
-            myStyles.set(kinds, startLines, startColumns, endLines, endColumns, size);
-            synchronized (myStylesLock) {
-                Styles styles = myStylesGUI;
-                myStylesGUI = myStyles;
-                myStyles = styles;
-            }
-            getEditorView().invalidate();
-        }
-
-        public void semanticHighlighting(SyntaxKind[] kinds, int[] startLines, int[] startColumns, int[] endLines, int[] endColumns, int size) {
-            mySemanticsStyles.set(kinds, startLines, startColumns, endLines, endColumns, size);
-            synchronized (mySemanticStylesLock) {
-                Styles styles = mySemanticsStylesGUI;
-                mySemanticsStylesGUI = mySemanticsStyles;
-                mySemanticsStyles = styles;
-            }
-            getEditorView().invalidate();
-        }
-    }
-
 }
diff --git a/app/src/main/java/com/apkide/ui/views/CodeEditTextEditorModel.java b/app/src/main/java/com/apkide/ui/views/CodeEditTextEditorModel.java
new file mode 100644
index 0000000..9bc7bbb
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/views/CodeEditTextEditorModel.java
@@ -0,0 +1,101 @@
+package com.apkide.ui.views;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.apkide.common.Styles;
+import com.apkide.common.SyntaxKind;
+import com.apkide.ui.views.editor.EditorModel;
+import com.apkide.ui.views.editor.Model;
+import com.apkide.ui.views.editor.ModelListener;
+import com.apkide.ui.views.editor.TextStyle;
+
+import java.io.Reader;
+
+public class CodeEditTextEditorModel extends EditorModel {
+	private final CodeEditText myCodeEditText;
+	private final Object myStylesLock = new Object();
+	private final Object mySemanticStylesLock = new Object();
+	private Styles myStyles = new Styles();
+	private Styles myStylesGUI = new Styles();
+	private Styles mySemanticsStyles = new Styles();
+	private Styles mySemanticsStylesGUI = new Styles();
+
+	public CodeEditTextEditorModel(CodeEditText codeEditText, Reader reader) {
+		super(reader);
+		myCodeEditText = codeEditText;
+		init();
+	}
+
+	public CodeEditTextEditorModel(CodeEditText codeEditText) {
+		super();
+		myCodeEditText = codeEditText;
+		init();
+	}
+
+	private void init() {
+		addModelListener(new ModelListener() {
+			@Override
+			public void insertUpdate(@NonNull Model model, int startLine, int startColumn, int endLine, int endColumn) {
+				synchronized (myStylesLock) {
+					myStylesGUI.insert(startLine, startColumn, endLine, endColumn);
+				}
+				synchronized (mySemanticStylesLock) {
+					mySemanticsStylesGUI.insert(startLine, startColumn, endLine, endColumn);
+				}
+			}
+
+			@Override
+			public void removeUpdate(@NonNull Model model, int startLine, int startColumn, int endLine, int endColumn) {
+				synchronized (myStylesLock) {
+					myStylesGUI.remove(startLine, startColumn, endLine, endColumn);
+				}
+				synchronized (mySemanticStylesLock) {
+					mySemanticsStylesGUI.remove(startLine, startColumn, endLine, endColumn);
+				}
+			}
+		});
+	}
+
+
+	@Override
+	public int getStyle(int line, int column) {
+		int style = mySemanticsStylesGUI.getStyle(line, column);
+		if (style == 0) {
+			return myStylesGUI.getStyle(line, column);
+		}
+		return style;
+	}
+
+	@Override
+	public int getStyleCount() {
+		return SyntaxKind.values().length;
+	}
+
+	@Nullable
+	@Override
+	public TextStyle getTextStyle(int style) {
+		return myCodeEditText.getTextStyle(style);
+	}
+
+
+	public void highlighting(SyntaxKind[] kinds, int[] startLines, int[] startColumns, int[] endLines, int[] endColumns, int size) {
+		myStyles.set(kinds, startLines, startColumns, endLines, endColumns, size);
+		synchronized (myStylesLock) {
+			Styles styles = myStylesGUI;
+			myStylesGUI = myStyles;
+			myStyles = styles;
+		}
+		myCodeEditText.getEditorView().invalidate();
+	}
+
+	public void semanticHighlighting(SyntaxKind[] kinds, int[] startLines, int[] startColumns, int[] endLines, int[] endColumns, int size) {
+		mySemanticsStyles.set(kinds, startLines, startColumns, endLines, endColumns, size);
+		synchronized (mySemanticStylesLock) {
+			Styles styles = mySemanticsStylesGUI;
+			mySemanticsStylesGUI = mySemanticsStyles;
+			mySemanticsStyles = styles;
+		}
+		myCodeEditText.getEditorView().invalidate();
+	}
+}
diff --git a/app/src/main/java/com/apkide/ui/views/CodeEditTextHorizontalScrollView.java b/app/src/main/java/com/apkide/ui/views/CodeEditTextHorizontalScrollView.java
index 07150a6..e652303 100644
--- a/app/src/main/java/com/apkide/ui/views/CodeEditTextHorizontalScrollView.java
+++ b/app/src/main/java/com/apkide/ui/views/CodeEditTextHorizontalScrollView.java
@@ -56,30 +56,7 @@ public boolean onGenericMotionEvent(MotionEvent event) {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (isMouseButtonEvent(ev)) {
-            return true;
-        }
         return super.onInterceptTouchEvent(ev);
     }
 
-    private boolean isMouseButtonEvent(MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_DOWN ||
-                event.getAction() == MotionEvent.ACTION_CANCEL ||
-                event.getAction() == MotionEvent.ACTION_MOVE) {
-            if (event.getButtonState() == 0) {
-                return true;
-            }
-        }
-
-        if (event.getToolType(0) == 3) {
-            return true;
-        }
-        switch (event.getSource()) {
-            case 8194:
-            case 1048584:
-                return true;
-            default:
-                return false;
-        }
-    }
 }
diff --git a/app/src/main/java/com/apkide/ui/views/CodeEditTextScrollView.java b/app/src/main/java/com/apkide/ui/views/CodeEditTextScrollView.java
index ecc7d20..e773761 100644
--- a/app/src/main/java/com/apkide/ui/views/CodeEditTextScrollView.java
+++ b/app/src/main/java/com/apkide/ui/views/CodeEditTextScrollView.java
@@ -255,32 +255,9 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
                 return true;
             }
         }
-        if (isMouseButtonEvent(ev)) {
-            return false;
-        }
         return super.onInterceptTouchEvent(ev);
     }
 
-    private boolean isMouseButtonEvent(MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_DOWN ||
-                event.getAction() == MotionEvent.ACTION_CANCEL ||
-                event.getAction() == MotionEvent.ACTION_MOVE) {
-            if (event.getButtonState() == 0) {
-                return true;
-            }
-        }
-
-        if (event.getToolType(0) == 3) {
-            return true;
-        }
-        switch (event.getSource()) {
-            case 8194:
-            case 1048584:
-                return true;
-            default:
-                return false;
-        }
-    }
 
     public void selection(int startLine, int startColumn, int endLine, int endColumn) {
         mySelectionVisible = true;
@@ -522,10 +499,10 @@ public boolean onTouchEvent(@NonNull MotionEvent e) {
                     }
                 }
                 if (e.getAction() == 2) {
-                    float x = e.getX(0);
-                    float y = e.getY(0);
-                    float scrollX = getScrollColumnX() + (x - dragDX);
-                    float scrollLineY = getScrollLineY() + (y - dragDY);
+                    int x = (int) e.getX(0);
+                    int y = (int) e.getY(0);
+                    int scrollX = getScrollColumnX() + (x - dragDX);
+                    int scrollLineY = getScrollLineY() + (y - dragDY);
                     int line = getEditorView().computeLine(scrollLineY);
                     int column = getEditorView().computeColumn(line, scrollX);
                     if (line == getLine() && column == getColumn()) {
diff --git a/app/src/main/java/com/apkide/ui/views/EditorView.java b/app/src/main/java/com/apkide/ui/views/EditorView.java
index 1ff25e5..d6f3b19 100644
--- a/app/src/main/java/com/apkide/ui/views/EditorView.java
+++ b/app/src/main/java/com/apkide/ui/views/EditorView.java
@@ -1,29 +1,16 @@
 package com.apkide.ui.views;
 
-import static android.view.KeyEvent.KEYCODE_BUTTON_A;
-import static android.view.KeyEvent.KEYCODE_DPAD_CENTER;
-import static android.view.KeyEvent.KEYCODE_ENTER;
 import static java.lang.Math.max;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
 
-import com.apkide.common.AppLog;
-import com.apkide.common.KeyStroke;
-import com.apkide.common.KeyStrokeDetector;
+import com.apkide.common.app.AppLog;
 import com.apkide.ui.views.editor.Editor;
 
-import java.util.List;
-
 public class EditorView extends Editor {
     private final WindowManager windowManager;
-    private final KeyStrokeDetector.KeyStrokeHandler myKeyStrokeHandler;
 
     public EditorView(Context context) {
         super(context);
@@ -31,55 +18,10 @@ public EditorView(Context context) {
         setFocusable(true);
         setFocusableInTouchMode(true);
         setCaretVisibility(true);
-        myKeyStrokeHandler = new KeyStrokeDetector.KeyStrokeHandler() {
-
-            private KeyStrokeCommand foundCommand(KeyStroke key) {
-                List<KeyStrokeCommand> commands = getCodeEditText().getEditorCommands();
-                for (KeyStrokeCommand command : commands) {
-                    List<KeyStroke> keys = getCodeEditText().foundKeys(command);
-                    if (keys != null) {
-                        for (KeyStroke stroke : keys) {
-                            if (stroke.matches(key)) {
-                                return command;
-                            }
-                        }
-                    }
-                }
-                return null;
-            }
-
-            @Override
-            public boolean onKeyStroke(KeyStroke keyStroke) {
-                int keyCode = keyStroke.getKeyCode();
-                if (keyCode != KEYCODE_BUTTON_A && keyCode != KEYCODE_DPAD_CENTER) {
-                    KeyStrokeCommand command = foundCommand(keyStroke);
-                    if (command != null) {
-                        if (command.isEnabled()) {
-                            command.run();
-                            return true;
-                        }
-                    } else if (keyStroke.isChar()) {
-                        insertChar(keyStroke.getChar());
-                        return true;
-                    } else if (keyCode == KEYCODE_ENTER) {
-                        insertLineBreak();
-                        return true;
-                    } else {
-                        return getCodeEditText().handleKeyStroke(keyStroke);
-                    }
-                }
-                getCodeEditText().onKeyStroke();
-                return true;
-            }
-        };
     }
 
-    public CodeEditText.CodeEditTextEditorModel getCodeEditTextEditorModel() {
-        return (CodeEditText.CodeEditTextEditorModel) getEditorModel();
-    }
-
-    public KeyStrokeDetector.KeyStrokeHandler getKeyStrokeHandler() {
-        return myKeyStrokeHandler;
+    public CodeEditTextEditorModel getCodeEditTextEditorModel() {
+        return (CodeEditTextEditorModel) getEditorModel();
     }
 
     private CodeEditText getCodeEditText(){
@@ -100,43 +42,4 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         setMeasuredDimension(max(getMeasuredWidth(), width), max(getMeasuredHeight(), height));
         AppLog.d("w:" + getMeasuredWidth() + " h:" + getMeasuredHeight());
     }
-
-    @Override
-    public boolean onCheckIsTextEditor() {
-        return true;
-    }
-
-    @Override
-    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        if (getCodeEditText().getKeyStrokeDetector() != null) {
-            return getCodeEditText().getKeyStrokeDetector().createInputConnection(this, myKeyStrokeHandler);
-        }
-        return super.onCreateInputConnection(outAttrs);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (getCodeEditText().getKeyStrokeDetector() != null) {
-            if (getCodeEditText().getKeyStrokeDetector().onKeyDown(keyCode, event, myKeyStrokeHandler)) {
-                return true;
-            }
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (getCodeEditText().getKeyStrokeDetector() != null) {
-            if (getCodeEditText().getKeyStrokeDetector().onKeyUp(keyCode, event)) {
-                return true;
-            }
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return super.onTouchEvent(event);
-    }
 }
diff --git a/app/src/main/java/com/apkide/ui/views/KeyStrokeCommand.java b/app/src/main/java/com/apkide/ui/views/KeyStrokeCommand.java
deleted file mode 100644
index 6057461..0000000
--- a/app/src/main/java/com/apkide/ui/views/KeyStrokeCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.apkide.ui.views;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.Command;
-import com.apkide.common.KeyStroke;
-
-public interface KeyStrokeCommand extends Command {
-
-    @NonNull
-    String getName();
-
-    boolean isEnabled();
-
-    boolean run();
-
-    @NonNull
-    KeyStroke getKey();
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/ActionRunnable.java b/app/src/main/java/com/apkide/ui/views/editor/ActionRunnable.java
deleted file mode 100644
index dea1907..0000000
--- a/app/src/main/java/com/apkide/ui/views/editor/ActionRunnable.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.apkide.ui.views.editor;
-
-public interface ActionRunnable {
-    void run();
-
-    default void setEnabled(boolean enabled) {
-
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Action.java b/app/src/main/java/com/apkide/ui/views/editor/ActionTypes.java
similarity index 97%
rename from app/src/main/java/com/apkide/ui/views/editor/Action.java
rename to app/src/main/java/com/apkide/ui/views/editor/ActionTypes.java
index b75c6bc..b290279 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/Action.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/ActionTypes.java
@@ -1,6 +1,6 @@
 package com.apkide.ui.views.editor;
 
-public enum Action {
+public enum ActionTypes {
     MoveCaretLeft,
     MoveCaretRight,
     MoveCaretUp,
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Buffers.java b/app/src/main/java/com/apkide/ui/views/editor/Buffers.java
new file mode 100644
index 0000000..662d71b
--- /dev/null
+++ b/app/src/main/java/com/apkide/ui/views/editor/Buffers.java
@@ -0,0 +1,72 @@
+package com.apkide.ui.views.editor;
+
+class Buffers {
+	 static char[] chars(int len) {
+		char[] buf;
+
+		synchronized (Buffers.class) {
+			buf = sChars;
+			sChars = null;
+		}
+
+		if (buf == null || buf.length < len)
+			buf = new char[len];
+		return buf;
+	}
+
+	 static float[] floats(int len) {
+		float[] buf;
+
+		synchronized (Buffers.class) {
+			buf = sFloats;
+			sFloats = null;
+		}
+
+		if (buf == null || buf.length < len)
+			buf = new float[len];
+		return buf;
+	}
+
+	public static int[] ints(int len) {
+		int[] buf;
+
+		synchronized (Buffers.class) {
+			buf = sInts;
+			sInts = null;
+		}
+
+		if (buf == null || buf.length < len)
+			buf = new int[len];
+		return buf;
+	}
+
+	 static void recycle(int[] temp) {
+		if (temp.length > 8192) return;
+
+		synchronized (Buffers.class) {
+			sInts = temp;
+		}
+	}
+
+	 static void recycle(float[] temp) {
+		if (temp.length > 8192) return;
+
+		synchronized (Buffers.class) {
+			sFloats = temp;
+		}
+	}
+
+
+	 static void recycle(char[] temp) {
+		if (temp.length > 8192) return;
+
+		synchronized (Buffers.class) {
+			sChars = temp;
+		}
+	}
+
+	private static int[] sInts = null;
+	private static char[] sChars = null;
+	private static float[] sFloats = null;
+
+}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/CharBuffer.java b/app/src/main/java/com/apkide/ui/views/editor/CharBuffer.java
deleted file mode 100644
index fd276f8..0000000
--- a/app/src/main/java/com/apkide/ui/views/editor/CharBuffer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apkide.ui.views.editor;
-
-class CharBuffer {
-
-    public static char[] obtain(int len) {
-        char[] buf;
-
-        synchronized (CharBuffer.class) {
-            buf = sTemp;
-            sTemp = null;
-        }
-
-        if (buf == null || buf.length < len) {
-            buf = new char[len];
-        }
-
-        return buf;
-    }
-
-
-    public static void recycle(char[] temp) {
-        if (temp.length > 8192) return;
-
-        synchronized (CharBuffer.class) {
-            sTemp = temp;
-        }
-    }
-
-    private static char[] sTemp = null;
-
-
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Console.java b/app/src/main/java/com/apkide/ui/views/editor/Console.java
index cb2e45c..39a195a 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/Console.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/Console.java
@@ -16,6 +16,11 @@
 
 import androidx.annotation.NonNull;
 
+import com.apkide.common.Location;
+import com.apkide.common.Position;
+import com.apkide.common.Size;
+import com.apkide.common.SyncRunner;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -685,7 +690,7 @@ public Location computeLocation(int line, int column) {
 		if (line >= getModel().getLineCount()) line = getModel().getLineCount() - 1;
 		float y = computeLocationY(line);
 		float x = computeLocationX(line, column);
-		return new Location(x, y);
+		return new Location((int) x, (int) y);
 	}
 
 	@NonNull
@@ -715,14 +720,14 @@ public int computeColumn(int line, float x) {
 		float columnX = mySidebarX;
 		if (length == 0) return 0;
 		int column = 0;
-		float[] buffer = FloatBuffer.obtain(length);
+		float[] buffer = Buffers.floats(length);
 		getLineWidths(line, 0, length, buffer);
 		for (int i = 0; i < length; i++) {
 			if (columnX >= x) break;
 			columnX += buffer[i];
 			column++;
 		}
-		FloatBuffer.recycle(buffer);
+		Buffers.recycle(buffer);
 		return column;
 	}
 
@@ -750,9 +755,10 @@ public void getLineWidths(int line, int column, int length, float[] widths) {
 
 
 	protected float nativeMeasureLine(int line, int column, int length) {
+		int end = column+length;
 		float w = myModel.measureLine(line, column, length, myPaint);
 		float tabAdvance = myPaint.measureText("\t");
-		for (int i = column; i < length; i++) {
+		for (int i = column; i < end; i++) {
 			char c = myModel.getChar(line, i);
 			if (c == '\t') {
 				w -= tabAdvance;
@@ -763,8 +769,9 @@ protected float nativeMeasureLine(int line, int column, int length) {
 	}
 
 	protected void nativeGetLineWidths(int line, int column, int length, float[] widths) {
+		int end = column+length;
 		myModel.getLineWidths(line, column, length, widths, myPaint);
-		for (int i = column; i < length; i++) {
+		for (int i = column; i < end; i++) {
 			char c = myModel.getChar(line, i);
 			if (c == '\t') widths[i] = myTabCharWidth;
 		}
@@ -773,7 +780,7 @@ protected void nativeGetLineWidths(int line, int column, int length, float[] wid
 	protected float drawText(Canvas canvas, int line, int column, int length, float x, float y) {
 		int end = column + length;
 		int begin = column;
-		for (int i = column; i < length; i++) {
+		for (int i = column; i < end; i++) {
 			if (myModel.getChar(line, i) == '\t') {
 				if (myPaint.getColor() != 0)
 					myModel.drawLine(canvas, line, begin, i - begin, x, y, myPaint);
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Editor.java b/app/src/main/java/com/apkide/ui/views/editor/Editor.java
index 5259102..1a296aa 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/Editor.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/Editor.java
@@ -1,51 +1,51 @@
 package com.apkide.ui.views.editor;
 
-import static com.apkide.ui.views.editor.Action.AutoIndent;
-import static com.apkide.ui.views.editor.Action.CommentSelection;
-import static com.apkide.ui.views.editor.Action.CopySelection;
-import static com.apkide.ui.views.editor.Action.CutSelection;
-import static com.apkide.ui.views.editor.Action.DeleteWordLeft;
-import static com.apkide.ui.views.editor.Action.DeleteWordRight;
-import static com.apkide.ui.views.editor.Action.IndentSelection;
-import static com.apkide.ui.views.editor.Action.InsertLineBreak;
-import static com.apkide.ui.views.editor.Action.InsertTab;
-import static com.apkide.ui.views.editor.Action.MoveCaretDown;
-import static com.apkide.ui.views.editor.Action.MoveCaretDownSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretLeft;
-import static com.apkide.ui.views.editor.Action.MoveCaretLeftSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretPageDown;
-import static com.apkide.ui.views.editor.Action.MoveCaretPageDownSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretPageUp;
-import static com.apkide.ui.views.editor.Action.MoveCaretPageUpSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretRight;
-import static com.apkide.ui.views.editor.Action.MoveCaretRightSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretToBeginOfLine;
-import static com.apkide.ui.views.editor.Action.MoveCaretToBeginOfLineSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretToBeginOfText;
-import static com.apkide.ui.views.editor.Action.MoveCaretToBeginOfTextInLine;
-import static com.apkide.ui.views.editor.Action.MoveCaretToBeginOfTextInLineSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretToBeginOfTextSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretToEndOfLine;
-import static com.apkide.ui.views.editor.Action.MoveCaretToEndOfLineSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretToEndOfText;
-import static com.apkide.ui.views.editor.Action.MoveCaretToEndOfTextSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretUp;
-import static com.apkide.ui.views.editor.Action.MoveCaretUpSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretWordLeft;
-import static com.apkide.ui.views.editor.Action.MoveCaretWordLeftSelect;
-import static com.apkide.ui.views.editor.Action.MoveCaretWordRight;
-import static com.apkide.ui.views.editor.Action.MoveCaretWordRightSelect;
-import static com.apkide.ui.views.editor.Action.PasteSelection;
-import static com.apkide.ui.views.editor.Action.Redo;
-import static com.apkide.ui.views.editor.Action.RemoveCurrentChar;
-import static com.apkide.ui.views.editor.Action.RemoveCurrentLine;
-import static com.apkide.ui.views.editor.Action.RemovePrecedingChar;
-import static com.apkide.ui.views.editor.Action.RemoveSelection;
-import static com.apkide.ui.views.editor.Action.SelectAll;
-import static com.apkide.ui.views.editor.Action.ToggleOverwriteMode;
-import static com.apkide.ui.views.editor.Action.UnCommentSelection;
-import static com.apkide.ui.views.editor.Action.UnIndentSelection;
-import static com.apkide.ui.views.editor.Action.Undo;
+import static com.apkide.ui.views.editor.ActionTypes.AutoIndent;
+import static com.apkide.ui.views.editor.ActionTypes.CommentSelection;
+import static com.apkide.ui.views.editor.ActionTypes.CopySelection;
+import static com.apkide.ui.views.editor.ActionTypes.CutSelection;
+import static com.apkide.ui.views.editor.ActionTypes.DeleteWordLeft;
+import static com.apkide.ui.views.editor.ActionTypes.DeleteWordRight;
+import static com.apkide.ui.views.editor.ActionTypes.IndentSelection;
+import static com.apkide.ui.views.editor.ActionTypes.InsertLineBreak;
+import static com.apkide.ui.views.editor.ActionTypes.InsertTab;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretDown;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretDownSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretLeft;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretLeftSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretPageDown;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretPageDownSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretPageUp;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretPageUpSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretRight;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretRightSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToBeginOfLine;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToBeginOfLineSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToBeginOfText;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToBeginOfTextInLine;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToBeginOfTextInLineSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToBeginOfTextSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToEndOfLine;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToEndOfLineSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToEndOfText;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretToEndOfTextSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretUp;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretUpSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretWordLeft;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretWordLeftSelect;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretWordRight;
+import static com.apkide.ui.views.editor.ActionTypes.MoveCaretWordRightSelect;
+import static com.apkide.ui.views.editor.ActionTypes.PasteSelection;
+import static com.apkide.ui.views.editor.ActionTypes.Redo;
+import static com.apkide.ui.views.editor.ActionTypes.RemoveCurrentChar;
+import static com.apkide.ui.views.editor.ActionTypes.RemoveCurrentLine;
+import static com.apkide.ui.views.editor.ActionTypes.RemovePrecedingChar;
+import static com.apkide.ui.views.editor.ActionTypes.RemoveSelection;
+import static com.apkide.ui.views.editor.ActionTypes.SelectAll;
+import static com.apkide.ui.views.editor.ActionTypes.ToggleOverwriteMode;
+import static com.apkide.ui.views.editor.ActionTypes.UnCommentSelection;
+import static com.apkide.ui.views.editor.ActionTypes.UnIndentSelection;
+import static com.apkide.ui.views.editor.ActionTypes.Undo;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -55,7 +55,7 @@
 
 import androidx.annotation.NonNull;
 
-import com.apkide.common.IOUtils;
+import com.apkide.common.io.IOUtils;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -77,7 +77,7 @@ public Editor(Context context, AttributeSet attrs, int defStyle) {
         initView();
     }
 
-    private abstract class UnSelectActionRunnable implements ActionRunnable {
+    private abstract class UnSelectActionRunnable implements Runnable {
         @Override
         public void run() {
             if (getSelectionVisibility() && !myInSelecting) {
@@ -86,10 +86,10 @@ public void run() {
         }
     }
 
-    private class SelectActionRunnable implements ActionRunnable {
-        private final ActionRunnable myRunnable;
+    private class SelectActionRunnable implements Runnable {
+        private final Runnable myRunnable;
 
-        public SelectActionRunnable(Action action) {
+        public SelectActionRunnable(ActionTypes action) {
             myRunnable = getActionRunnable(action);
         }
 
@@ -119,7 +119,7 @@ private enum State {
     private boolean myEditable;
     private State myInternalState;
     private float myIntendedColumnX;
-    private final Hashtable<Action, ActionRunnable> myActions = new Hashtable<>();
+    private final Hashtable<ActionTypes, Runnable> myActions = new Hashtable<>();
     private boolean myInSelecting;
 
     private void initView() {
@@ -534,12 +534,12 @@ public void run() {
     }
 
 
-    public void boundAction(@NonNull Action action, @NonNull ActionRunnable runnable) {
+    public void boundAction(@NonNull ActionTypes action, @NonNull Runnable runnable) {
         myActions.put(action, runnable);
     }
 
 
-    public ActionRunnable getActionRunnable(@NonNull Action action) {
+    public Runnable getActionRunnable(@NonNull ActionTypes action) {
         if (myActions.containsKey(action))
             return myActions.get(action);
         throw new IllegalArgumentException("unknown action:" + action);
@@ -555,10 +555,7 @@ public void setEditable(boolean editable) {
     }
 
     public boolean isEditable() {
-        if (myEditable) {
-            return !getEditorModel().isReadOnly();
-        }
-        return false;
+        return myEditable;
     }
 
     protected void setInternalState(@NonNull State internalState) {
diff --git a/app/src/main/java/com/apkide/ui/views/editor/EditorModel.java b/app/src/main/java/com/apkide/ui/views/editor/EditorModel.java
index 8a0e95c..1238836 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/EditorModel.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/EditorModel.java
@@ -6,73 +6,54 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.apkide.common.AppLog;
+import com.apkide.common.app.AppLog;
+import com.apkide.common.io.IOUtils;
 
 import java.io.IOException;
+import java.io.LineNumberReader;
 import java.io.Reader;
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Vector;
 
 public class EditorModel implements Model {
 
-
 	private final List<ModelListener> myListeners;
 	private final List<TextLine> myLines;
 	private final String myLineBreak;
-	private TextBuffer myBuffer;
+	private TextLineBuffer myBuffer;
 	private int mySpanLine;
 	private long myLastTimestamps;
 
 	public EditorModel() {
-		myListeners = new Vector<>(1);
-		myLines = new ArrayList<>(100);//use LinkedList ?
-		myLines.add(new TextLineImpl());
-		myLineBreak = System.lineSeparator();
-		myLastTimestamps = System.currentTimeMillis();
-		mySpanLine = -1;
-		myBuffer = null;
-		switchSpanLine(0);
+		this(null);
 	}
 
-	public EditorModel(Reader reader, int tabSize) {
+	public EditorModel(Reader reader) {
 		myListeners = new Vector<>(1);
-		myLines = new ArrayList<>(100);//use LinkedList ?
-		myLines.add(new TextLineImpl());
+		myLines = new LinkedList<>();
 		myLineBreak = System.lineSeparator();
 		myLastTimestamps = System.currentTimeMillis();
 		mySpanLine = -1;
 		myBuffer = null;
-		try {
-			open(reader, tabSize);
-		} catch (IOException e) {
-			AppLog.e(e);
-		}
-	}
-
-	public void open(Reader reader, int tabSize) throws IOException {
-
-		ReaderUtilities.read(reader, new ReaderUtilities.ReaderRunnable() {
-
-			@Override
-			public boolean readLine(int line, String text) {
-				if (text.length() == 0) {
-					myLines.add(new TextLineImpl());
-					return true;
+		if (reader != null) {
+			LineNumberReader lineNumberReader = new LineNumberReader(reader);
+			try {
+				String line;
+				while ((line = lineNumberReader.readLine()) != null) {
+					myLines.add(new TextLineImpl(line));
 				}
-				myLines.add(new TextLineImpl(text));
-				return true;
+			} catch (IOException e) {
+				AppLog.e(e);
+			}finally {
+				IOUtils.safeClose(lineNumberReader);
 			}
+		}
 
-			@Override
-			public void readLineBreak(String lineBreak) {
-
-			}
-		});
-		if (myLines.size() == 0) {
+		if (myLines.size() == 0)
 			myLines.add(new TextLineImpl());
-		}
-		reader.close();
+
+		switchSpanLine(0);
 	}
 
 	@Override
@@ -151,7 +132,7 @@ public void removeLineBreak(int line) {
 	public void removeChar(int line, int column) {
 		synchronized (this) {
 			switchSpanLine(line);
-			myBuffer.delete(column, column+1);
+			myBuffer.delete(column, column + 1);
 			lastEditTimestamps();
 		}
 		fireRemoveUpdate(line, column, line, column);
@@ -216,7 +197,7 @@ private void switchSpanLine(int line) {
 
 		mySpanLine = line;
 		if (myBuffer == null)
-			myBuffer = new TextBuffer(myLines.get(line));
+			myBuffer = new TextLineBuffer(myLines.get(line));
 		else
 			myBuffer.set(myLines.get(line));
 	}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/FloatBuffer.java b/app/src/main/java/com/apkide/ui/views/editor/FloatBuffer.java
deleted file mode 100644
index e707344..0000000
--- a/app/src/main/java/com/apkide/ui/views/editor/FloatBuffer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apkide.ui.views.editor;
-
-class FloatBuffer {
-
-    public static float[] obtain(int len) {
-        float[] buf;
-
-        synchronized (FloatBuffer.class) {
-            buf = sTemp;
-            sTemp = null;
-        }
-
-        if (buf == null || buf.length < len) {
-            buf = new float[len];
-        }
-
-        return buf;
-    }
-
-
-    public static void recycle(float[] temp) {
-        if (temp.length > 8192) return;
-
-        synchronized (FloatBuffer.class) {
-            sTemp = temp;
-        }
-    }
-
-    private static float[] sTemp = null;
-
-
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Location.java b/app/src/main/java/com/apkide/ui/views/editor/Location.java
deleted file mode 100644
index 5a20112..0000000
--- a/app/src/main/java/com/apkide/ui/views/editor/Location.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.apkide.ui.views.editor;
-
-public class Location {
-    public float x;
-    public float y;
-
-    public Location(float x, float y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Location location = (Location) o;
-
-        if (Float.compare(location.x, x) != 0) return false;
-        return Float.compare(location.y, y) == 0;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (x != +0.0f ? Float.floatToIntBits(x) : 0);
-        result = 31 * result + (y != +0.0f ? Float.floatToIntBits(y) : 0);
-        return result;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Model.java b/app/src/main/java/com/apkide/ui/views/editor/Model.java
index 4b2d03e..6977f06 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/Model.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/Model.java
@@ -65,7 +65,6 @@ public interface Model {
     @NonNull
     Reader getReader(int startLine, int startColumn, int endLine, int endColumn);
 
-
     int getStyle(int line, int column);
 
     int getStyleCount();
diff --git a/app/src/main/java/com/apkide/ui/views/editor/ModelReader.java b/app/src/main/java/com/apkide/ui/views/editor/ModelReader.java
index e659200..40391f6 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/ModelReader.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/ModelReader.java
@@ -2,7 +2,7 @@
 
 import java.io.Reader;
 
-class ModelReader extends Reader {
+public class ModelReader extends Reader {
     private final Model myModel;
     private int myStartLine;
     private int myStartColumn;
@@ -12,7 +12,7 @@ class ModelReader extends Reader {
     private final char[] myLineBreak;
     private int myColumn;
 
-    ModelReader(Model model, int startLine, int startColumn, int endLine, int endColumn, boolean useSpaces, String lineBreak) {
+    public ModelReader(Model model, int startLine, int startColumn, int endLine, int endColumn, boolean useSpaces, String lineBreak) {
         myModel = model;
         myStartLine = startLine;
         myStartColumn = startColumn;
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Position.java b/app/src/main/java/com/apkide/ui/views/editor/Position.java
deleted file mode 100644
index debf012..0000000
--- a/app/src/main/java/com/apkide/ui/views/editor/Position.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.apkide.ui.views.editor;
-
-public class Position {
-    public int line;
-    public int column;
-
-    public Position(int line, int column) {
-        this.line = line;
-        this.column = column;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Position position = (Position) o;
-
-        if (line != position.line) return false;
-        return column == position.column;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = line;
-        result = 31 * result + column;
-        return result;
-    }
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/ReaderUtilities.java b/app/src/main/java/com/apkide/ui/views/editor/ReaderUtilities.java
deleted file mode 100644
index c708557..0000000
--- a/app/src/main/java/com/apkide/ui/views/editor/ReaderUtilities.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apkide.ui.views.editor;
-
-import com.apkide.common.AppLog;
-
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.Reader;
-
-public class ReaderUtilities {
-
-	public static void read(Reader reader, ReaderRunnable runnable) {
-		try {
-			LineNumberReader lineNumberReader = new LineNumberReader(reader);
-			int line = 0;
-			while (true) {
-				String text = lineNumberReader.readLine();
-				if (text == null) break;
-				runnable.readLine(line, text);
-				line++;
-			}
-
-		} catch (IOException e) {
-			AppLog.e(e);
-		}
-	}
-
-	public interface ReaderRunnable {
-		boolean readLine(int line, String text);
-
-		void readLineBreak(String lineBreak);
-	}
-}
diff --git a/app/src/main/java/com/apkide/ui/views/editor/TextLine.java b/app/src/main/java/com/apkide/ui/views/editor/TextLine.java
index 289550c..04941d3 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/TextLine.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/TextLine.java
@@ -7,30 +7,32 @@
 import androidx.annotation.NonNull;
 
 public interface TextLine extends CharSequence, GetChars {
-    void set(@NonNull char[] chars);
+	void set(@NonNull char[] chars);
 
-    void set(@NonNull CharSequence text);
+	void set(@NonNull CharSequence text);
 
-    void append(@NonNull CharSequence text);
+	void append(@NonNull CharSequence text);
 
-    void append(@NonNull char[] chars);
+	void append(@NonNull char[] chars);
 
-    void insert(int index,@NonNull CharSequence text);
+	void insert(int index, @NonNull CharSequence text);
 
-    void insert(int index, @NonNull char[] chars);
+	void insert(int index, @NonNull char[] chars);
 
-    void delete(int start, int end);
+	void delete(int start, int end);
 
-    @NonNull
-    char[] getArray();
+	@NonNull
+	char[] getArray();
 
-    @NonNull
-    String get();
+	@NonNull
+	String get();
 
-    @NonNull
-    String get(int start,int end);
+	@NonNull
+	String get(int start, int end);
 
-    float measure(int start, int end,@NonNull Paint paint);
-    int getWidths(int start, int end, float[] widths,@NonNull Paint paint);
-    void draw(@NonNull Canvas canvas, int start, int end, float x, float y,@NonNull Paint paint);
+	float measure(int start, int end, @NonNull Paint paint);
+
+	void getWidths(int start, int end,@NonNull float[] widths, @NonNull Paint paint);
+
+	void draw(@NonNull Canvas canvas, int start, int end, float x, float y, @NonNull Paint paint);
 }
diff --git a/app/src/main/java/com/apkide/ui/views/editor/TextBuffer.java b/app/src/main/java/com/apkide/ui/views/editor/TextLineBuffer.java
similarity index 83%
rename from app/src/main/java/com/apkide/ui/views/editor/TextBuffer.java
rename to app/src/main/java/com/apkide/ui/views/editor/TextLineBuffer.java
index 29f3f02..c949a55 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/TextBuffer.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/TextLineBuffer.java
@@ -7,16 +7,16 @@
 
 import androidx.annotation.NonNull;
 
-public class TextBuffer implements TextLine {
+public class TextLineBuffer implements TextLine {
 	private static final int LIMIT = 2048;
 
 	private final SpannableStringBuilder myBuilder = new SpannableStringBuilder();
 
-	public TextBuffer(char[] chars) {
+	public TextLineBuffer(char[] chars) {
 		this(String.valueOf(chars));
 	}
 
-	public TextBuffer(CharSequence text) {
+	public TextLineBuffer(CharSequence text) {
 		myBuilder.clear();
 		myBuilder.append(text);
 	}
@@ -82,24 +82,24 @@ public float measure(int start, int end, @NonNull Paint paint) {
 		if (length() < LIMIT || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
 			return paint.measureText(myBuilder, start, end);
 		}
-		char[] temp = CharBuffer.obtain(end - start);
+		char[] temp = Buffers.chars(end - start);
 		getChars(start, end, temp, 0);
 		float w = paint.measureText(temp, 0, end - start);
-		CharBuffer.recycle(temp);
+		Buffers.recycle(temp);
 		return w;
 	}
 
 	@Override
-	public int getWidths(int start, int end, float[] widths, @NonNull Paint paint) {
+	public void getWidths(int start, int end, @NonNull float[] widths, @NonNull Paint paint) {
 		// return myBuilder.getTextWidths(start,end,widths,paint);
 		if (length() < LIMIT || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-			return paint.getTextWidths(myBuilder, start, end, widths);
+			paint.getTextWidths(myBuilder, start, end, widths);
+			return;
 		}
-		char[] temp = CharBuffer.obtain(end - start);
+		char[] temp = Buffers.chars(end - start);
 		getChars(start, end, temp, 0);
-		int r = paint.getTextWidths(temp, 0, end - start, widths);
-		CharBuffer.recycle(temp);
-		return r;
+		paint.getTextWidths(temp, 0, end - start, widths);
+		Buffers.recycle(temp);
 	}
 
 	@Override
@@ -109,10 +109,10 @@ public void draw(@NonNull Canvas canvas, int start, int end, float x, float y, @
 			canvas.drawText(myBuilder, start, end, x, y, paint);
 			return;
 		}
-		char[] temp = CharBuffer.obtain(end - start);
+		char[] temp = Buffers.chars(end - start);
 		getChars(start, end, temp, 0);
 		canvas.drawText(temp, 0, end - start, x, y, paint);
-		CharBuffer.recycle(temp);
+		Buffers.recycle(temp);
 	}
 
 	@Override
diff --git a/app/src/main/java/com/apkide/ui/views/editor/TextLineImpl.java b/app/src/main/java/com/apkide/ui/views/editor/TextLineImpl.java
index 8ec3541..5844529 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/TextLineImpl.java
+++ b/app/src/main/java/com/apkide/ui/views/editor/TextLineImpl.java
@@ -11,10 +11,7 @@ public class TextLineImpl implements TextLine {
     private static final char[] EMPTY = new char[0];
     private char[] myChars = EMPTY;
 
-    public TextLineImpl() {
-
-    }
-
+    public TextLineImpl() {}
 
     public TextLineImpl(char[] chars) {
         myChars = chars;
@@ -86,8 +83,8 @@ public float measure(int start, int end, @NonNull Paint paint) {
     }
 
     @Override
-    public int getWidths(int start, int end, float[] widths, @NonNull Paint paint) {
-        return paint.getTextWidths(myChars, start, end - start, widths);
+    public void getWidths(int start, int end, @NonNull float[] widths, @NonNull Paint paint) {
+        paint.getTextWidths(myChars, start, end - start, widths);
     }
 
     @Override
diff --git a/app/src/main/res/layout/browser_file.xml b/app/src/main/res/layout/browser_file.xml
index e223f6f..5f73204 100644
--- a/app/src/main/res/layout/browser_file.xml
+++ b/app/src/main/res/layout/browser_file.xml
@@ -2,23 +2,23 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <HorizontalScrollView
-        android:id="@+id/filebrowserScrollView"
+        android:id="@+id/fileListScrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:fillViewport="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" >
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/filebrowserListView"
+            android:id="@+id/fileListView"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            tools:listitem="@layout/browser_file_entry" />
     </HorizontalScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
-
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/browser_file_entry.xml b/app/src/main/res/layout/browser_file_entry.xml
index 490a9e7..66f3726 100644
--- a/app/src/main/res/layout/browser_file_entry.xml
+++ b/app/src/main/res/layout/browser_file_entry.xml
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="?android:attr/selectableItemBackground"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/fileEntryIcon"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/fileEntryLabel"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="8dp"
         tools:srcCompat="@mipmap/file_type_unknown"
         android:importantForAccessibility="no" />
 
     <TextView
         android:id="@+id/fileEntryLabel"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:singleLine="true"
         android:text="File.java"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/fileEntryIcon"
-        app:layout_constraintTop_toTopOf="parent"
-        android:singleLine="true" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        />
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_headers.xml b/app/src/main/res/xml/preferences_headers.xml
index e93d5b8..40b04c1 100644
--- a/app/src/main/res/xml/preferences_headers.xml
+++ b/app/src/main/res/xml/preferences_headers.xml
@@ -20,7 +20,7 @@
 		android:summary="Show legal information about the application"
 		android:title="About &amp; Licenses">
 		<intent
-			android:targetClass="com.apkide.ui.activities.AboutUI"
+			android:targetClass="com.apkide.ui.AboutUI"
 			android:targetPackage="com.apkide.ui" />
 	</Preference>
 </PreferenceScreen>
diff --git a/common/build.gradle b/common/build.gradle
index 60a4715..038d51c 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -35,20 +35,8 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     coreLibraryDesugaring libs.desugar.jdk.libs.nio
+    implementation libs.androidx.annotation
     implementation libs.androidx.preference
     implementation libs.material
-
-    api libs.com.android.tools.smali.smali
-    api libs.com.android.tools.smali.smali.util
-    api libs.com.android.tools.smali.smali.baksmali
-    api libs.com.google.guava.guava
-    api libs.org.apache.commons.commons.text
-    api 'org.yaml:snakeyaml:1.33:android'
-    api libs.xmlunit.xmlunit
-    api libs.tools.r8
-    api libs.dialogx
-
-    api 'com.thoughtworks.xstream:xstream:1.4.20'
-
     testImplementation libs.junit
 }
\ No newline at end of file
diff --git a/common/libs/xpp3-1.1.4c.0.jar b/common/libs/xpp3-1.1.4c.0.jar
deleted file mode 100644
index 59cbd21..0000000
Binary files a/common/libs/xpp3-1.1.4c.0.jar and /dev/null differ
diff --git a/common/src/main/java/com/apkide/common/ApplicationProvider.java b/common/src/main/java/com/apkide/common/ApplicationProvider.java
deleted file mode 100644
index 2d75eaf..0000000
--- a/common/src/main/java/com/apkide/common/ApplicationProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.apkide.common;
-
-import android.content.Context;
-
-import java.io.File;
-
-public abstract class ApplicationProvider {
-
-	public abstract File foundBinary(String binaryName);
-
-	public abstract File foundFile(String fileName);
-
-	public abstract File foundAndroidFrameworkFile();
-
-	public abstract File getTempDirectory();
-
-	public abstract Context getContext();
-
-	private static final Object lock = new Object();
-
-	private static ApplicationProvider applicationProvider;
-
-	public static void set(ApplicationProvider provider) {
-		synchronized (lock) {
-			applicationProvider = provider;
-		}
-	}
-
-	public static ApplicationProvider get() {
-		synchronized (lock) {
-			return applicationProvider;
-		}
-	}
-
-}
diff --git a/common/src/main/java/com/apkide/common/Color.java b/common/src/main/java/com/apkide/common/Color.java
new file mode 100644
index 0000000..9584b12
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/Color.java
@@ -0,0 +1,74 @@
+package com.apkide.common;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+
+public class Color implements Serializable {
+
+	private static final long serialVersionUID = -8789388831000526893L;
+
+	public final int value;
+
+	public Color(@NonNull String hexColor){
+		if (hexColor.charAt(0) == '#') {
+			long color = Long.parseLong(hexColor.substring(1), 16);
+			if (hexColor.length() == 7) {
+				color |= 0xffff_ffff_ff00_0000L;
+			} else if (hexColor.length() != 9) {
+				throw new IllegalArgumentException("Unknown color");
+			}
+			this.value= (int) color;
+		}
+		throw new IllegalArgumentException("Unknown color");
+
+	}
+	public Color(int a, int r, int g, int b){
+		this((a << 24) | (r << 16) | (g << 8) | b);
+	}
+
+	public Color(int r, int g, int b){
+		this(0xff000000 | (r << 16) | (g << 8) | b);
+	}
+
+	public Color(int value) {
+		this.value = value;
+	}
+
+	public int alpha(){
+		return value >>> 24;
+	}
+
+	public int red(){
+		return (value >> 16) & 0xFF;
+	}
+
+	public int green(){
+		return (value >> 8) & 0xFF;
+	}
+
+	public int blue(){
+		return value & 0xFF;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Color color = (Color) o;
+
+		return value == color.value;
+	}
+
+	@Override
+	public int hashCode() {
+		return value;
+	}
+
+	@NonNull
+	@Override
+	public String toString() {
+		return String.valueOf(value);
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/Command.java b/common/src/main/java/com/apkide/common/Command.java
deleted file mode 100644
index ae0835b..0000000
--- a/common/src/main/java/com/apkide/common/Command.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.apkide.common;
-
-import androidx.annotation.NonNull;
-
-public interface Command {
-    @NonNull
-    String getName();
-
-    boolean isEnabled();
-
-    boolean run();
-}
diff --git a/common/src/main/java/com/apkide/common/CountingInputStream.java b/common/src/main/java/com/apkide/common/CountingInputStream.java
deleted file mode 100644
index 9d567dd..0000000
--- a/common/src/main/java/com/apkide/common/CountingInputStream.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.apkide.common;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class CountingInputStream extends ProxyInputStream {
-	
-	private long count;
-	
-	public CountingInputStream(final InputStream in) {
-		super(in);
-	}
-	
-	
-	@Override
-	public synchronized long skip(final long length) throws IOException {
-		final long skip = super.skip(length);
-		this.count += skip;
-		return skip;
-	}
-	
-	@Override
-	protected synchronized void afterRead(final int n) {
-		if (n != -1) {
-			this.count += n;
-		}
-	}
-	
-	public int getCount() {
-		final long result = getByteCount();
-		if (result > Integer.MAX_VALUE) {
-			throw new ArithmeticException("The byte count " + result + " is too large to be converted to an int");
-		}
-		return (int) result;
-	}
-	
-	public int resetCount() {
-		final long result = resetByteCount();
-		if (result > Integer.MAX_VALUE) {
-			throw new ArithmeticException("The byte count " + result + " is too large to be converted to an int");
-		}
-		return (int) result;
-	}
-	
-	public synchronized long getByteCount() {
-		return this.count;
-	}
-	
-	public synchronized long resetByteCount() {
-		final long tmp = this.count;
-		this.count = 0;
-		return tmp;
-	}
-	
-}
-
diff --git a/app/src/main/java/com/apkide/ui/util/EntryAdapter.java b/common/src/main/java/com/apkide/common/EntryListAdapter.java
similarity index 81%
rename from app/src/main/java/com/apkide/ui/util/EntryAdapter.java
rename to common/src/main/java/com/apkide/common/EntryListAdapter.java
index e131a1e..17db59f 100644
--- a/app/src/main/java/com/apkide/ui/util/EntryAdapter.java
+++ b/common/src/main/java/com/apkide/common/EntryListAdapter.java
@@ -1,4 +1,4 @@
-package com.apkide.ui.util;
+package com.apkide.common;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -13,22 +13,23 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.apkide.ui.App;
+import com.apkide.common.app.Application;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+
 @SuppressLint("NotifyDataSetChanged")
-public abstract class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public abstract class EntryListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private final List<Entry> entries = new ArrayList<>();
-    private EntryClickListener clickListener;
-    private EntryLongPressListener longPressListener;
+    private OnEntryClickListener clickListener;
+    private OnEntryLongPressListener longPressListener;
     private EntryHolderFactory holderFactory;
 
     public Context getContext() {
-        return App.getContext();
+        return Application.get().getContext();
     }
 
     @Override
@@ -40,7 +41,7 @@ public List<Entry> getEntries() {
         return new ArrayList<>(entries);
     }
 
-    public void updateEntries(@NonNull Collection<Entry> entries) {
+    public void updateEntries(@NonNull Collection<? extends Entry> entries) {
         this.entries.clear();
         this.entries.addAll(entries);
         notifyDataSetChanged();
@@ -100,12 +101,12 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
         Entry entry = entries.get(position);
         if (clickListener != null) {
-            holder.itemView.setOnClickListener(v -> clickListener.entryClicked(entry, v, position));
+            holder.itemView.setOnClickListener(v -> clickListener.onEntryClicked(entry, v, position));
         }
 
         if (longPressListener != null) {
             holder.itemView.setLongClickable(true);
-            holder.itemView.setOnLongClickListener(v -> longPressListener.entryLongPressed(entry, v, position));
+            holder.itemView.setOnLongClickListener(v -> longPressListener.onEntryLongPressed(entry, v, position));
         }
 
         if (holderFactory != null)
@@ -116,11 +117,11 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
     protected abstract void holderBound(@NonNull Entry entry, @NonNull RecyclerView.ViewHolder holder, int position);
 
-    public void setClickListener(EntryClickListener clickListener) {
+    public void setClickListener(OnEntryClickListener clickListener) {
         this.clickListener = clickListener;
     }
 
-    public void setLongPressListener(EntryLongPressListener longPressListener) {
+    public void setLongPressListener(OnEntryLongPressListener longPressListener) {
         this.longPressListener = longPressListener;
     }
 
@@ -142,12 +143,12 @@ public interface EntryHolderFactory {
         int getEntryType(@NonNull Entry entry, int position);
     }
 
-    public interface EntryClickListener {
-        void entryClicked(Entry entry, View view, int position);
+    public interface OnEntryClickListener {
+        void onEntryClicked(Entry entry, View view, int position);
     }
 
-    public interface EntryLongPressListener {
-        boolean entryLongPressed(Entry entry, View view, int position);
+    public interface OnEntryLongPressListener {
+        boolean onEntryLongPressed(Entry entry, View view, int position);
     }
 
 
diff --git a/common/src/main/java/com/apkide/common/SafeEventListenerList.java b/common/src/main/java/com/apkide/common/EventListenerList.java
similarity index 98%
rename from common/src/main/java/com/apkide/common/SafeEventListenerList.java
rename to common/src/main/java/com/apkide/common/EventListenerList.java
index 5261709..7c08e57 100644
--- a/common/src/main/java/com/apkide/common/SafeEventListenerList.java
+++ b/common/src/main/java/com/apkide/common/EventListenerList.java
@@ -12,7 +12,7 @@
 import java.lang.reflect.Array;
 import java.util.EventListener;
 
-public class SafeEventListenerList implements Serializable {
+public class EventListenerList implements Serializable {
 	
 	private static final long serialVersionUID = 7854660335615510019L;
 	private final static Object[] NULL_ARRAY = new Object[0];
diff --git a/common/src/main/java/com/apkide/common/FileSystem.java b/common/src/main/java/com/apkide/common/FileSystem.java
new file mode 100644
index 0000000..1786480
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/FileSystem.java
@@ -0,0 +1,459 @@
+package com.apkide.common;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.apkide.common.io.FileUtils;
+import com.apkide.common.io.IOUtils;
+
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+
+public class FileSystem {
+	private static final String TAG = "FileSystem";
+	private static final int BINARY_CHECK_BYTE_COUNT = 8000;
+	private static FileArchiveReader sArchiveReader;
+	private static final Object sLock = new Object();
+
+	public static void setArchiveReader(FileArchiveReader archiveReader) {
+		synchronized (sLock) {
+			sArchiveReader = archiveReader;
+		}
+	}
+
+	public static FileArchiveReader getArchiveReader() {
+		synchronized (sLock) {
+			return sArchiveReader;
+		}
+	}
+
+
+	public static boolean areEqualTimestamps(long time1, long time2) {
+		long difference = Math.abs(time1 - time2);
+		if (difference <= 1000)
+			return true;
+		if (difference % 3600000 <= 0)
+			return difference <= 13 * 3600000;
+		if ((difference - 1000) % 3600000 == 0)
+			return difference <= 13 * 3600000;
+		if ((difference + 1000) % 3600000 == 0)
+			return difference <= 13 * 3600000;
+		return false;
+	}
+
+	public static boolean isBinary(String filePath) {
+		if (isJarFileEntry(filePath))
+			return false;
+
+		long fileLength = new File(filePath).length();
+		int readCount = BINARY_CHECK_BYTE_COUNT < fileLength ? BINARY_CHECK_BYTE_COUNT : (int) fileLength;
+		try {
+			try (FileInputStream fis = new FileInputStream(filePath)) {
+				byte[] bytes = new byte[readCount];
+				new DataInputStream(fis).readFully(bytes);
+				for (byte aByte : bytes) {
+					if (aByte == 0)
+						return true;
+				}
+				return false;
+			}
+		} catch (IOException e) {
+			return false;
+		}
+	}
+
+	public static Reader readFile(String path) throws IOException {
+		return readFile(path, null);
+	}
+
+	public static Reader readFile(String filePath, String encoding) throws IOException {
+		if (isNormalFile(filePath)) {
+			if (sArchiveReader != null && sArchiveReader.isArchiveFileEntry(filePath)) {
+				Reader reader = sArchiveReader.getArchiveEntryReader(new File(filePath).getParent(), FileUtils.getFileName(filePath), encoding);
+				return new Reader() {
+					@Override
+					public int read(char[] cbuf, int off, int len) throws IOException {
+						return reader.read(cbuf, off, len);
+					}
+
+					@Override
+					public void close() throws IOException {
+						sArchiveReader.closeArchive();
+					}
+				};
+			}
+			return encoding == null ? new FileReader(filePath) : new InputStreamReader(new FileInputStream(filePath), encoding);
+		} else if (isJarFileEntry(filePath))
+			return readJarFileEntry(filePath, encoding);
+		throw new IOException();
+	}
+
+	public static boolean isRegexContainedInFile(String regex, String filePath) {
+		try {
+			Pattern pattern = Pattern.compile(regex);
+			try (Reader r = readFile(filePath)) {
+				BufferedReader bufferedReader = new BufferedReader(r);
+				String line;
+				while ((line = bufferedReader.readLine()) != null) {
+					if (pattern.matcher(line).find())
+						return true;
+				}
+				return false;
+			}
+		} catch (IOException e) {
+			return false;
+		}
+	}
+
+	private static String getEnclosingJar(String path) {
+		if (isJar(path))
+			return path;
+		String parentPath = path;
+		while (true) {
+			parentPath = getParentDirPath(parentPath);
+			if (parentPath == null)
+				return null;
+			if (isJar(parentPath))
+				return parentPath;
+		}
+	}
+
+	public static boolean isJar(String path) {
+		return new File(path).isFile() && (path.endsWith(".jar") || path.endsWith(".zip"));
+	}
+
+	private static Reader readJarFileEntry(String filePath, String encoding) throws IOException {
+		String jarFilepath = getEnclosingJar(filePath);
+		String entryPath = getJarFileEntryRelativePath(filePath);
+		if (sArchiveReader == null) {
+			throw new IOException("not archive reader.");
+		}
+		Reader reader = sArchiveReader.getArchiveEntryReader(jarFilepath, entryPath, encoding);
+		return new Reader() {
+			@Override
+			public int read(char[] cbuf, int off, int len) throws IOException {
+				return reader.read(cbuf, off, len);
+			}
+
+			@Override
+			public void close() throws IOException {
+				sArchiveReader.closeArchive();
+			}
+		};
+	}
+
+	private static String getJarFileEntryRelativePath(String path) {
+		String jarFilepath = getEnclosingJar(path);
+		assert jarFilepath != null;
+		if (jarFilepath.length() == path.length())
+			return "";
+		return path.substring(jarFilepath.length() + 1);
+	}
+
+
+	public static void writeFile(String filePath, Reader content) throws IOException {
+		FileWriter writer = new FileWriter(filePath, false);
+		IOUtils.writeString(writer, IOUtils.readString(content, true), true);
+	}
+
+	public static boolean isRoot(String path) {
+		return path.equals("/");
+	}
+
+	public static String getParentDirPath(String path) {
+		if (path.length() == 0)
+			return null;
+		if (path.equals("/"))
+			return null;
+		int index = path.lastIndexOf('/');
+		if (index == 0)
+			return "/";
+		else if (index == -1)
+			return null;
+		return path.substring(0, index);
+	}
+
+	public static String getName(String path) {
+		return path.substring(path.lastIndexOf('/') + 1);
+	}
+
+	public static boolean exists(String path) {
+		return new File(path).exists() || isJarFileEntry(path);
+	}
+
+	public static boolean isJarFileEntry(String path) {
+		String jarPath = getEnclosingJar(path);
+		return jarPath != null && sArchiveReader != null && sArchiveReader.isArchiveFileEntry(path);
+	}
+
+	public static boolean isJarDirectoryEntry(String path) {
+		String jarPath = getEnclosingJar(path);
+		return jarPath != null && sArchiveReader != null && !sArchiveReader.isArchiveFileEntry(path);
+	}
+
+	public static boolean isJarEntry(String path) {
+		String jarPath = getEnclosingJar(path);
+		return jarPath != null;
+	}
+
+	public static boolean isDirectory(String path) {
+		return isNormalDirectory(path) || isJarDirectoryEntry(path);
+	}
+
+	public static boolean isNormalDirectory(String path) {
+		return new File(path).isDirectory();
+	}
+
+	public static boolean isNormalFile(String path) {
+		return new File(path).isFile() && !isJar(path);
+	}
+
+	public static boolean isFile(String path) {
+		return (isNormalFile(path) || isJarFileEntry(path)) && !isJar(path);
+	}
+
+	public static List<String> getChildEntries(String dirPath) {
+		if (isJarEntry(dirPath)) {
+			String jarFilepath = getEnclosingJar(dirPath);
+			String entryPath = getJarFileEntryRelativePath(dirPath);
+			List<String> entries = null;
+			try {
+				if (sArchiveReader != null)
+					entries = sArchiveReader.getArchiveDirectoryEntries(jarFilepath, entryPath);
+			} catch (IOException ignored) {
+
+			}
+			if (entries == null)
+				return new ArrayList<>();
+			return entries;
+		} else {
+			String[] entries = new File(dirPath).list();
+			if (entries == null)
+				return new ArrayList<>();
+			String[] paths = new String[entries.length];
+			String prefix = dirPath.equals("/") ? "/" : dirPath + File.separator;
+			for (int i = 0; i < paths.length; i++) {
+				paths[i] = prefix + entries[i];
+			}
+			return Arrays.asList(paths);
+		}
+	}
+
+	public static String getRelativePath(String parentPath, String filePath) {
+		if (parentPath.equals(filePath))
+			return "";
+		return filePath.substring(parentPath.length() + 1);
+	}
+
+	public static boolean isContained(String path, String entryPath) {
+		return entryPath != null && (entryPath.equals(path) || entryPath.startsWith(path + "/"));
+	}
+
+	public static String getFilePathAfterRename(String filePath, String oldPath, String newPath) {
+		return newPath + filePath.substring(oldPath.length());
+	}
+
+	public static void rename(String path, String newPath) throws IOException {
+		File newFile = new File(newPath);
+		if (newFile.exists())
+			throw new IOException(newPath + " already exists");
+		if (!new File(path).renameTo(newFile))
+			throw new IOException(path + " could not be renamed");
+	}
+
+	public static void createDir(String path) throws IOException {
+		if (!new File(path).mkdir()) {
+			if (!new File(path).mkdirs()) {
+				throw new IOException(path + " could not be created");
+			}
+		}
+	}
+
+	public static void createFile(String path) throws IOException {
+		if (new File(path).exists())
+			throw new IOException(path + " already exists");
+		new File(path).createNewFile();
+	}
+
+	public static void createFile(String path, String content) throws IOException {
+		if (new File(path).exists())
+			throw new IOException(path + " already exists");
+		FileWriter writer = new FileWriter(path);
+		writer.write(content);
+		writer.close();
+	}
+
+	public static void delete(String path) throws IOException {
+		delete(new File(path));
+	}
+
+	private static void delete(File file) throws IOException {
+		if (file.isDirectory()) {
+			String[] children = file.list();
+			if (children != null) {
+				for (String child : children)
+					delete(new File(file, child));
+			}
+		}
+		if (!file.delete())
+			throw new IOException(file.getPath() + " could not be deleted");
+	}
+
+	public static boolean mkdirs(String dirPath) {
+		return new File(dirPath).mkdirs();
+	}
+
+	public static long getLastModified(String filePath) {
+		return new File(filePath).lastModified();
+	}
+
+	public static long getLength(String filePath) {
+		return new File(filePath).length();
+	}
+
+	public static String getExtension(String filePath) {
+		String filename = getName(filePath);
+		int i = filename.lastIndexOf('.');
+		if (i < 0)
+			return "";
+		return filename.substring(i);
+	}
+
+	public static String tryMakeRelative(String rootPath, String path) {
+		if (isContained(rootPath, path))
+			return path.substring(rootPath.length() + 1);
+		else
+			return path;
+	}
+
+	public static String resolvePath(String rootPath, String relativeOrAbsolutePath) {
+		String res = resolvePath0(rootPath, relativeOrAbsolutePath);
+		Log.d(TAG, "Resolved (" + rootPath + ", " + relativeOrAbsolutePath + ") to " + res);
+		return res;
+	}
+
+	private static String resolvePath0(String rootPath, String relativeOrAbsolutePath) {
+		String relPath = relativeOrAbsolutePath;
+		relPath = relPath.replace("\\\\", "/");
+		relPath = relPath.replace("\\", "/");
+		if (!relPath.contains("/"))
+			return rootPath + "/" + relPath;
+
+		if (relPath.startsWith("/"))
+			relPath = ".." + relPath;
+
+		String tryRelative = getCanonicalPathPreservingSymlinks(new File(rootPath, relPath));
+		if (new File(tryRelative).exists())
+			return tryRelative;
+		return relativeOrAbsolutePath;
+	}
+
+	public static String getCanonicalPathPreservingSymlinks(File f) {
+		List<String> canonicalPathComponents = new ArrayList<>();
+		String absolutePath = f.getAbsolutePath();
+		String[] absPathComponents = absolutePath.split("[/\\\\]");
+		for (String absPathComponent : absPathComponents) {
+			if (absPathComponent.length() != 0 && !".".equals(absPathComponent)) {
+				if ("..".equals(absPathComponent)) {
+					if (canonicalPathComponents.isEmpty()) {
+						return absolutePath;
+					} else
+						canonicalPathComponents.remove(canonicalPathComponents.size() - 1);
+				} else
+					canonicalPathComponents.add(absPathComponent);
+			}
+		}
+		StringBuilder resBuilder = new StringBuilder();
+		for (String canonicalPathComponent : canonicalPathComponents) {
+			resBuilder.append("/");
+			resBuilder.append(canonicalPathComponent);
+		}
+		if (absolutePath.endsWith("/")) resBuilder.append("/");
+		return resBuilder.toString();
+	}
+
+	public static String getEnclosingDir(String path, String dirName) {
+		path = getParentDirPath(path);
+		while (path != null) {
+			if (getName(path).equals(dirName))
+				return path;
+			path = getParentDirPath(path);
+		}
+		return null;
+	}
+
+	public static boolean isValidFilePath(String path) {
+		return path.startsWith("/") && isNormalDirectory(getParentDirPath(path));
+	}
+
+	public static int getContainedFileCount(String path, int maxCount, String... suffixes) {
+		if (isNormalDirectory(path)) {
+			int count = 0;
+			List<String> entries;
+			entries = getChildEntries(path);
+			for (String childPath : entries) {
+				count += getContainedFileCount(childPath, maxCount, suffixes);
+				if (count >= maxCount)
+					return count;
+			}
+			return count;
+		} else if (isNormalFile(path)) {
+			for (String suffix : suffixes) {
+				if (path.endsWith(suffix))
+					return 1;
+			}
+			return 0;
+		} else {
+			return 0;
+		}
+	}
+
+	public static void extractZipFile(InputStream zipIn, String targetPath) throws IOException {
+		ZipInputStream zipStream = new ZipInputStream(zipIn);
+		ZipEntry entry;
+		while ((entry = zipStream.getNextEntry()) != null) {
+			String entryPath = entry.getName();
+			String entryTargetPath = targetPath + File.separator + entryPath;
+			if (entry.isDirectory()) {
+				new File(entryTargetPath).mkdirs();
+			} else if (!new File(entryTargetPath).isFile()) {
+				new File(entryTargetPath).getParentFile().mkdirs();
+				FileOutputStream fileOut = new FileOutputStream(entryTargetPath);
+				IOUtils.copyBytes(zipStream, fileOut);
+				fileOut.close();
+			}
+		}
+	}
+
+	public interface FileArchiveReader {
+
+		@NonNull
+		Reader getArchiveEntryReader(String archivePath, String entryName, String encoding) throws IOException;
+
+		@NonNull
+		List<String> getArchiveDirectoryEntries(String archivePath, String entryName) throws IOException;
+
+		boolean isArchiveFileEntry(String filePath);
+
+		long getArchiveVersion(String archivePath);
+
+		void closeArchive() throws IOException;
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/InputStreamWrapper.java b/common/src/main/java/com/apkide/common/InputStreamWrapper.java
deleted file mode 100644
index 0f0d3ef..0000000
--- a/common/src/main/java/com/apkide/common/InputStreamWrapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.apkide.common;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class InputStreamWrapper extends InputStream {
-    private InputStream in;
-    private final long size;
-    private long readLength;
-
-    public InputStreamWrapper(InputStream in, long size) {
-        this.in = in;
-        this.size = size;
-        this.readLength = 0;
-    }
-
-    @Override
-    public int read() throws IOException {
-        byte[] bytes = new byte[1];
-        if (read(bytes) == -1) return -1;
-        return bytes[0];
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        int read;
-        if (readLength < size && (read = in.read(b, off, len)) != -1) {
-            readLength += read;
-            return read;
-        }
-        return -1;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (in != null) {
-            in.close();
-            in = null;
-        }
-    }
-}
diff --git a/common/src/main/java/com/apkide/common/KeyStroke.java b/common/src/main/java/com/apkide/common/KeyStroke.java
deleted file mode 100644
index e022858..0000000
--- a/common/src/main/java/com/apkide/common/KeyStroke.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.apkide.common;
-
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-
-import androidx.annotation.NonNull;
-
-import java.io.Serializable;
-
-public class KeyStroke implements Serializable {
-    private final boolean alt;
-    private final char ch;
-    private final boolean ctrl;
-    private final int keyCode;
-    private final boolean shift;
-
-    public KeyStroke(int keyCode, char ch, boolean shift, boolean ctrl, boolean alt) {
-        this.ch = ch;
-        this.keyCode = keyCode;
-        this.shift = shift;
-        this.ctrl = ctrl;
-        this.alt = alt;
-    }
-
-    public KeyStroke(int keyCode, boolean shift, boolean ctrl, boolean alt) {
-        this.ch = (char) 65535;
-        this.keyCode = keyCode;
-        this.shift = shift;
-        this.ctrl = ctrl;
-        this.alt = alt;
-    }
-
-    public boolean isChar() {
-        return this.ch != 65535;
-    }
-
-    public char getChar() {
-        return this.ch;
-    }
-
-    public int getKeyCode() {
-        return this.keyCode;
-    }
-
-    public boolean isShift() {
-        return this.shift;
-    }
-
-    public boolean isCtrl() {
-        return this.ctrl;
-    }
-
-    public boolean isAlt() {
-        return this.alt;
-    }
-
-    public boolean matches(KeyStroke pressedKeyStroke) {
-        if (this.alt == pressedKeyStroke.alt && this.ctrl == pressedKeyStroke.ctrl && this.shift == pressedKeyStroke.shift) {
-            if (this.keyCode == -1 || this.keyCode != pressedKeyStroke.keyCode) {
-                return this.ch != 65535 && this.ch == pressedKeyStroke.ch;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @NonNull
-    public String toString() {
-        String str = this.shift ? "Shift+" : "";
-        if (this.ctrl) {
-            str = str + "Ctrl+";
-        }
-        if (this.alt) {
-            str = str + "Alt+";
-        }
-        return str + getDisplayLabel();
-    }
-
-    private String getDisplayLabel() {
-        switch (this.keyCode) {
-            case -1:
-                return String.valueOf(Character.toUpperCase(this.ch));
-            case 19:
-                return "Up";
-            case 20:
-                return "Down";
-            case 21:
-                return "Left";
-            case 22:
-                return "Right";
-            case 24:
-                return "VolUp";
-            case 25:
-                return "VolDown";
-            case 61:
-                return "Tab";
-            case 62:
-                return "Space";
-            case 66:
-                return "Enter";
-            case 67:
-                return "Backspace";
-            case 92:
-                return "PgUp";
-            case 93:
-                return "PgDown";
-            case 122:
-                return "Home";
-            case 123:
-                return "End";
-            case 164:
-                return "VolMute";
-            default:
-                String displayLabel = (String.valueOf(KeyCharacterMap.load(0).getDisplayLabel(this.keyCode))).trim();
-                if (displayLabel.length() == 0) {
-                    String name = KeyEvent.keyCodeToString(this.keyCode).toLowerCase();
-                    if (name.startsWith("keycode_")) {
-                        name = name.substring("keycode_".length());
-                    }
-                    String name2 = name.replace("_", " ");
-                    return name2.substring(0, 1).toUpperCase() + name2.substring(1);
-                }
-                return displayLabel;
-        }
-    }
-
-    public String store() {
-        return this.keyCode + "," + ((int) this.ch) + "," + this.shift + "," + this.ctrl + "," + this.alt;
-    }
-
-    public static KeyStroke load(String value) {
-        String[] split = value.split(",");
-        if (split.length != 5) {
-            return null;
-        }
-        return new KeyStroke(
-                Integer.parseInt(split[0]),
-                (char) Integer.parseInt(split[1]),
-                Boolean.parseBoolean(split[2]),
-                Boolean.parseBoolean(split[3]),
-                Boolean.parseBoolean(split[4]));
-    }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/LineIterator.java b/common/src/main/java/com/apkide/common/LineIterator.java
similarity index 93%
rename from common/src/main/java/com/apkide/common/collections/LineIterator.java
rename to common/src/main/java/com/apkide/common/LineIterator.java
index 96c39bf..2069e6d 100644
--- a/common/src/main/java/com/apkide/common/collections/LineIterator.java
+++ b/common/src/main/java/com/apkide/common/LineIterator.java
@@ -1,6 +1,6 @@
-package com.apkide.common.collections;
+package com.apkide.common;
 
-import com.apkide.common.IOUtils;
+import com.apkide.common.io.IOUtils;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
@@ -13,7 +13,7 @@ public class LineIterator implements Iterator<String>, Closeable {
 	private final BufferedReader bufferedReader;
 	private String cachedLine;
 	private boolean finished;
-	
+
 	public LineIterator(final Reader reader) throws IllegalArgumentException {
 		if (reader == null) {
 			throw new IllegalArgumentException("Reader must not be null");
@@ -24,7 +24,7 @@ public LineIterator(final Reader reader) throws IllegalArgumentException {
 			bufferedReader = new BufferedReader(reader);
 		}
 	}
-	
+
 	@Override
 	public boolean hasNext() {
 		if (cachedLine != null) {
@@ -45,21 +45,21 @@ public boolean hasNext() {
 					return true;
 				}
 			}
-		} catch(final IOException ioe) {
+		} catch (final IOException ioe) {
 			IOUtils.safeClose(this);
 			throw new IllegalStateException(ioe);
 		}
 	}
-	
+
 	protected boolean isValidLine(final String line) {
 		return true;
 	}
-	
+
 	@Override
 	public String next() {
 		return nextLine();
 	}
-	
+
 	public String nextLine() {
 		if (!hasNext()) {
 			throw new NoSuchElementException("No more lines");
@@ -68,17 +68,17 @@ public String nextLine() {
 		cachedLine = null;
 		return currentLine;
 	}
-	
+
 	@Override
 	public void close() throws IOException {
 		finished = true;
 		cachedLine = null;
 		IOUtils.safeClose(bufferedReader);
 	}
-	
+
 	@Override
 	public void remove() {
 		throw new UnsupportedOperationException("remove not supported");
 	}
-	
+
 }
diff --git a/common/src/main/java/com/apkide/common/Location.java b/common/src/main/java/com/apkide/common/Location.java
new file mode 100644
index 0000000..9b9acc4
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/Location.java
@@ -0,0 +1,15 @@
+package com.apkide.common;
+
+public class Location {
+	public int x;
+	public int y;
+
+	public Location(int x, int y) {
+		this.x = x;
+		this.y = y;
+	}
+
+	public boolean isInvalid() {
+		return x >= 0 && y >= 0;
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/Position.java b/common/src/main/java/com/apkide/common/Position.java
new file mode 100644
index 0000000..9be5245
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/Position.java
@@ -0,0 +1,15 @@
+package com.apkide.common;
+
+public class Position {
+	public int line;
+	public int column;
+
+	public Position(int line, int column) {
+		this.line = line;
+		this.column = column;
+	}
+
+	public boolean isInvalid() {
+		return line >= 0 && column >= 0;
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/ProxyInputStream.java b/common/src/main/java/com/apkide/common/ProxyInputStream.java
deleted file mode 100644
index 9247060..0000000
--- a/common/src/main/java/com/apkide/common/ProxyInputStream.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.apkide.common;
-
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public abstract class ProxyInputStream extends FilterInputStream {
-	
-	public ProxyInputStream(final InputStream proxy) {
-		super(proxy);
-	}
-	
-	@Override
-	public int read() throws IOException {
-		try {
-			beforeRead(1);
-			final int b = in.read();
-			afterRead(b != -1 ? 1 : -1);
-			return b;
-		} catch (final IOException e) {
-			handleIOException(e);
-			return -1;
-		}
-	}
-	
-	@Override
-	public int read(final byte[] bts) throws IOException {
-		try {
-			beforeRead(bts==null?0:bts.length);
-			final int n = in.read(bts);
-			afterRead(n);
-			return n;
-		} catch (final IOException e) {
-			handleIOException(e);
-			return -1;
-		}
-	}
-	
-	@Override
-	public int read(final byte[] bts, final int off, final int len) throws IOException {
-		try {
-			beforeRead(len);
-			final int n = in.read(bts, off, len);
-			afterRead(n);
-			return n;
-		} catch (final IOException e) {
-			handleIOException(e);
-			return -1;
-		}
-	}
-	
-	@Override
-	public long skip(final long ln) throws IOException {
-		try {
-			return in.skip(ln);
-		} catch (final IOException e) {
-			handleIOException(e);
-			return 0;
-		}
-	}
-	
-	@Override
-	public int available() throws IOException {
-		try {
-			return super.available();
-		} catch (final IOException e) {
-			handleIOException(e);
-			return 0;
-		}
-	}
-	
-	@Override
-	public void close() throws IOException {
-		IOUtils.safeClose(in);
-	}
-	
-	@Override
-	public synchronized void mark(final int readlimit) {
-		in.mark(readlimit);
-	}
-	
-	@Override
-	public synchronized void reset() throws IOException {
-		try {
-			in.reset();
-		} catch (final IOException e) {
-			handleIOException(e);
-		}
-	}
-	
-	@Override
-	public boolean markSupported() {
-		return in.markSupported();
-	}
-	
-	@SuppressWarnings("unused")
-	protected void beforeRead(final int n) throws IOException {
-	}
-	
-	@SuppressWarnings("unused")
-	protected void afterRead(final int n) throws IOException {
-	}
-	
-	protected void handleIOException(final IOException e) throws IOException {
-		throw e;
-	}
-	
-}
diff --git a/common/src/main/java/com/apkide/common/SafeListenerList.java b/common/src/main/java/com/apkide/common/SafeListenerList.java
deleted file mode 100644
index 3e952bd..0000000
--- a/common/src/main/java/com/apkide/common/SafeListenerList.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.apkide.common;
-
-import static java.lang.System.arraycopy;
-
-import androidx.annotation.NonNull;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-@SuppressWarnings("unchecked")
-public class SafeListenerList<E> implements Iterable<E> {
-	
-	private static final Object[] EmptyArray = new Object[0];
-	
-	private volatile Object[] listeners = EmptyArray;
-	
-	public synchronized void add(E listener) {
-		if (listener == null)
-			throw new IllegalArgumentException();
-		
-		final int oldSize = listeners.length;
-		for (Object listener2 : listeners) {
-			if (listener.equals(listener2))
-				return;
-		}
-		Object[] newListeners = new Object[oldSize + 1];
-		arraycopy(listeners, 0, newListeners, 0, oldSize);
-		newListeners[oldSize] = listener;
-		this.listeners = newListeners;
-	}
-	
-	@NonNull
-	public Object[] getListeners() {
-		return listeners;
-	}
-	
-	@NonNull
-	@Override
-	public Iterator<E> iterator() {
-		return new ListenerListIterator<>(listeners);
-	}
-	
-	public boolean isEmpty() {
-		return listeners.length == 0;
-	}
-	
-	public synchronized void remove(Object listener) {
-		if (listener == null)
-			throw new IllegalArgumentException();
-		int oldSize = listeners.length;
-		for (int i = 0; i < oldSize; ++i) {
-			Object listener2 = listeners[i];
-			if (listener.equals(listener2)) {
-				if (oldSize == 1) {
-					listeners = EmptyArray;
-				} else {
-					Object[] newListeners = new Object[oldSize - 1];
-					arraycopy(listeners, 0, newListeners, 0, i);
-					arraycopy(listeners, i + 1, newListeners, i, oldSize - i - 1);
-					this.listeners = newListeners;
-				}
-				return;
-			}
-		}
-	}
-	
-	public int size() {
-		return listeners.length;
-	}
-	
-	public synchronized void clear() {
-		listeners = EmptyArray;
-	}
-	
-	private static class ListenerListIterator<E> implements Iterator<E> {
-		private final Object[] listeners;
-		private int i;
-		
-		public ListenerListIterator(Object[] listeners) {
-			this.listeners = listeners;
-		}
-		
-		@Override
-		public boolean hasNext() {
-			return i < listeners.length;
-		}
-		
-		@Override
-		public E next() {
-			if (i >= listeners.length)
-				throw new NoSuchElementException();
-			
-			return (E) listeners[i++];
-		}
-		
-		@Override
-		public void remove() {
-			throw new UnsupportedOperationException();
-		}
-	}
-}
diff --git a/common/src/main/java/com/apkide/common/SafeRunner.java b/common/src/main/java/com/apkide/common/SafeRunner.java
index 4b8dbf9..4e5ac74 100644
--- a/common/src/main/java/com/apkide/common/SafeRunner.java
+++ b/common/src/main/java/com/apkide/common/SafeRunner.java
@@ -4,23 +4,21 @@
 
 public final class SafeRunner {
 
-    public static void run(@NonNull SafeRunnable runnable) {
-        try {
-            runnable.run();
-        } catch (Exception e) {
-            if (runnable instanceof SafeRunnable2) {
-                ((SafeRunnable2) runnable).handleException(e);
-            } else
-                throw new RuntimeException(e);
-        }
-    }
+	public static void run(@NonNull SafeRunnable runnable) {
+		try {
+			runnable.run();
+		} catch (Exception e) {
+			runnable.handleException(e);
+		}
+	}
 
 
-    public interface SafeRunnable {
-        void run() throws Exception;
-    }
+	public interface SafeRunnable {
+		void run() throws Exception;
+
+		default void handleException(@NonNull Throwable e) {
+			throw new RuntimeException(e);
+		}
+	}
 
-    public interface SafeRunnable2 extends SafeRunnable {
-        void handleException(@NonNull Throwable e);
-    }
 }
diff --git a/app/src/main/java/com/apkide/ui/views/editor/Size.java b/common/src/main/java/com/apkide/common/Size.java
similarity index 95%
rename from app/src/main/java/com/apkide/ui/views/editor/Size.java
rename to common/src/main/java/com/apkide/common/Size.java
index ec91802..c1d7179 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/Size.java
+++ b/common/src/main/java/com/apkide/common/Size.java
@@ -1,4 +1,4 @@
-package com.apkide.ui.views.editor;
+package com.apkide.common;
 
 public class Size {
     public float width;
diff --git a/common/src/main/java/com/apkide/common/StoreInputStream.java b/common/src/main/java/com/apkide/common/StoreInputStream.java
deleted file mode 100644
index 28fb01a..0000000
--- a/common/src/main/java/com/apkide/common/StoreInputStream.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.apkide.common;
-
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-public class StoreInputStream extends DataInputStream {
-   public StoreInputStream(String filePath, Inflater inflater) throws IOException {
-      super(new BufferedInputStream(new InflaterInputStream(new FileInputStream(filePath), inflater)));
-   }
-
-   public void readIntArray(int[] array) throws IOException {
-      for(int i = 0; i < array.length; ++i) {
-         array[i] = this.readInt();
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/StoreOutputStream.java b/common/src/main/java/com/apkide/common/StoreOutputStream.java
deleted file mode 100644
index 4a8e176..0000000
--- a/common/src/main/java/com/apkide/common/StoreOutputStream.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.apkide.common;
-
-import java.io.BufferedOutputStream;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-
-public class StoreOutputStream extends DataOutputStream {
-   public StoreOutputStream(String filePath, Deflater deflater) throws IOException {
-      super(new BufferedOutputStream(new DeflaterOutputStream(new FileOutputStream(filePath), deflater)));
-   }
-
-   public void writeIntArray(int[] array) throws IOException {
-      for (int j : array) {
-         this.writeInt(j);
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/Styles.java b/common/src/main/java/com/apkide/common/Styles.java
index 051d46b..d3fbd8e 100644
--- a/common/src/main/java/com/apkide/common/Styles.java
+++ b/common/src/main/java/com/apkide/common/Styles.java
@@ -52,21 +52,21 @@ private void insert(int line, int startColumn, int endColumn) {
                 resize(line, col + 1);
                 byte[] styles = this.myLines[line];
                 byte lastStyle = styles[startColumn - 1];
-                if (lastStyle == SyntaxKind.Comment.ordinal() + 1) {
+            /*    if (lastStyle == SyntaxKind.Comment.ordinal() + 1) {*/
                     styles[startColumn] = lastStyle;
                     return;
-                }
+               // }
             }
             resize(line, col + endColumn);
             byte[] styles = this.myLines[line];
             int endIndex = startColumn + endColumn;
             System.arraycopy(styles, startColumn, styles, endIndex, (styles.length - startColumn) - endColumn);
             byte lastStyle = startColumn > 0 ? styles[startColumn - 1] : (byte) 0;
-            byte currStyle = styles[startColumn];
+    /*        byte currStyle = styles[startColumn];
             byte realStyle = currStyle >= SyntaxKind.DocComment.ordinal() + 1 ? (byte) (SyntaxKind.DocComment.ordinal() + 1) : (byte) 0;
             if (lastStyle != currStyle || lastStyle ==SyntaxKind.Operator.ordinal() + 1 || lastStyle ==SyntaxKind.Separator.ordinal() + 1) {
                 lastStyle = realStyle;
-            }
+            }*/
             for (int i = startColumn; i < endIndex; i++) {
                 styles[i] = lastStyle;
             }
@@ -101,11 +101,11 @@ public void span(byte style, int startLine, int startColumn, int endLine, int en
             resize(endLine, endColumn + 1);
             byte[] styles = this.myLines[endLine];
             for (int i = startColumn; i <= endColumn; i++) {
-                if (styles[i] >= SyntaxKind.DocComment.ordinal() + 1) {
+         /*       if (styles[i] >= SyntaxKind.DocComment.ordinal() + 1) {
                     styles[i] = (byte) (SyntaxKind.values().length + style);
-                } else {
+                } else {*/
                     styles[i] = style;
-                }
+               // }
             }
             return;
         }
@@ -113,11 +113,11 @@ public void span(byte style, int startLine, int startColumn, int endLine, int en
         resize(endLine, endColumn + 1);
         byte[] startStyles = this.myLines[startLine];
         for (int i = startColumn; i < startStyles.length; i++) {
-            if (startStyles[i] >= SyntaxKind.DocComment.ordinal() + 1) {
+          /*  if (startStyles[i] >= SyntaxKind.DocComment.ordinal() + 1) {
                 startStyles[i] = (byte) (SyntaxKind.values().length + style);
-            } else {
+            } else {*/
                 startStyles[i] = style;
-            }
+            //}
         }
         int firstLine = startLine + 1;
         int line;
@@ -128,22 +128,22 @@ public void span(byte style, int startLine, int startColumn, int endLine, int en
             }
             byte[] styles = this.myLines[firstLine];
             while (line < styles.length) {
-                if (styles[line] >=SyntaxKind.DocComment.ordinal() + 1) {
+           /*     if (styles[line] >=SyntaxKind.DocComment.ordinal() + 1) {
                     styles[line] = (byte) (SyntaxKind.values().length + style);
-                } else {
+                } else {*/
                     styles[line] = style;
-                }
+               // }
                 line++;
             }
             firstLine++;
         }
         byte[] endStyles = this.myLines[endLine];
         while (line <= endColumn) {
-            if (endStyles[line] >= SyntaxKind.DocComment.ordinal() + 1) {
+           /* if (endStyles[line] >= SyntaxKind.DocComment.ordinal() + 1) {
                 endStyles[line] = (byte) (SyntaxKind.values().length + style);
-            } else {
+            } else {*/
                 endStyles[line] = style;
-            }
+           // }
             line++;
         }
     }
diff --git a/app/src/main/java/com/apkide/ui/views/editor/SyncRunner.java b/common/src/main/java/com/apkide/common/SyncRunner.java
similarity index 95%
rename from app/src/main/java/com/apkide/ui/views/editor/SyncRunner.java
rename to common/src/main/java/com/apkide/common/SyncRunner.java
index 6f2937f..1cc476f 100644
--- a/app/src/main/java/com/apkide/ui/views/editor/SyncRunner.java
+++ b/common/src/main/java/com/apkide/common/SyncRunner.java
@@ -1,4 +1,4 @@
-package com.apkide.ui.views.editor;
+package com.apkide.common;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/common/src/main/java/com/apkide/common/TextStyle.java b/common/src/main/java/com/apkide/common/TextStyle.java
new file mode 100644
index 0000000..970d490
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/TextStyle.java
@@ -0,0 +1,50 @@
+package com.apkide.common;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class TextStyle implements Serializable {
+	private static final long serialVersionUID = -1244732476231025192L;
+	public Color background;
+	public Color foreground;
+	public int fontStyle;
+
+	public TextStyle(Color foreground) {
+		this(foreground,0);
+	}
+
+	public TextStyle(Color foreground, int fontStyle) {
+		this(null,foreground,fontStyle);
+	}
+
+	public TextStyle(Color background, Color foreground) {
+		this(background,foreground,0);
+	}
+
+	public TextStyle(Color background, Color foreground, int fontStyle) {
+		this.background = background;
+		this.foreground = foreground;
+		this.fontStyle = fontStyle;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		TextStyle textStyle = (TextStyle) o;
+
+		if (fontStyle != textStyle.fontStyle) return false;
+		if (!Objects.equals(background, textStyle.background))
+			return false;
+		return Objects.equals(foreground, textStyle.foreground);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = background != null ? background.hashCode() : 0;
+		result = 31 * result + (foreground != null ? foreground.hashCode() : 0);
+		result = 31 * result + fontStyle;
+		return result;
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/TimeUtils.java b/common/src/main/java/com/apkide/common/TimeUtils.java
new file mode 100644
index 0000000..9b7423f
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/TimeUtils.java
@@ -0,0 +1,29 @@
+package com.apkide.common;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class TimeUtils {
+   private static final long INITIAL_TIME = System.currentTimeMillis();
+   private static final AtomicInteger timeDelta = new AtomicInteger(0);
+
+   public static long currentTimeMillis() {
+      return INITIAL_TIME + ((long)timeDelta.get() & 4294967295L) * 100L;
+   }
+
+   static {
+      Thread th = new Thread("Time getter") {
+         @Override
+         public void run() {
+            try {
+               while(!this.isInterrupted()) {
+                  TimeUtils.timeDelta.set((int)((System.currentTimeMillis() - TimeUtils.INITIAL_TIME) / 100L));
+                  Thread.sleep(100L);
+               }
+            } catch (InterruptedException ignored) {
+            }
+         }
+      };
+      th.setPriority(1);
+      th.start();
+   }
+}
diff --git a/common/src/main/java/com/apkide/common/ValueRunnable.java b/common/src/main/java/com/apkide/common/ValueRunnable.java
new file mode 100644
index 0000000..0660f31
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/ValueRunnable.java
@@ -0,0 +1,5 @@
+package com.apkide.common;
+
+public interface ValueRunnable<T> {
+	void run(T value);
+}
diff --git a/common/src/main/java/com/apkide/common/action/Action.java b/common/src/main/java/com/apkide/common/action/Action.java
index a2afb1d..a0a6f32 100644
--- a/common/src/main/java/com/apkide/common/action/Action.java
+++ b/common/src/main/java/com/apkide/common/action/Action.java
@@ -1,14 +1,23 @@
 package com.apkide.common.action;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public interface Action {
-    boolean isEnabled();
+	boolean isEnabled();
 
-    void setEnabled(boolean enabled);
+	void setEnabled(boolean enabled);
 
-    @NonNull
-    String getName();
+	@NonNull
+	String getName();
 
-    void actionPerformed(ActionEvent event);
+	void setProperty(@NonNull Object key, @Nullable Object value);
+
+	@Nullable
+	Object getProperty(@NonNull Object key);
+
+	@Nullable
+	Object getProperty(@NonNull Object key, @Nullable Object def);
+
+	void actionPerformed(@NonNull ActionEvent event);
 }
diff --git a/common/src/main/java/com/apkide/common/action/ActionEvent.java b/common/src/main/java/com/apkide/common/action/ActionEvent.java
index 7f8a40c..7fa2376 100644
--- a/common/src/main/java/com/apkide/common/action/ActionEvent.java
+++ b/common/src/main/java/com/apkide/common/action/ActionEvent.java
@@ -1,14 +1,24 @@
 package com.apkide.common.action;
 
+import androidx.annotation.NonNull;
+
 import java.util.EventObject;
 
 public class ActionEvent extends EventObject {
-    public String actionCommand;
-    public ActionEvent(Object source,String actionCommand) {
+    public static final String Default="Default";
+    private final String actionCommand;
+    public ActionEvent(@NonNull Object source,@NonNull String actionCommand) {
         super(source);
         this.actionCommand=actionCommand;
     }
 
+    @NonNull
+    @Override
+    public Object getSource() {
+        return super.getSource();
+    }
+
+    @NonNull
     public String getActionCommand() {
         return actionCommand;
     }
diff --git a/common/src/main/java/com/apkide/common/action/ActionListener.java b/common/src/main/java/com/apkide/common/action/ActionListener.java
new file mode 100644
index 0000000..521f412
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/action/ActionListener.java
@@ -0,0 +1,7 @@
+package com.apkide.common.action;
+
+import androidx.annotation.NonNull;
+
+public interface ActionListener {
+	void actionPerformed(@NonNull ActionEvent event);
+}
diff --git a/common/src/main/java/com/apkide/common/action/DefaultAction.java b/common/src/main/java/com/apkide/common/action/DefaultAction.java
new file mode 100644
index 0000000..3d59523
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/action/DefaultAction.java
@@ -0,0 +1,65 @@
+package com.apkide.common.action;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.HashMap;
+
+public  class DefaultAction implements Action {
+
+	private final HashMap<Object, Object> myProperties = new HashMap<>();
+	private boolean myEnabled;
+
+	private final String myName;
+
+	public DefaultAction(@NonNull String name){
+		this(name,true);
+	}
+	public DefaultAction(@NonNull String name, boolean enabled) {
+		myName = name;
+		myEnabled= enabled;
+	}
+
+	@NonNull
+	@Override
+	public String getName() {
+		return myName;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return myEnabled;
+	}
+
+	@Override
+	public void setEnabled(boolean enabled) {
+		myEnabled = enabled;
+	}
+
+	@Override
+	public void setProperty(@NonNull Object key, @Nullable Object value) {
+		myProperties.put(key, value);
+	}
+
+	@Nullable
+	@Override
+	public Object getProperty(@NonNull Object key) {
+		if (myProperties.containsKey(key))
+			return myProperties.get(key);
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public Object getProperty(@NonNull Object key, @Nullable Object def) {
+		if (myProperties.containsKey(key)) {
+			return myProperties.get(key);
+		}
+		return def;
+	}
+
+	@Override
+	public void actionPerformed(@NonNull ActionEvent event) {
+
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/AppLog.java b/common/src/main/java/com/apkide/common/app/AppLog.java
similarity index 96%
rename from common/src/main/java/com/apkide/common/AppLog.java
rename to common/src/main/java/com/apkide/common/app/AppLog.java
index 45d0143..66817bb 100644
--- a/common/src/main/java/com/apkide/common/AppLog.java
+++ b/common/src/main/java/com/apkide/common/app/AppLog.java
@@ -1,4 +1,4 @@
-package com.apkide.common;
+package com.apkide.common.app;
 
 import android.util.Log;
 
diff --git a/common/src/main/java/com/apkide/common/app/Application.java b/common/src/main/java/com/apkide/common/app/Application.java
new file mode 100644
index 0000000..f031485
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/app/Application.java
@@ -0,0 +1,39 @@
+package com.apkide.common.app;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import java.io.File;
+
+public abstract class Application {
+
+	@NonNull
+	public abstract File foundBinary(@NonNull String binaryName);
+
+	@NonNull
+	public abstract File foundFile(@NonNull String fileName);
+
+	@NonNull
+	public abstract File getTempDirectory();
+
+	@NonNull
+	public abstract Context getContext();
+
+	private static final Object lock = new Object();
+
+	private static Application sApplication;
+
+	public static void set(Application provider) {
+		synchronized (lock) {
+			sApplication = provider;
+		}
+	}
+
+	public static Application get() {
+		synchronized (lock) {
+			return sApplication;
+		}
+	}
+
+}
diff --git a/common/src/main/java/com/apkide/common/change/ChangeListener.java b/common/src/main/java/com/apkide/common/change/ChangeListener.java
index bf45be9..695ebd4 100644
--- a/common/src/main/java/com/apkide/common/change/ChangeListener.java
+++ b/common/src/main/java/com/apkide/common/change/ChangeListener.java
@@ -4,14 +4,6 @@
 
 import java.util.EventListener;
 
-/**
- * Defines an object which listens for ChangeEvents.
- */
 public interface ChangeListener extends EventListener {
-	/**
-	 * Invoked when the target of the listener has changed its state.
-	 *
-	 * @param e a ChangeEvent object
-	 */
 	void stateChanged(@NonNull ChangeEvent event);
 }
diff --git a/common/src/main/java/com/apkide/common/collections/IntArrayList.java b/common/src/main/java/com/apkide/common/collection/IntArrayList.java
similarity index 93%
rename from common/src/main/java/com/apkide/common/collections/IntArrayList.java
rename to common/src/main/java/com/apkide/common/collection/IntArrayList.java
index a90ce24..480a143 100644
--- a/common/src/main/java/com/apkide/common/collections/IntArrayList.java
+++ b/common/src/main/java/com/apkide/common/collection/IntArrayList.java
@@ -1,12 +1,15 @@
-package com.apkide.common.collections;
+package com.apkide.common.collection;
 
 import static java.lang.System.arraycopy;
 
 import androidx.annotation.NonNull;
 
+import java.io.Serializable;
 import java.util.Arrays;
 
-public class IntArrayList implements Cloneable {
+public class IntArrayList implements Cloneable, Serializable {
+
+	private static final long serialVersionUID = 5327565719369084735L;
 	private int[] data;
 	private int size;
 	
diff --git a/common/src/main/java/com/apkide/common/IntPair.java b/common/src/main/java/com/apkide/common/collection/IntPair.java
similarity index 89%
rename from common/src/main/java/com/apkide/common/IntPair.java
rename to common/src/main/java/com/apkide/common/collection/IntPair.java
index 5ac71a6..04601e1 100644
--- a/common/src/main/java/com/apkide/common/IntPair.java
+++ b/common/src/main/java/com/apkide/common/collection/IntPair.java
@@ -1,4 +1,4 @@
-package com.apkide.common;
+package com.apkide.common.collection;
 
 public final class IntPair {
 	private IntPair() {}
diff --git a/common/src/main/java/com/apkide/common/collections/IntStack.java b/common/src/main/java/com/apkide/common/collection/IntStack.java
similarity index 84%
rename from common/src/main/java/com/apkide/common/collections/IntStack.java
rename to common/src/main/java/com/apkide/common/collection/IntStack.java
index ee995cf..c09b955 100644
--- a/common/src/main/java/com/apkide/common/collections/IntStack.java
+++ b/common/src/main/java/com/apkide/common/collection/IntStack.java
@@ -1,10 +1,13 @@
-package com.apkide.common.collections;
+package com.apkide.common.collection;
 
 import static java.lang.System.arraycopy;
 
+import java.io.Serializable;
 import java.util.EmptyStackException;
 
-public class IntStack {
+public class IntStack implements Serializable {
+
+	private static final long serialVersionUID = -138522350970425664L;
 	private int[] data;
 	private int size;
 	public IntStack(int initialCapacity) {
@@ -56,4 +59,5 @@ public boolean equals(Object o) {
 	public void clear() {
 		size = 0;
 	}
+
 }
diff --git a/common/src/main/java/com/apkide/common/collections/LongArrayList.java b/common/src/main/java/com/apkide/common/collection/LongArrayList.java
similarity index 96%
rename from common/src/main/java/com/apkide/common/collections/LongArrayList.java
rename to common/src/main/java/com/apkide/common/collection/LongArrayList.java
index 80260ea..8bc9bc4 100644
--- a/common/src/main/java/com/apkide/common/collections/LongArrayList.java
+++ b/common/src/main/java/com/apkide/common/collection/LongArrayList.java
@@ -1,4 +1,4 @@
-package com.apkide.common.collections;
+package com.apkide.common.collection;
 
 
 import static java.lang.System.arraycopy;
@@ -12,48 +12,48 @@
 
 public class LongArrayList implements Serializable {
 	private static final long serialVersionUID = -919454589528703039L;
-	
+
 	private long[] data;
 	private int size;
-	
+
 	public LongArrayList() {
 		this(8);
 	}
-	
+
 	public LongArrayList(int capacity) {
 		data = new long[capacity];
 		size = 0;
 	}
-	
+
 	public LongArrayList(@NonNull long[] array) {
 		data = array;
 		size = array.length;
 	}
-	
+
 	public int size() {
 		return this.size;
 	}
-	
+
 	public long get(int idx) {
 		return this.data[idx];
 	}
-	
+
 	public void set(int idx, long v) {
 		assert idx < this.size;
 		this.data[idx] = v;
 	}
-	
+
 	public void add(long v) {
 		if (this.data.length == this.size)
 			this.data = copyOf(this.data, this.data.length * 2);
-		
+
 		this.data[this.size] = v;
 		this.size += 1;
 	}
-	
+
 	public void add(int idx, long v) {
 		assert idx <= this.size;
-		
+
 		if (this.data.length == this.size) {
 			long[] newBuffer = new long[this.size * 2];
 			arraycopy(this.data, 0, newBuffer, 0, idx);
@@ -61,30 +61,30 @@ public void add(int idx, long v) {
 			data = newBuffer;
 		} else
 			arraycopy(this.data, idx, this.data, idx + 1, this.size - idx);
-	
+
 		this.data[idx] = v;
 		this.size += 1;
 	}
-	
+
 	public void removeRange(int from, int to) {
 		if (to > this.size)
 			throw new IndexOutOfBoundsException();
-		
+
 		if (to < this.size)
 			arraycopy(this.data, to, this.data, from, this.size - to);
 		size -= to - from;
 	}
-	
+
 	public void remove(int idx) {
 		removeRange(idx, idx + 1);
 	}
-	
+
 	@NonNull
 	@Override
 	public String toString() {
 		return Arrays.toString(copyOfRange(this.data, 0, size));
 	}
-	
+
 	@NonNull
 	public LongArrayList copy(int capacity) {
 		LongArrayList r = new LongArrayList();
@@ -92,20 +92,20 @@ public LongArrayList copy(int capacity) {
 		r.size = this.size;
 		return r;
 	}
-	
+
 	@NonNull
 	public LongArrayList copy() {
 		return this.copy(this.size);
 	}
-	
+
 	public int binarySearch(long key) {
 		return Arrays.binarySearch(this.data, 0, this.size, key);
 	}
-	
+
 	public int binarySearch(int idx, long key) {
 		return Arrays.binarySearch(this.data, idx, this.size, key);
 	}
-	
+
 	@NonNull
 	public LongArrayList subList(int from, int to) {
 		LongArrayList r = new LongArrayList(to - from);
@@ -113,7 +113,7 @@ public LongArrayList subList(int from, int to) {
 		r.size = to - from;
 		return r;
 	}
-	
+
 	public int indexOf(long key) {
 		for (int i = 0; i < this.size; i++) {
 			if (this.data[i] == key)
diff --git a/common/src/main/java/com/apkide/common/collections/FunctionOfIntInt.java b/common/src/main/java/com/apkide/common/collections/FunctionOfIntInt.java
deleted file mode 100644
index 9e2f941..0000000
--- a/common/src/main/java/com/apkide/common/collections/FunctionOfIntInt.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package com.apkide.common.collections;
-
-import static java.lang.Integer.MAX_VALUE;
-import static java.lang.Integer.MIN_VALUE;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class FunctionOfIntInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private int[] myValues;
-   private int[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public FunctionOfIntInt(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public FunctionOfIntInt() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public FunctionOfIntInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      int count = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.put(stream.readInt(), stream.readInt());
-      }
-   }
-
-   public void put(@NonNull FunctionOfIntInt set) {
-
-      for(int i = 0; i < set.myKeys.length; ++i) {
-         int key = set.myKeys[i];
-         if (key == MAX_VALUE) {
-            this.put(0, set.myValues[i]);
-         } else if (key != 0 && key != MIN_VALUE) {
-            this.put(key, set.myValues[i]);
-         }
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySizeExp);
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != MIN_VALUE) {
-            stream.writeInt(this.myKeys[i]);
-            stream.writeInt(this.myValues[i]);
-         }
-      }
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear(int size) {
-      if (this.mySlots > 0) {
-         if (this.myKeys.length < size) {
-            Arrays.fill(this.myKeys, 0);
-         } else {
-            this.mySizeExp = 0;
-
-            while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-               ++this.mySizeExp;
-            }
-
-            this.myKeys = new int[SIZES[this.mySizeExp]];
-            this.myValues = new int[SIZES[this.mySizeExp]];
-         }
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(int key, int value) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int emptyIndex = -1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-
-            this.myKeys[index] = MIN_VALUE;
-            --this.myCount;
-         } else if (curKey == MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (emptyIndex != -1) {
-         index = emptyIndex;
-      }
-
-      this.myKeys[index] = key;
-      this.myValues[index] = value;
-      ++this.myCount;
-      if (emptyIndex == -1) {
-         ++this.mySlots;
-      }
-
-      if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-         this.rehash();
-      }
-   }
-
-   public boolean contains(int key, int value) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = MIN_VALUE;
-            --this.myCount;
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int get(int key) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return -1;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      int[] keys;
-      int[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != MIN_VALUE) {
-            int step = (key & MAX_VALUE) % (keys.length - 2) + 1;
-            int index = (key & MAX_VALUE) % keys.length;
-
-            while(keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int key;
-      private int value;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < FunctionOfIntInt.this.myKeys.length) {
-            this.key = FunctionOfIntInt.this.myKeys[this.index];
-            if (this.key != 0 && this.key != MIN_VALUE) {
-               if (this.key == MAX_VALUE) {
-                  this.key = 0;
-               }
-
-               this.value = FunctionOfIntInt.this.myValues[this.index];
-               ++this.index;
-               return true;
-            }
-
-            ++this.index;
-         }
-
-         return false;
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-
-      public int nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/FunctionOfIntLong.java b/common/src/main/java/com/apkide/common/collections/FunctionOfIntLong.java
deleted file mode 100644
index b343e67..0000000
--- a/common/src/main/java/com/apkide/common/collections/FunctionOfIntLong.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package com.apkide.common.collections;
-
-import static java.lang.Integer.MAX_VALUE;
-import static java.lang.Integer.MIN_VALUE;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class FunctionOfIntLong {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private long[] myValues;
-   private long[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public FunctionOfIntLong(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public FunctionOfIntLong() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public FunctionOfIntLong(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      int count = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.put(stream.readInt(), stream.readLong());
-      }
-   }
-
-   public void put(@NonNull FunctionOfIntLong set) {
-      for(int i = 0; i < set.myKeys.length; ++i) {
-         int key = set.myKeys[i];
-         if (key == MAX_VALUE) {
-            this.put(0, set.myValues[i]);
-         } else if (key != 0 && key != MIN_VALUE) {
-            this.put(key, set.myValues[i]);
-         }
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySizeExp);
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != MIN_VALUE) {
-            stream.writeInt(this.myKeys[i]);
-            stream.writeLong(this.myValues[i]);
-         }
-      }
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear(int size) {
-      if (this.mySlots > 0) {
-         if (this.myKeys.length < size) {
-            Arrays.fill(this.myKeys, 0);
-         } else {
-            this.mySizeExp = 0;
-
-            while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-               ++this.mySizeExp;
-            }
-
-            this.myKeys = new int[SIZES[this.mySizeExp]];
-            this.myValues = new long[SIZES[this.mySizeExp]];
-         }
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(int key, long value) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int emptyIndex = -1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-
-            this.myKeys[index] = MIN_VALUE;
-            --this.myCount;
-         } else if (curKey == MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (emptyIndex != -1) {
-         index = emptyIndex;
-      }
-
-      this.myKeys[index] = key;
-      this.myValues[index] = value;
-      ++this.myCount;
-      if (emptyIndex == -1) {
-         ++this.mySlots;
-      }
-
-      if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-         this.rehash();
-      }
-   }
-
-   public boolean contains(int key, long value) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = MIN_VALUE;
-            --this.myCount;
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public long get(int key) {
-      if (key == 0) {
-         key = MAX_VALUE;
-      }
-
-      int step = (key & MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return -1L;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      int[] keys;
-      long[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new long[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new long[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != MIN_VALUE) {
-            int step = (key & MAX_VALUE) % (keys.length - 2) + 1;
-            int index = (key & MAX_VALUE) % keys.length;
-
-            while(keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int key;
-      private long value;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < FunctionOfIntLong.this.myKeys.length) {
-            this.key = FunctionOfIntLong.this.myKeys[this.index];
-            if (this.key != 0 && this.key != MIN_VALUE) {
-               if (this.key == MAX_VALUE) {
-                  this.key = 0;
-               }
-
-               this.value = FunctionOfIntLong.this.myValues[this.index];
-               ++this.index;
-               return true;
-            }
-
-            ++this.index;
-         }
-
-         return false;
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-
-      public long nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/FunctionOfLongInt.java b/common/src/main/java/com/apkide/common/collections/FunctionOfLongInt.java
deleted file mode 100644
index 8ab63ca..0000000
--- a/common/src/main/java/com/apkide/common/collections/FunctionOfLongInt.java
+++ /dev/null
@@ -1,345 +0,0 @@
-package com.apkide.common.collections;
-
-import static java.lang.Long.MAX_VALUE;
-import static java.lang.Long.MIN_VALUE;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class FunctionOfLongInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private long[] myKeys;
-   private long[] myOldKeys;
-   private int[] myValues;
-   private int[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public FunctionOfLongInt(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public FunctionOfLongInt() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public FunctionOfLongInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      int count = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.put(stream.readLong(), stream.readInt());
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySizeExp);
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         long key = this.myKeys[i];
-         if (key != 0L && key != MIN_VALUE) {
-            stream.writeLong(this.myKeys[i]);
-            stream.writeInt(this.myValues[i]);
-         }
-      }
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear(int size) {
-      if (this.mySlots > 0) {
-         if (this.myKeys.length < size) {
-            Arrays.fill(this.myKeys, 0L);
-         } else {
-            this.mySizeExp = 0;
-
-            while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-               ++this.mySizeExp;
-            }
-
-            this.myKeys = new long[SIZES[this.mySizeExp]];
-            this.myValues = new int[SIZES[this.mySizeExp]];
-         }
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0L);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(int key1, int key2, int value) {
-      this.put((long)key1 << 32 | (long)key2, value);
-   }
-
-   public void put(long key, int value) {
-      if (key == 0L) {
-         key = MAX_VALUE;
-      }
-
-      int index = (int)((key & MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-      int emptyIndex = -1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-
-            this.myKeys[index] = MIN_VALUE;
-            --this.myCount;
-         } else if (curKey == MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (emptyIndex != -1) {
-         index = emptyIndex;
-      }
-
-      this.myKeys[index] = key;
-      this.myValues[index] = value;
-      ++this.myCount;
-      if (emptyIndex == -1) {
-         ++this.mySlots;
-      }
-
-      if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-         this.rehash();
-      }
-   }
-
-   public void remove(int key1, int key2) {
-      this.remove((long)key1 << 32 | (long)key2);
-   }
-
-   public void remove(long key) {
-      if (key == 0L) {
-         key = MAX_VALUE;
-      }
-
-      int index = (int)((key & MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = MIN_VALUE;
-            --this.myCount;
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public boolean contains(int key1, int key2) {
-      return this.contains((long)key1 << 32 | (long)key2);
-   }
-
-   public boolean contains(long key) {
-      if (key == 0L) {
-         key = MAX_VALUE;
-      }
-
-      int index = (int)((key & MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int get(int key1, int key2) {
-      return this.get((long)key1 << 32 | (long)key2);
-   }
-
-   public int get(long key) {
-      if (key == 0L) {
-         key = MAX_VALUE;
-      }
-
-      int index = (int)((key & MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return -1;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      long[] keys;
-      int[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new long[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0L);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new long[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         long key = this.myKeys[i];
-         if (key != 0L && key != MIN_VALUE) {
-            int index = (int)((key & MAX_VALUE) % (long)keys.length);
-            int step = (int)((key & MAX_VALUE) % ((long)keys.length - 2L)) + 1;
-
-            while(keys[index] != 0L) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private long key;
-      private int value;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < FunctionOfLongInt.this.myKeys.length) {
-            this.key = FunctionOfLongInt.this.myKeys[this.index];
-            if (this.key != 0L && this.key != MIN_VALUE) {
-               if (this.key == MAX_VALUE) {
-                  this.key = 0L;
-               }
-
-               this.value = FunctionOfLongInt.this.myValues[this.index];
-               ++this.index;
-               return true;
-            }
-
-            ++this.index;
-         }
-
-         return false;
-      }
-
-      public long nextKey() {
-         return this.key;
-      }
-
-      public int nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/HashtableOfInt.java b/common/src/main/java/com/apkide/common/collections/HashtableOfInt.java
deleted file mode 100644
index ff76490..0000000
--- a/common/src/main/java/com/apkide/common/collections/HashtableOfInt.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import java.util.Arrays;
-
-public class HashtableOfInt<T> {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private T[] myValues;
-   private T[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp = 0;
-
-   public HashtableOfInt(int size) {
-      super();
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = (T[])(new Object[SIZES[this.mySizeExp]]);
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public HashtableOfInt() {
-      super();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = (T[])(new Object[SIZES[this.mySizeExp]]);
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      Arrays.fill(this.myKeys, 0);
-
-      Arrays.fill(this.myValues, null);
-
-      this.mySlots = 0;
-      this.myCount = 0;
-      this.myOldValues = null;
-      this.myOldKeys = null;
-   }
-
-   public void put(int key, T value) {
-      this.remove(key);
-      this.insert(key, value);
-   }
-
-   public void insert(int key, T value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.myKeys[index] = key;
-         this.myValues[index] = value;
-         ++this.myCount;
-         if (emptyIndex == -1) {
-            ++this.mySlots;
-         }
-
-         if (this.mySlots * 2 > this.myKeys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public void remove(int key, T value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = Integer.MIN_VALUE;
-      this.myValues[index] = null;
-      --this.myCount;
-   }
-
-   public boolean contains(int key, T value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int count(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int count = 0;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return count;
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = Integer.MIN_VALUE;
-            this.myValues[index] = null;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public T get(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return null;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      int[] keys;
-      T[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = (T[])(new Object[SIZES[this.mySizeExp]]);
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = (T[])(new Object[SIZES[this.mySizeExp]]);
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            int step = (key & Integer.MAX_VALUE) % (keys.length - 2) + 1;
-            int index = (key & Integer.MAX_VALUE) % keys.length;
-
-            while(keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-      if (this.myOldValues != null) {
-         Arrays.fill(this.myOldValues, null);
-      }
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int step = 0;
-      private int key;
-      private T value;
-      private int thekey;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-         this.step = 0;
-      }
-
-      public void init(int key) {
-         if (key == 0) {
-            key = Integer.MAX_VALUE;
-         }
-
-         this.thekey = key;
-         this.step = (key & Integer.MAX_VALUE) % (HashtableOfInt.this.myKeys.length - 2) + 1;
-         this.index = (key & Integer.MAX_VALUE) % HashtableOfInt.this.myKeys.length;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            while(this.index < HashtableOfInt.this.myKeys.length) {
-               this.key = HashtableOfInt.this.myKeys[this.index];
-               if (this.key != 0 && this.key != Integer.MIN_VALUE) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = HashtableOfInt.this.myValues[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = HashtableOfInt.this.myKeys[this.index];
-               if (this.key == 0) {
-                  return false;
-               }
-
-               if (this.key == this.thekey) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = HashtableOfInt.this.myValues[this.index];
-                  this.index = (this.index + this.step) % HashtableOfInt.this.myKeys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % HashtableOfInt.this.myKeys.length;
-            }
-         }
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-
-      public T nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/HashtableOfLong.java b/common/src/main/java/com/apkide/common/collections/HashtableOfLong.java
deleted file mode 100644
index 9ff9636..0000000
--- a/common/src/main/java/com/apkide/common/collections/HashtableOfLong.java
+++ /dev/null
@@ -1,379 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import java.util.Arrays;
-
-public class HashtableOfLong<T> {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private long[] keys;
-   private long[] oldkeys;
-   private T[] values;
-   private T[] oldvalues;
-   private int slots;
-   private int count;
-   private int sizeexp = 0;
-
-   public HashtableOfLong(int size) {
-      super();
-
-      while(SIZES[this.sizeexp] < size * LOAD_FACTOR) {
-         ++this.sizeexp;
-      }
-
-      this.keys = new long[SIZES[this.sizeexp]];
-      this.values = (T[])(new Object[SIZES[this.sizeexp]]);
-      this.slots = 0;
-      this.count = 0;
-   }
-
-   public HashtableOfLong() {
-      super();
-      this.keys = new long[SIZES[this.sizeexp]];
-      this.values = (T[])(new Object[SIZES[this.sizeexp]]);
-      this.slots = 0;
-      this.count = 0;
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      Arrays.fill(this.keys, 0L);
-
-      Arrays.fill(this.values, null);
-
-      this.slots = 0;
-      this.count = 0;
-      this.oldkeys = null;
-      this.oldvalues = null;
-   }
-
-   public void put(long key, T value) {
-      this.remove(key);
-      this.insert(key, value);
-   }
-
-   public void insert(long key, T value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(long curKey = this.keys[index]; curKey != 0L; curKey = this.keys[index]) {
-         if (curKey == key) {
-            if (this.values[index] == value) {
-               return;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.keys[index] = key;
-         this.values[index] = value;
-         ++this.count;
-         if (emptyIndex == -1) {
-            ++this.slots;
-         }
-
-         if (this.slots * LOAD_FACTOR > this.keys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public void remove(long key, T value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != key || this.values[index] != value; curKey = this.keys[index]) {
-         if (curKey == 0L) {
-            return;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      this.keys[index] = Long.MIN_VALUE;
-      this.values[index] = null;
-      --this.count;
-   }
-
-   public boolean contains(long key, T value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != key || this.values[index] != value; curKey = this.keys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      return true;
-   }
-
-   public boolean contains(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != key; curKey = this.keys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      return true;
-   }
-
-   public int count(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int count = 0;
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != 0L; curKey = this.keys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      return count;
-   }
-
-   public void remove(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != 0L; curKey = this.keys[index]) {
-         if (curKey == key) {
-            this.keys[index] = Long.MIN_VALUE;
-            this.values[index] = null;
-            --this.count;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-   }
-
-   public T get(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != key; curKey = this.keys[index]) {
-         if (curKey == 0L) {
-            return null;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      return this.values[index];
-   }
-
-   private void rehash() {
-      long[] keys;
-      T[] values;
-      if (this.count * LOAD_FACTOR > this.keys.length) {
-         ++this.sizeexp;
-         this.oldkeys = null;
-         this.oldvalues = null;
-         keys = new long[SIZES[this.sizeexp]];
-         values = (T[])(new Object[SIZES[this.sizeexp]]);
-      } else if (this.oldkeys != null && this.oldkeys.length == this.keys.length) {
-         keys = this.oldkeys;
-
-         for(int i = 0; i < keys.length; ++i) {
-            keys[i] = 0L;
-         }
-
-         values = this.oldvalues;
-         this.oldkeys = this.keys;
-         this.oldvalues = this.values;
-      } else {
-         this.oldkeys = this.keys;
-         this.oldvalues = this.values;
-         keys = new long[SIZES[this.sizeexp]];
-         values = (T[])(new Object[SIZES[this.sizeexp]]);
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.keys.length; ++i) {
-         long key = this.keys[i];
-         if (key != 0L && key != Long.MIN_VALUE) {
-            int index = (int)((key & Long.MAX_VALUE) % (long)keys.length);
-            int step = (int)((key & Long.MAX_VALUE) % ((long)keys.length - 2L)) + 1;
-
-            while(keys[index] != 0L) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.values[i];
-            ++slots;
-         }
-      }
-
-      this.keys = keys;
-      this.values = values;
-      this.slots = slots;
-      if (this.oldvalues != null) {
-         Arrays.fill(this.oldvalues, null);
-      }
-   }
-
-   public int size() {
-      return this.count;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int step = 0;
-      private long key;
-      private T value;
-      private long theKey;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-         this.step = 0;
-      }
-
-      public void init(long key) {
-         if (key == 0L) {
-            key = Long.MAX_VALUE;
-         }
-
-         this.theKey = key;
-         this.index = (int)((key & Long.MAX_VALUE) % (long)HashtableOfLong.this.keys.length);
-         this.step = (int)((key & Long.MAX_VALUE) % ((long)HashtableOfLong.this.keys.length - 2L)) + 1;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            while(this.index < HashtableOfLong.this.keys.length) {
-               this.key = HashtableOfLong.this.keys[this.index];
-               if (this.key != 0L && this.key != Long.MIN_VALUE) {
-                  if (this.key == Long.MAX_VALUE) {
-                     this.key = 0L;
-                  }
-
-                  this.value = HashtableOfLong.this.values[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = HashtableOfLong.this.keys[this.index];
-               if (this.key == 0L) {
-                  return false;
-               }
-
-               if (this.key == this.theKey) {
-                  if (this.key == Long.MAX_VALUE) {
-                     this.key = 0L;
-                  }
-
-                  this.value = HashtableOfLong.this.values[this.index];
-                  this.index = (this.index + this.step) % HashtableOfLong.this.keys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % HashtableOfLong.this.keys.length;
-            }
-         }
-      }
-
-      public long nextKey() {
-         return this.key;
-      }
-
-      public T nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/LevelScopeOfInt.java b/common/src/main/java/com/apkide/common/collections/LevelScopeOfInt.java
deleted file mode 100644
index 45da995..0000000
--- a/common/src/main/java/com/apkide/common/collections/LevelScopeOfInt.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.apkide.common.collections;
-
-import java.util.Arrays;
-
-public class LevelScopeOfInt {
-   private int[] myIdentifierHashTable = new int[3000];
-   private int[] myBindingHashTable = new int[3000];
-   private int[] myScopeHashTable = new int[3000];
-   private int[] myIdentifierStack = new int[1000];
-   private int[] myLevelStack = new int[1000];
-   private int[] myBindingStack = new int[1000];
-   private int[] mySlotStack = new int[1000];
-   private int myStackPos = 0;
-
-   public LevelScopeOfInt() {
-      super();
-   }
-
-   public void declare(int identifier, int binding, int level) {
-      if (this.myIdentifierHashTable.length < this.myStackPos * 3) {
-         this.rehash();
-      }
-
-      if (this.myIdentifierStack.length <= this.myStackPos) {
-         this.resize();
-      }
-
-      this.myIdentifierStack[this.myStackPos] = identifier;
-      this.myLevelStack[this.myStackPos] = level;
-      this.myBindingStack[this.myStackPos] = binding;
-      ++this.myStackPos;
-      int[] identifierHashTable = this.myIdentifierHashTable;
-      int identifierHashTableLength = identifierHashTable.length;
-      int index = (identifier & Integer.MAX_VALUE) % identifierHashTableLength;
-
-      while(identifierHashTable[index] != 0) {
-         if (++index >= identifierHashTableLength) {
-            index = 0;
-         }
-      }
-
-      identifierHashTable[index] = identifier;
-      this.myBindingHashTable[index] = binding;
-      this.myScopeHashTable[index] = level;
-   }
-
-   public int get(int identifier, int level) {
-      int[] identifierHashTable = this.myIdentifierHashTable;
-      int identifierHashTableLength = identifierHashTable.length;
-      int index = (identifier & Integer.MAX_VALUE) % identifierHashTableLength;
-      int bi = -1;
-
-      int id = identifierHashTable[index];
-      if (id == identifier && this.myScopeHashTable[index] == level) {
-         bi = this.myBindingHashTable[index];
-      }
-
-      if (++index >= identifierHashTableLength) {
-         index = 0;
-      }
-      while (id != 0) {
-         id = identifierHashTable[index];
-         if (id == identifier && this.myScopeHashTable[index] == level) {
-            bi = this.myBindingHashTable[index];
-         }
-
-         if (++index >= identifierHashTableLength) {
-            index = 0;
-         }
-      }
-
-      return bi;
-   }
-
-   public boolean contains(int identifier, int scope) {
-      int[] identifierHashTable = this.myIdentifierHashTable;
-      int identifierHashTableLength = identifierHashTable.length;
-      int index = (identifier & Integer.MAX_VALUE) % identifierHashTableLength;
-
-      int id = identifierHashTable[index];
-      if (id == identifier && this.myScopeHashTable[index] == scope) {
-         return true;
-      }
-
-      if (++index >= identifierHashTableLength) {
-         index = 0;
-      }
-      while (id != 0) {
-         id = identifierHashTable[index];
-         if (id == identifier && this.myScopeHashTable[index] == scope) {
-            return true;
-         }
-
-         if (++index >= identifierHashTableLength) {
-            index = 0;
-         }
-      }
-
-      return false;
-   }
-
-   public void clear() {
-      if (this.myStackPos > 0) {
-         Arrays.fill(this.myIdentifierHashTable, 0);
-      }
-
-      this.myStackPos = 0;
-   }
-
-   public void enterBlock() {
-      if (this.myIdentifierStack.length <= this.myStackPos) {
-         this.resize();
-      }
-
-      this.myIdentifierStack[this.myStackPos] = 0;
-      ++this.myStackPos;
-   }
-
-   public void enterClass() {
-      if (this.myIdentifierStack.length <= this.myStackPos) {
-         this.resize();
-      }
-
-      this.myIdentifierStack[this.myStackPos] = 0;
-      ++this.myStackPos;
-   }
-
-   public void leaveBlock() {
-      int[] identifierHashTable = this.myIdentifierHashTable;
-      int identifierHashTableLength = identifierHashTable.length;
-      --this.myStackPos;
-
-      for(int identifier = this.myIdentifierStack[this.myStackPos]; identifier != 0; identifier = this.myIdentifierStack[this.myStackPos]) {
-         int index = (identifier & Integer.MAX_VALUE) % identifierHashTableLength;
-         int i = -1;
-
-         int id = identifierHashTable[index];
-         if (id == identifier) {
-            i = index;
-         }
-
-         if (++index >= identifierHashTableLength) {
-            index = 0;
-         }
-         while (id != 0) {
-            id = identifierHashTable[index];
-            if (id == identifier) {
-               i = index;
-            }
-
-            if (++index >= identifierHashTableLength) {
-               index = 0;
-            }
-         }
-
-         if (i != -1) {
-            identifierHashTable[i] = 0;
-         }
-
-         --this.myStackPos;
-      }
-   }
-
-   private void resize() {
-      int[] newIdentifierStack = new int[this.myIdentifierStack.length * 2 + 1];
-      System.arraycopy(this.myIdentifierStack, 0, newIdentifierStack, 0, this.myIdentifierStack.length);
-      this.myIdentifierStack = newIdentifierStack;
-      int[] newScopeStack = new int[this.myLevelStack.length * 2 + 1];
-      System.arraycopy(this.myLevelStack, 0, newScopeStack, 0, this.myLevelStack.length);
-      this.myLevelStack = newScopeStack;
-      int[] newBindingStack = new int[this.myBindingStack.length * 2 + 1];
-      System.arraycopy(this.myBindingStack, 0, newBindingStack, 0, this.myBindingStack.length);
-      this.myBindingStack = newBindingStack;
-      int[] newSlotStack = new int[this.mySlotStack.length * 2 + 1];
-      System.arraycopy(this.mySlotStack, 0, newSlotStack, 0, this.mySlotStack.length);
-      this.mySlotStack = newSlotStack;
-   }
-
-   private void rehash() {
-      int[] newIdentifierHashTable = new int[this.myIdentifierHashTable.length * 2 + 1];
-      int[] newBindingHashTable = new int[this.myIdentifierHashTable.length * 2 + 1];
-      int[] newScopeHashTable = new int[this.myIdentifierHashTable.length * 2 + 1];
-
-      for(int i = 0; i < this.myStackPos; ++i) {
-         int identifier = this.myIdentifierStack[i];
-         if (identifier != 0) {
-            int scope = this.myLevelStack[i];
-            int binding = this.myBindingStack[i];
-            int index = (identifier & Integer.MAX_VALUE) % newIdentifierHashTable.length;
-
-            while(newIdentifierHashTable[index] != 0) {
-               if (++index >= newIdentifierHashTable.length) {
-                  index = 0;
-               }
-            }
-
-            newIdentifierHashTable[index] = identifier;
-            newBindingHashTable[index] = binding;
-            newScopeHashTable[index] = scope;
-         }
-      }
-
-      this.myIdentifierHashTable = newIdentifierHashTable;
-      this.myScopeHashTable = newScopeHashTable;
-      this.myBindingHashTable = newBindingHashTable;
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/ListOfByte.java b/common/src/main/java/com/apkide/common/collections/ListOfByte.java
deleted file mode 100644
index 7153261..0000000
--- a/common/src/main/java/com/apkide/common/collections/ListOfByte.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-
-public class ListOfByte {
-   private byte[] myValues;
-   private int mySize;
-
-   public ListOfByte() {
-      super();
-      this.myValues = null;
-      this.mySize = 0;
-   }
-
-   public ListOfByte(int size) {
-      super();
-      this.myValues = new byte[size];
-      this.mySize = size;
-   }
-
-   public ListOfByte(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.mySize = stream.readInt();
-      if (this.mySize > 0) {
-         this.myValues = new byte[this.mySize];
-
-         for(int i = 0; i < this.myValues.length; ++i) {
-            this.myValues[i] = stream.readByte();
-         }
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      if (this.myValues == null) {
-         stream.writeInt(0);
-      } else {
-         stream.writeInt(this.mySize);
-
-         for(int i = 0; i < this.mySize; ++i) {
-            stream.writeInt(this.myValues[i]);
-         }
-      }
-   }
-
-   public void clear() {
-      this.mySize = 0;
-   }
-
-   public void push(byte value) {
-      this.add(value);
-   }
-
-   public int[] toIntArray() {
-      int[] a = new int[this.size()];
-      if (this.size() > 0) {
-         System.arraycopy(this.myValues, 0, a, 0, this.size());
-      }
-
-      return a;
-   }
-
-   public void add(byte value) {
-      if (this.myValues == null) {
-         this.myValues = new byte[10];
-      } else if (this.mySize >= this.myValues.length) {
-         byte[] values = new byte[this.myValues.length * 2 + 1];
-         System.arraycopy(this.myValues, 0, values, 0, this.myValues.length);
-         this.myValues = values;
-      }
-
-      this.myValues[this.mySize++] = value;
-   }
-
-   public byte pop() {
-      return this.mySize == 0 ? -1 : this.myValues[--this.mySize];
-   }
-
-   public byte peek() {
-      return this.mySize == 0 ? -1 : this.get(this.mySize - 1);
-   }
-
-   public byte get(int index) {
-      if (this.myValues == null) {
-         return -1;
-      } else if (index >= this.myValues.length) {
-         return -1;
-      } else {
-         return index >= this.mySize ? -1 : this.myValues[index];
-      }
-   }
-
-   public void setSize(int size) {
-      this.mySize = size;
-   }
-
-   public void set(int index, byte value) {
-      if (this.myValues == null) {
-         this.myValues = new byte[Math.max(10, index + 1)];
-      } else if (index >= this.myValues.length) {
-         byte[] values = new byte[Math.max(index + 1, this.myValues.length * 2 + 1)];
-         System.arraycopy(this.myValues, 0, values, 0, this.myValues.length);
-         this.myValues = values;
-      }
-
-      if (index >= this.mySize) {
-         this.mySize = index + 1;
-      }
-
-      this.myValues[index] = value;
-   }
-
-   public void remove(int index) {
-      if (this.myValues != null) {
-         if (index < this.mySize) {
-            System.arraycopy(this.myValues, index + 1, this.myValues, index, this.mySize - index - 1);
-            --this.mySize;
-         }
-      }
-   }
-
-   public int size() {
-      return this.mySize;
-   }
-
-   public int firstIndexOf(int value) {
-      return this.firstIndexOf(value, 0);
-   }
-
-   public int firstIndexOf(int value, int fromIndex) {
-      if (this.myValues == null) {
-         return -1;
-      } else {
-         for(int i = fromIndex; i < this.mySize; ++i) {
-            if (this.myValues[i] == value) {
-               return i;
-            }
-         }
-
-         return -1;
-      }
-   }
-
-   public void sort() {
-      this.sort(0, this.mySize - 1);
-   }
-
-   private void sort(int i, int j) {
-      if (i < j) {
-         int oldi = i;
-         int oldj = j;
-         int z = i + (j - i) / 2;
-         byte pivot = this.myValues[z];
-
-         while(i <= j) {
-            while(this.myValues[i] < pivot) {
-               ++i;
-            }
-
-            while(pivot < this.myValues[j]) {
-               --j;
-            }
-
-            if (i <= j) {
-               byte temp = this.myValues[j];
-               this.myValues[j] = this.myValues[i];
-               this.myValues[i] = temp;
-               ++i;
-               --j;
-            }
-         }
-
-         this.sort(oldi, j);
-         this.sort(i, oldj);
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/ListOfInt.java b/common/src/main/java/com/apkide/common/collections/ListOfInt.java
deleted file mode 100644
index 01482bf..0000000
--- a/common/src/main/java/com/apkide/common/collections/ListOfInt.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Comparator;
-
-public class ListOfInt {
-   private int[] myValues;
-   private int mySize;
-
-   public ListOfInt() {
-      super();
-      this.myValues = null;
-      this.mySize = 0;
-   }
-
-   public ListOfInt(int size) {
-      super();
-      this.myValues = new int[size];
-      this.mySize = size;
-   }
-
-   public ListOfInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.mySize = stream.readInt();
-      if (this.mySize > 0) {
-         this.myValues = new int[this.mySize];
-
-         for(int i = 0; i < this.myValues.length; ++i) {
-            this.myValues[i] = stream.readInt();
-         }
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      if (this.myValues == null) {
-         stream.writeInt(0);
-      } else {
-         stream.writeInt(this.mySize);
-
-         for(int i = 0; i < this.mySize; ++i) {
-            stream.writeInt(this.myValues[i]);
-         }
-      }
-   }
-
-   public void clear() {
-      this.mySize = 0;
-   }
-
-   public void push(int value) {
-      this.add(value);
-   }
-
-   public int[] toIntArray() {
-      int[] a = new int[this.size()];
-      if (this.size() > 0) {
-         System.arraycopy(this.myValues, 0, a, 0, this.size());
-      }
-
-      return a;
-   }
-
-   public void add(int value) {
-      if (this.myValues == null) {
-         this.myValues = new int[10];
-      } else if (this.mySize >= this.myValues.length) {
-         int[] values = new int[this.myValues.length * 2 + 1];
-         System.arraycopy(this.myValues, 0, values, 0, this.myValues.length);
-         this.myValues = values;
-      }
-
-      this.myValues[this.mySize++] = value;
-   }
-
-   public int pop() {
-      return this.mySize == 0 ? -1 : this.myValues[--this.mySize];
-   }
-
-   public int peek() {
-      return this.mySize == 0 ? -1 : this.get(this.mySize - 1);
-   }
-
-   public int get(int index) {
-      if (this.myValues == null) {
-         return -1;
-      } else if (index >= this.myValues.length) {
-         return -1;
-      } else {
-         return index >= this.mySize ? -1 : this.myValues[index];
-      }
-   }
-
-   public void setSize(int size) {
-      this.mySize = size;
-   }
-
-   public void set(int index, int value) {
-      if (this.myValues == null) {
-         this.myValues = new int[Math.max(10, index + 1)];
-      } else if (index >= this.myValues.length) {
-         int[] values = new int[Math.max(index + 1, this.myValues.length * 2 + 1)];
-         System.arraycopy(this.myValues, 0, values, 0, this.myValues.length);
-         this.myValues = values;
-      }
-
-      if (index >= this.mySize) {
-         this.mySize = index + 1;
-      }
-
-      this.myValues[index] = value;
-   }
-
-   public void remove(int index) {
-      if (this.myValues != null) {
-         if (index < this.mySize) {
-            System.arraycopy(this.myValues, index + 1, this.myValues, index, this.mySize - index - 1);
-            --this.mySize;
-         }
-      }
-   }
-
-   public int size() {
-      return this.mySize;
-   }
-
-   public int firstIndexOf(int value) {
-      return this.firstIndexOf(value, 0);
-   }
-
-   public int firstIndexOf(int value, int fromIndex) {
-      if (this.myValues == null) {
-         return -1;
-      } else {
-         for(int i = fromIndex; i < this.mySize; ++i) {
-            if (this.myValues[i] == value) {
-               return i;
-            }
-         }
-
-         return -1;
-      }
-   }
-
-   public void sort() {
-      this.sort(0, this.mySize - 1);
-   }
-
-   private void sort(int i, int j) {
-      if (i < j) {
-         int oldi = i;
-         int oldj = j;
-         int z = i + (j - i) / 2;
-         int pivot = this.myValues[z];
-
-         while(i <= j) {
-            while(this.myValues[i] < pivot) {
-               ++i;
-            }
-
-            while(pivot < this.myValues[j]) {
-               --j;
-            }
-
-            if (i <= j) {
-               int temp = this.myValues[j];
-               this.myValues[j] = this.myValues[i];
-               this.myValues[i] = temp;
-               ++i;
-               --j;
-            }
-         }
-
-         this.sort(oldi, j);
-         this.sort(i, oldj);
-      }
-   }
-
-   public void sort(@NonNull Comparator<Integer> comp) {
-      this.sort(0, this.mySize - 1, comp);
-   }
-
-   private void sort(int i, int j, Comparator<Integer> comp) {
-      if (i < j) {
-         int oldi = i;
-         int oldj = j;
-         int z = i + (j - i) / 2;
-         int pivot = this.myValues[z];
-
-         while(i <= j) {
-            while(comp.compare(this.myValues[i], pivot) < 0) {
-               ++i;
-            }
-
-            while(comp.compare(pivot, this.myValues[j]) < 0) {
-               --j;
-            }
-
-            if (i <= j) {
-               int temp = this.myValues[j];
-               this.myValues[j] = this.myValues[i];
-               this.myValues[i] = temp;
-               ++i;
-               --j;
-            }
-         }
-
-         this.sort(oldi, j, comp);
-         this.sort(i, oldj, comp);
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/MapOfIntArrayInt.java b/common/src/main/java/com/apkide/common/collections/MapOfIntArrayInt.java
deleted file mode 100644
index e3358e1..0000000
--- a/common/src/main/java/com/apkide/common/collections/MapOfIntArrayInt.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class MapOfIntArrayInt {
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myArrays;
-   private int myArrayPos;
-   private int[] myPoss;
-   private int[] myValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-   private int[] myBuffer;
-
-   public MapOfIntArrayInt(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myPoss = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.myArrays = new int[10];
-      this.myArrayPos = 1;
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfIntArrayInt() {
-      super();
-      this.mySizeExp = 0;
-      this.myPoss = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.myArrays = new int[10];
-      this.myArrayPos = 1;
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfIntArrayInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.myCount = stream.readInt();
-      this.mySlots = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myPoss = new int[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myPoss.length; ++i) {
-         this.myPoss[i] = stream.readInt();
-      }
-
-      this.myValues = new int[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myValues.length; ++i) {
-         this.myValues[i] = stream.readInt();
-      }
-
-      this.myArrayPos = stream.readInt();
-      this.myArrays = new int[stream.readInt()];
-
-      for(int i = 0; i < this.myArrayPos; ++i) {
-         this.myArrays[i] = stream.readInt();
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySlots);
-      stream.writeInt(this.mySizeExp);
-
-      for (int j : this.myPoss) {
-         stream.writeInt(j);
-      }
-
-      for (int value : this.myValues) {
-         stream.writeInt(value);
-      }
-
-      stream.writeInt(this.myArrayPos);
-      stream.writeInt(this.myArrays.length);
-
-      for(int i = 0; i < this.myArrayPos; ++i) {
-         stream.writeInt(this.myArrays[i]);
-      }
-   }
-
-   public void clear() {
-      Arrays.fill(this.myPoss, 0);
-
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   private int getHash(int[] array, int off, int len) {
-      int key = 0;
-
-      for(int i = 0; i < len; ++i) {
-         key ^= array[i + off];
-      }
-
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      return key & Integer.MAX_VALUE;
-   }
-
-   public void put(int array0, int[] array1, int[] array2, int off, int len, int value) {
-      int bufferLen = 1 + 2 * len;
-      if (this.myBuffer == null || this.myBuffer.length <= bufferLen) {
-         this.myBuffer = new int[bufferLen];
-      }
-
-      this.myBuffer[0] = array0;
-      System.arraycopy(array1, off, this.myBuffer, 1, len);
-      System.arraycopy(array2, off, this.myBuffer, 1 + len, len);
-      this.put(this.myBuffer, 0, bufferLen, value);
-   }
-
-   public int get(int array0, int[] array1, int[] array2, int off, int len) {
-      int bufferLen = 1 + 2 * len;
-      if (this.myBuffer == null || this.myBuffer.length <= bufferLen) {
-         this.myBuffer = new int[bufferLen];
-      }
-
-      this.myBuffer[0] = array0;
-      System.arraycopy(array1, off, this.myBuffer, 1, len);
-      System.arraycopy(array2, off, this.myBuffer, 1 + len, len);
-      return this.get(this.myBuffer, 0, bufferLen);
-   }
-
-   public boolean contains(int array0, int[] array1, int[] array2, int off, int len) {
-      int bufferLen = 1 + 2 * len;
-      if (this.myBuffer == null || this.myBuffer.length <= bufferLen) {
-         this.myBuffer = new int[bufferLen];
-      }
-
-      this.myBuffer[0] = array0;
-      System.arraycopy(array1, off, this.myBuffer, 1, len);
-      System.arraycopy(array2, off, this.myBuffer, 1 + len, len);
-      return this.contains(this.myBuffer, 0, bufferLen);
-   }
-
-   public void put(int[] array, int off, int len, int value) {
-      int hash = this.getHash(array, off, len);
-      int index = hash % this.myPoss.length;
-      int step = hash % (this.myPoss.length - 2) + 1;
-
-      int curPos;
-      for(curPos = this.myPoss[index]; curPos != 0 && curPos != Integer.MIN_VALUE; curPos = this.myPoss[index]) {
-         if (this.myArrays[curPos] == len) {
-            ++curPos;
-            int i = 0;
-
-            while(true) {
-               if (i >= len) {
-                  this.myValues[index] = value;
-                  return;
-               }
-
-               if (this.myArrays[curPos++] != array[off + i]) {
-                  break;
-               }
-
-               ++i;
-            }
-         }
-
-         index = (index + step) % this.myPoss.length;
-      }
-
-      this.myPoss[index] = this.myArrayPos;
-      if (this.myArrayPos + len + 1 >= this.myArrays.length) {
-         int[] arrays = new int[Math.max(this.myArrays.length + len + 1, this.myArrays.length * 2 + 1)];
-         System.arraycopy(this.myArrays, 0, arrays, 0, this.myArrays.length);
-         this.myArrays = arrays;
-      }
-
-      this.myArrays[this.myArrayPos++] = len;
-
-      for(int i = 0; i < len; ++i) {
-         this.myArrays[this.myArrayPos++] = array[off + i];
-      }
-
-      this.myValues[index] = value;
-      if (curPos != Integer.MIN_VALUE) {
-         ++this.mySlots;
-      }
-
-      ++this.myCount;
-      if (this.mySlots * LOAD_FACTOR > this.myPoss.length) {
-         this.rehash();
-      }
-   }
-
-   public boolean contains(int[] array, int off, int len) {
-      int hash = this.getHash(array, off, len);
-      int index = hash % this.myPoss.length;
-      int step = hash % (this.myPoss.length - 2) + 1;
-
-      for(int curPos = this.myPoss[index]; curPos != 0 && curPos != Integer.MIN_VALUE; curPos = this.myPoss[index]) {
-         if (this.myArrays[curPos] == len) {
-            ++curPos;
-            int i = 0;
-
-            while(true) {
-               if (i >= len) {
-                  return true;
-               }
-
-               if (this.myArrays[curPos++] != array[off + i]) {
-                  break;
-               }
-
-               ++i;
-            }
-         }
-
-         index = (index + step) % this.myPoss.length;
-      }
-
-      return false;
-   }
-
-   public int get(int[] array, int off, int len) {
-      int hash = this.getHash(array, off, len);
-      int index = hash % this.myPoss.length;
-      int step = hash % (this.myPoss.length - 2) + 1;
-
-      for(int curPos = this.myPoss[index]; curPos != 0 && curPos != Integer.MIN_VALUE; curPos = this.myPoss[index]) {
-         if (this.myArrays[curPos] == len) {
-            ++curPos;
-            int i = 0;
-
-            while(true) {
-               if (i >= len) {
-                  return this.myValues[index];
-               }
-
-               if (this.myArrays[curPos++] != array[off + i]) {
-                  break;
-               }
-
-               ++i;
-            }
-         }
-
-         index = (index + step) % this.myPoss.length;
-      }
-
-      return -1;
-   }
-
-   public void remove(int[] array, int off, int len) {
-      int hash = this.getHash(array, off, len);
-      int index = hash % this.myPoss.length;
-      int step = hash % (this.myPoss.length - 2) + 1;
-
-      for(int curPos = this.myPoss[index]; curPos != 0 && curPos != Integer.MIN_VALUE; curPos = this.myPoss[index]) {
-         if (this.myArrays[curPos] == len) {
-            ++curPos;
-            int i = 0;
-
-            while(true) {
-               if (i >= len) {
-                  this.myPoss[index] = Integer.MIN_VALUE;
-                  break;
-               }
-
-               if (this.myArrays[curPos++] != array[off + i]) {
-                  break;
-               }
-
-               ++i;
-            }
-         }
-
-         index = (index + step) % this.myPoss.length;
-      }
-   }
-
-   private void rehash() {
-      ++this.mySizeExp;
-      int[] poss = new int[SIZES[this.mySizeExp]];
-      int[] values = new int[SIZES[this.mySizeExp]];
-      int slots = 0;
-
-      for(int i = 0; i < this.myPoss.length; ++i) {
-         int pos = this.myPoss[i];
-         if (pos != 0 && pos != Integer.MIN_VALUE) {
-            int hash = this.getHash(this.myArrays, pos + 1, this.myArrays[pos]);
-            int index = hash % poss.length;
-            int step = hash % (poss.length - 2) + 1;
-
-            while(poss[index] != 0) {
-               index = (index + step) % poss.length;
-            }
-
-            poss[index] = pos;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myPoss = poss;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/MapOfIntInt.java b/common/src/main/java/com/apkide/common/collections/MapOfIntInt.java
deleted file mode 100644
index 58bafd0..0000000
--- a/common/src/main/java/com/apkide/common/collections/MapOfIntInt.java
+++ /dev/null
@@ -1,471 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class MapOfIntInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private int[] myValues;
-   private int[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public MapOfIntInt(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfIntInt() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfIntInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      int count = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.insert(stream.readInt(), stream.readInt());
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySizeExp);
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            stream.writeInt(this.myKeys[i]);
-            stream.writeInt(this.myValues[i]);
-         }
-      }
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear(int size) {
-      if (this.mySlots > 0) {
-         if (this.myKeys.length < size) {
-            Arrays.fill(this.myKeys, 0);
-         } else {
-            this.mySizeExp = 0;
-
-            while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-               ++this.mySizeExp;
-            }
-
-            this.myKeys = new int[SIZES[this.mySizeExp]];
-            this.myValues = new int[SIZES[this.mySizeExp]];
-         }
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void insert(@NonNull MapOfIntInt map) {
-      for(int i = 0; i < map.myKeys.length; ++i) {
-         int key = map.myKeys[i];
-         int value = map.myValues[i];
-         if (key == Integer.MAX_VALUE) {
-            this.insert(0, value);
-         } else if (key != 0 && key != Integer.MIN_VALUE) {
-            this.insert(key, value);
-         }
-      }
-   }
-
-   public void put(int key, int value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               inserted = true;
-            } else {
-               this.myKeys[index] = Integer.MIN_VALUE;
-               --this.myCount;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.myKeys[index] = key;
-         this.myValues[index] = value;
-         ++this.myCount;
-         if (emptyIndex == -1) {
-            ++this.mySlots;
-         }
-
-         if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public void insert(int key, int value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.myKeys[index] = key;
-         this.myValues[index] = value;
-         ++this.myCount;
-         if (emptyIndex == -1) {
-            ++this.mySlots;
-         }
-
-         if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public boolean contains(int key, int value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public void remove(int key, int value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key && this.myValues[index] == value) {
-            this.myKeys[index] = Integer.MIN_VALUE;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = Integer.MIN_VALUE;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int count(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int count = 0;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return count;
-   }
-
-   public int get(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return -1;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      int[] keys;
-      int[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            int step = (key & Integer.MAX_VALUE) % (keys.length - 2) + 1;
-            int index = (key & Integer.MAX_VALUE) % keys.length;
-
-            while(keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int step = 0;
-      private int key;
-      private int value;
-      private int theKey;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-         this.step = 0;
-      }
-
-      public void init(int key) {
-         if (key == 0) {
-            key = Integer.MAX_VALUE;
-         }
-
-         this.theKey = key;
-         this.step = (key & Integer.MAX_VALUE) % (MapOfIntInt.this.myKeys.length - 2) + 1;
-         this.index = (key & Integer.MAX_VALUE) % MapOfIntInt.this.myKeys.length;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            while(this.index < MapOfIntInt.this.myKeys.length) {
-               this.key = MapOfIntInt.this.myKeys[this.index];
-               if (this.key != 0 && this.key != Integer.MIN_VALUE) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = MapOfIntInt.this.myValues[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = MapOfIntInt.this.myKeys[this.index];
-               if (this.key == 0) {
-                  return false;
-               }
-
-               if (this.key == this.theKey) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = MapOfIntInt.this.myValues[this.index];
-                  this.index = (this.index + this.step) % MapOfIntInt.this.myKeys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % MapOfIntInt.this.myKeys.length;
-            }
-         }
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-
-      public int nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/MapOfIntLong.java b/common/src/main/java/com/apkide/common/collections/MapOfIntLong.java
deleted file mode 100644
index 493bfb3..0000000
--- a/common/src/main/java/com/apkide/common/collections/MapOfIntLong.java
+++ /dev/null
@@ -1,421 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class MapOfIntLong {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private long[] myValues;
-   private long[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public MapOfIntLong(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfIntLong() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfIntLong(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.myCount = stream.readInt();
-      this.mySlots = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         this.myKeys[i] = stream.readInt();
-      }
-
-      this.myValues = new long[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myValues.length; ++i) {
-         this.myValues[i] = stream.readLong();
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySlots);
-      stream.writeInt(this.mySizeExp);
-
-      for (int key : this.myKeys) {
-         stream.writeInt(key);
-      }
-
-      for (long value : this.myValues) {
-         stream.writeLong(value);
-      }
-   }
-@NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0);
-
-         Arrays.fill(this.myValues, 0L);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(@NonNull MapOfIntLong map) {
-      for(int i = 0; i < map.myKeys.length; ++i) {
-         int key = map.myKeys[i];
-         long value = map.myValues[i];
-         if (key == Integer.MAX_VALUE) {
-            this.put(0, value);
-         } else if (key != 0 && key != Integer.MIN_VALUE) {
-            this.put(key, value);
-         }
-      }
-   }
-
-   public void put(int key, long value) {
-      this.remove(key);
-      this.insert(key, value);
-   }
-
-   public void insert(int key, long value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.myKeys[index] = key;
-         this.myValues[index] = value;
-         ++this.myCount;
-         if (emptyIndex == -1) {
-            ++this.mySlots;
-         }
-
-         if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public void remove(int key, long value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = Integer.MIN_VALUE;
-      --this.myCount;
-   }
-
-   public boolean contains(int key, long value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int count(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int count = 0;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return count;
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = Integer.MIN_VALUE;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public long get(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return -1L;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      int[] keys;
-      long[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new long[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new long[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         int key = this.myKeys[i];
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            int step = (key & Integer.MAX_VALUE) % (keys.length - 2) + 1;
-            int index = (key & Integer.MAX_VALUE) % keys.length;
-
-            while(keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int step = 0;
-      private int key;
-      private long value;
-      private int theKey;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-         this.step = 0;
-      }
-
-      public void init(int key) {
-         if (key == 0) {
-            key = Integer.MAX_VALUE;
-         }
-
-         this.theKey = key;
-         this.step = (key & Integer.MAX_VALUE) % (MapOfIntLong.this.myKeys.length - 2) + 1;
-         this.index = (key & Integer.MAX_VALUE) % MapOfIntLong.this.myKeys.length;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            while(this.index < MapOfIntLong.this.myKeys.length) {
-               this.key = MapOfIntLong.this.myKeys[this.index];
-               if (this.key != 0 && this.key != Integer.MIN_VALUE) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = MapOfIntLong.this.myValues[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = MapOfIntLong.this.myKeys[this.index];
-               if (this.key == 0) {
-                  return false;
-               }
-
-               if (this.key == this.theKey) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = MapOfIntLong.this.myValues[this.index];
-                  this.index = (this.index + this.step) % MapOfIntLong.this.myKeys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % MapOfIntLong.this.myKeys.length;
-            }
-         }
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-
-      public long nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/MapOfLongInt.java b/common/src/main/java/com/apkide/common/collections/MapOfLongInt.java
deleted file mode 100644
index 856127e..0000000
--- a/common/src/main/java/com/apkide/common/collections/MapOfLongInt.java
+++ /dev/null
@@ -1,448 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class MapOfLongInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private long[] myKeys;
-   private long[] myOldKeys;
-   private int[] myValues;
-   private int[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public MapOfLongInt(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfLongInt() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfLongInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.myCount = stream.readInt();
-      this.mySlots = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         this.myKeys[i] = stream.readLong();
-      }
-
-      this.myValues = new int[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myValues.length; ++i) {
-         this.myValues[i] = stream.readInt();
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySlots);
-      stream.writeInt(this.mySizeExp);
-
-      for (long key : this.myKeys) {
-         stream.writeLong(key);
-      }
-
-      for (int value : this.myValues) {
-         stream.writeInt(value);
-      }
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear(int size) {
-      if (this.mySlots > 0) {
-         if (this.myKeys.length < size) {
-            Arrays.fill(this.myKeys, 0L);
-         } else {
-            this.mySizeExp = 0;
-
-            while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-               ++this.mySizeExp;
-            }
-
-            this.myKeys = new long[SIZES[this.mySizeExp]];
-            this.myValues = new int[SIZES[this.mySizeExp]];
-         }
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0L);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(long key, int value) {
-      this.remove(key);
-      this.insert(key, value);
-   }
-
-   public int get(int key1, int key2) {
-      return this.get((long)key1 << 32 | (long)key2);
-   }
-
-   public void put(int key1, int key2, int value) {
-      this.put((long)key1 << 32 | (long)key2, value);
-   }
-
-   public void insert(int key1, int key2, int value) {
-      this.insert((long)key1 << 32 | (long)key2, value);
-   }
-
-   public void remove(int key1, int key2) {
-      this.remove((long)key1 << 32 | (long)key2);
-   }
-
-   public boolean contains(int key1, int key2) {
-      return this.contains((long)key1 << 32 | (long)key2);
-   }
-
-   public void insert(long key, int value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.myKeys[index] = key;
-         this.myValues[index] = value;
-         ++this.myCount;
-         if (emptyIndex == -1) {
-            ++this.mySlots;
-         }
-
-         if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public void remove(long key, int value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = Long.MIN_VALUE;
-      --this.myCount;
-   }
-
-   public boolean contains(long key, int value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public boolean contains(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int count(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int count = 0;
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return count;
-   }
-
-   public void remove(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = Long.MIN_VALUE;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public int get(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return -1;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      long[] keys;
-      int[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new long[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0L);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new long[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         long key = this.myKeys[i];
-         if (key != 0L && key != Long.MIN_VALUE) {
-            int index = (int)((key & Long.MAX_VALUE) % (long)keys.length);
-            int step = (int)((key & Long.MAX_VALUE) % ((long)keys.length - 2L)) + 1;
-
-            while(keys[index] != 0L) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int step = 0;
-      private long key;
-      private int value;
-      private long theKey;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-         this.step = 0;
-      }
-
-      public void init(long key) {
-         if (key == 0L) {
-            key = Long.MAX_VALUE;
-         }
-
-         this.theKey = key;
-         this.index = (int)((key & Long.MAX_VALUE) % (long)MapOfLongInt.this.myKeys.length);
-         this.step = (int)((key & Long.MAX_VALUE) % ((long)MapOfLongInt.this.myKeys.length - 2L)) + 1;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            while(this.index < MapOfLongInt.this.myKeys.length) {
-               this.key = MapOfLongInt.this.myKeys[this.index];
-               if (this.key != 0L && this.key != Long.MIN_VALUE) {
-                  if (this.key == Long.MAX_VALUE) {
-                     this.key = 0L;
-                  }
-
-                  this.value = MapOfLongInt.this.myValues[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = MapOfLongInt.this.myKeys[this.index];
-               if (this.key == 0L) {
-                  return false;
-               }
-
-               if (this.key == this.theKey) {
-                  if (this.key == Long.MAX_VALUE) {
-                     this.key = 0L;
-                  }
-
-                  this.value = MapOfLongInt.this.myValues[this.index];
-                  this.index = (this.index + this.step) % MapOfLongInt.this.myKeys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % MapOfLongInt.this.myKeys.length;
-            }
-         }
-      }
-
-      public long nextKey() {
-         return this.key;
-      }
-
-      public int nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/MapOfLongLong.java b/common/src/main/java/com/apkide/common/collections/MapOfLongLong.java
deleted file mode 100644
index 2d967df..0000000
--- a/common/src/main/java/com/apkide/common/collections/MapOfLongLong.java
+++ /dev/null
@@ -1,408 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class MapOfLongLong {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private long[] myKeys;
-   private long[] myOldKeys;
-   private long[] myValues;
-   private long[] myOldValues;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public MapOfLongLong(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfLongLong() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.myValues = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public MapOfLongLong(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.myCount = stream.readInt();
-      this.mySlots = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         this.myKeys[i] = stream.readLong();
-      }
-
-      this.myValues = new long[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myValues.length; ++i) {
-         this.myValues[i] = stream.readLong();
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySlots);
-      stream.writeInt(this.mySizeExp);
-
-      for (long key : this.myKeys) {
-         stream.writeLong(key);
-      }
-
-      for (long value : this.myValues) {
-         stream.writeLong(value);
-      }
-   }
-
-   @NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0L);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(long key, long value) {
-      this.remove(key);
-      this.insert(key, value);
-   }
-
-   public void insert(long key, long value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-      boolean inserted = false;
-      int emptyIndex = -1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-         } else if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (!inserted) {
-         if (emptyIndex != -1) {
-            index = emptyIndex;
-         }
-
-         this.myKeys[index] = key;
-         this.myValues[index] = value;
-         ++this.myCount;
-         if (emptyIndex == -1) {
-            ++this.mySlots;
-         }
-
-         if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-            this.rehash();
-         }
-      }
-   }
-
-   public void remove(long key, long value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = Long.MIN_VALUE;
-      --this.myCount;
-   }
-
-   public boolean contains(long key, long value) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public boolean contains(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int count(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int count = 0;
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return count;
-   }
-
-   public void remove(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = Long.MIN_VALUE;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public long get(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return -1L;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      long[] keys;
-      long[] values;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         keys = new long[SIZES[this.mySizeExp]];
-         values = new long[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0L);
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         keys = new long[SIZES[this.mySizeExp]];
-         values = new long[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         long key = this.myKeys[i];
-         if (key != 0L && key != Long.MIN_VALUE) {
-            int index = (int)((key & Long.MAX_VALUE) % (long)keys.length);
-            int step = (int)((key & Long.MAX_VALUE) % ((long)keys.length - 2L)) + 1;
-
-            while(keys[index] != 0L) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            values[index] = this.myValues[i];
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int step = 0;
-      private long key;
-      private long value;
-      private long theKey;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-         this.step = 0;
-      }
-
-      public void init(long key) {
-         if (key == 0L) {
-            key = Long.MAX_VALUE;
-         }
-
-         this.theKey = key;
-         this.index = (int)((key & Long.MAX_VALUE) % (long)MapOfLongLong.this.myKeys.length);
-         this.step = (int)((key & Long.MAX_VALUE) % ((long)MapOfLongLong.this.myKeys.length - 2L)) + 1;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            while(this.index < MapOfLongLong.this.myKeys.length) {
-               this.key = MapOfLongLong.this.myKeys[this.index];
-               if (this.key != 0L && this.key != Long.MIN_VALUE) {
-                  if (this.key == Long.MAX_VALUE) {
-                     this.key = 0L;
-                  }
-
-                  this.value = MapOfLongLong.this.myValues[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = MapOfLongLong.this.myKeys[this.index];
-               if (this.key == 0L) {
-                  return false;
-               }
-
-               if (this.key == this.theKey) {
-                  if (this.key == Long.MAX_VALUE) {
-                     this.key = 0L;
-                  }
-
-                  this.value = MapOfLongLong.this.myValues[this.index];
-                  this.index = (this.index + this.step) % MapOfLongLong.this.myKeys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % MapOfLongLong.this.myKeys.length;
-            }
-         }
-      }
-
-      public long nextKey() {
-         return this.key;
-      }
-
-      public long nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/OrderedMapOfIntInt.java b/common/src/main/java/com/apkide/common/collections/OrderedMapOfIntInt.java
deleted file mode 100644
index 7bad63d..0000000
--- a/common/src/main/java/com/apkide/common/collections/OrderedMapOfIntInt.java
+++ /dev/null
@@ -1,529 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class OrderedMapOfIntInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private int[] myValues;
-   private int[] myOldValues;
-   private boolean[] mySecondElements;
-   private boolean[] myOldSecondElements;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public OrderedMapOfIntInt(int size) {
-      super();
-      this.mySizeExp = 0;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public OrderedMapOfIntInt() {
-      super();
-      this.mySizeExp = 0;
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.myValues = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public OrderedMapOfIntInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      this.myCount = stream.readInt();
-      this.mySlots = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myKeys.length; ++i) {
-         this.myKeys[i] = stream.readInt();
-      }
-
-      this.myValues = new int[SIZES[this.mySizeExp]];
-
-      for(int i = 0; i < this.myValues.length; ++i) {
-         this.myValues[i] = stream.readInt();
-      }
-
-      if (stream.readBoolean()) {
-         this.mySecondElements = new boolean[SIZES[this.mySizeExp]];
-
-         for(int i = 0; i < this.mySecondElements.length; ++i) {
-            this.mySecondElements[i] = stream.readBoolean();
-         }
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySlots);
-      stream.writeInt(this.mySizeExp);
-
-      for (int key : this.myKeys) {
-         stream.writeInt(key);
-      }
-
-      for (int value : this.myValues) {
-         stream.writeInt(value);
-      }
-
-      stream.writeBoolean(this.mySecondElements != null);
-      if (this.mySecondElements != null) {
-         for (boolean secondelement : this.mySecondElements) {
-            stream.writeBoolean(secondelement);
-         }
-      }
-   }
-@NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0);
-
-         if (this.mySecondElements != null) {
-            Arrays.fill(this.mySecondElements, false);
-         }
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void insert(@NonNull OrderedMapOfIntInt map) {
-      for(int i = 0; i < map.myKeys.length; ++i) {
-         int key = map.myKeys[i];
-         int value = map.myValues[i];
-         if (key == Integer.MAX_VALUE) {
-            this.insert(0, value);
-         } else if (key != 0 && key != Integer.MIN_VALUE) {
-            this.insert(key, value);
-         }
-      }
-   }
-
-   public void put(int key, int value) {
-      this.remove(key);
-      this.insert(key, value);
-   }
-
-   public void insert(int key, int value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      boolean second = false;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            if (this.myValues[index] == value) {
-               return;
-            }
-
-            second = true;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = key;
-      this.myValues[index] = value;
-      if (second) {
-         if (this.mySecondElements == null) {
-            this.mySecondElements = new boolean[this.myKeys.length];
-         }
-
-         this.mySecondElements[index] = true;
-      }
-
-      ++this.myCount;
-      ++this.mySlots;
-      if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-         this.rehash();
-      }
-   }
-
-   public boolean contains(int key, int value) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key || this.myValues[index] != value; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            this.myKeys[index] = Integer.MIN_VALUE;
-            --this.myCount;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public int count(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int count = 0;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            ++count;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return count;
-   }
-
-   public int get(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return -1;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return this.myValues[index];
-   }
-
-   private void rehash() {
-      int[] keys;
-      int[] values;
-      boolean[] secondElements;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         this.myOldValues = null;
-         this.myOldSecondElements = null;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-         if (this.mySecondElements != null) {
-            secondElements = new boolean[SIZES[this.mySizeExp]];
-         } else {
-            secondElements = null;
-         }
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         if (this.myOldSecondElements != null) {
-            secondElements = this.myOldSecondElements;
-
-            Arrays.fill(secondElements, false);
-         } else {
-            secondElements = null;
-         }
-
-         values = this.myOldValues;
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         this.myOldSecondElements = this.mySecondElements;
-      } else {
-         this.myOldKeys = this.myKeys;
-         this.myOldValues = this.myValues;
-         this.myOldSecondElements = this.mySecondElements;
-         keys = new int[SIZES[this.mySizeExp]];
-         values = new int[SIZES[this.mySizeExp]];
-         if (this.mySecondElements != null) {
-            secondElements = new boolean[SIZES[this.mySizeExp]];
-         } else {
-            secondElements = null;
-         }
-      }
-
-      int slots = 0;
-      if (this.mySecondElements == null) {
-         for(int i = 0; i < this.myKeys.length; ++i) {
-            int key = this.myKeys[i];
-            if (key != 0 && key != Integer.MIN_VALUE) {
-               int step = (key & Integer.MAX_VALUE) % (keys.length - 2) + 1;
-               int index = (key & Integer.MAX_VALUE) % keys.length;
-
-               while(keys[index] != 0) {
-                  index = (index + step) % keys.length;
-               }
-
-               keys[index] = key;
-               values[index] = this.myValues[i];
-               ++slots;
-            }
-         }
-      } else {
-         for(int i = 0; i < this.myKeys.length; ++i) {
-            int key = this.myKeys[i];
-            if (key != 0 && key != Integer.MIN_VALUE) {
-               int step = (key & Integer.MAX_VALUE) % (keys.length - 2) + 1;
-               int index = (key & Integer.MAX_VALUE) % keys.length;
-               if (!this.mySecondElements[i]) {
-                  while(keys[index] != 0) {
-                     index = (index + step) % keys.length;
-                  }
-
-                  keys[index] = key;
-                  values[index] = this.myValues[i];
-                  ++slots;
-                  int oldstep = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-                  for(int oldindex = (key & Integer.MAX_VALUE) % this.myKeys.length; this.myKeys[oldindex] != 0; oldindex = (oldindex + oldstep) % this.myKeys.length) {
-                     if (this.myKeys[oldindex] == key && oldindex != i) {
-                        while(keys[index] != 0) {
-                           index = (index + step) % keys.length;
-                        }
-
-                        keys[index] = key;
-                        values[index] = this.myValues[oldindex];
-                        if (secondElements != null) {
-                           secondElements[index] = true;
-                        }
-
-                        ++slots;
-                     }
-                  }
-               }
-            }
-         }
-      }
-
-      this.mySecondElements = secondElements;
-      this.myKeys = keys;
-      this.myValues = values;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   public class Iterator {
-      private int index;
-      private int step;
-      private int newIndex;
-      private int newStep;
-      private int key;
-      private int value;
-      private int theKey;
-
-      private Iterator() {
-         super();
-         if (OrderedMapOfIntInt.this.mySecondElements == null) {
-            this.index = 0;
-            this.step = -1;
-         } else {
-            this.index = 0;
-            this.step = 0;
-            this.newStep = 0;
-         }
-      }
-
-      public void init() {
-         if (OrderedMapOfIntInt.this.mySecondElements == null) {
-            this.index = 0;
-            this.step = -1;
-         } else {
-            this.index = 0;
-            this.step = 0;
-            this.newStep = 0;
-         }
-      }
-
-      public void init(int key) {
-         if (key == 0) {
-            key = Integer.MAX_VALUE;
-         }
-
-         this.theKey = key;
-         this.step = (key & Integer.MAX_VALUE) % (OrderedMapOfIntInt.this.myKeys.length - 2) + 1;
-         this.index = (key & Integer.MAX_VALUE) % OrderedMapOfIntInt.this.myKeys.length;
-      }
-
-      public boolean hasMoreElements() {
-         if (this.step == 0) {
-            if (this.newStep == 0) {
-               while(this.index < OrderedMapOfIntInt.this.myKeys.length) {
-                  this.key = OrderedMapOfIntInt.this.myKeys[this.index];
-                  if (!OrderedMapOfIntInt.this.mySecondElements[this.index] && this.key != 0 && this.key != Integer.MIN_VALUE) {
-                     this.newStep = (this.key & Integer.MAX_VALUE) % (OrderedMapOfIntInt.this.myKeys.length - 2) + 1;
-                     this.newIndex = (this.key & Integer.MAX_VALUE) % OrderedMapOfIntInt.this.myKeys.length;
-                     this.theKey = this.key;
-                     ++this.index;
-                     return this.hasMoreElements();
-                  }
-
-                  ++this.index;
-               }
-
-               return false;
-            } else {
-               while(true) {
-                  this.key = OrderedMapOfIntInt.this.myKeys[this.newIndex];
-                  if (this.key == 0) {
-                     this.newStep = 0;
-                     return this.hasMoreElements();
-                  }
-
-                  if (this.key == this.theKey) {
-                     if (this.key == Integer.MAX_VALUE) {
-                        this.key = 0;
-                     }
-
-                     this.value = OrderedMapOfIntInt.this.myValues[this.newIndex];
-                     this.newIndex = (this.newIndex + this.newStep) % OrderedMapOfIntInt.this.myKeys.length;
-                     return true;
-                  }
-
-                  this.newIndex = (this.newIndex + this.newStep) % OrderedMapOfIntInt.this.myKeys.length;
-               }
-            }
-         } else if (this.step == -1) {
-            while(this.index < OrderedMapOfIntInt.this.myKeys.length) {
-               this.key = OrderedMapOfIntInt.this.myKeys[this.index];
-               if (this.key != 0 && this.key != Integer.MIN_VALUE) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = OrderedMapOfIntInt.this.myValues[this.index];
-                  ++this.index;
-                  return true;
-               }
-
-               ++this.index;
-            }
-
-            return false;
-         } else {
-            while(true) {
-               this.key = OrderedMapOfIntInt.this.myKeys[this.index];
-               if (this.key == 0) {
-                  return false;
-               }
-
-               if (this.key == this.theKey) {
-                  if (this.key == Integer.MAX_VALUE) {
-                     this.key = 0;
-                  }
-
-                  this.value = OrderedMapOfIntInt.this.myValues[this.index];
-                  this.index = (this.index + this.step) % OrderedMapOfIntInt.this.myKeys.length;
-                  return true;
-               }
-
-               this.index = (this.index + this.step) % OrderedMapOfIntInt.this.myKeys.length;
-            }
-         }
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-
-      public int nextValue() {
-         return this.value;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/SetOfInt.java b/common/src/main/java/com/apkide/common/collections/SetOfInt.java
deleted file mode 100644
index aed536b..0000000
--- a/common/src/main/java/com/apkide/common/collections/SetOfInt.java
+++ /dev/null
@@ -1,335 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class SetOfInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   public static final SetOfInt EMPTY = new SetOfInt();
-   private int[] myKeys;
-   private int[] myOldKeys;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public SetOfInt(int size) {
-      super();
-      this.mySizeExp = 1;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public SetOfInt() {
-      super();
-      this.mySizeExp = 1;
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public SetOfInt(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      int count = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new int[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.put(stream.readInt());
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySizeExp);
-
-      for (int key : this.myKeys) {
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            stream.writeInt(key);
-         }
-      }
-   }
-@NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(@NonNull SetOfInt set) {
-      for(int i = 0; i < set.myKeys.length; ++i) {
-         int key = set.myKeys[i];
-         if (key == Integer.MAX_VALUE) {
-            this.put(0);
-         } else if (key != 0 && key != Integer.MIN_VALUE) {
-            this.put(key);
-         }
-      }
-   }
-
-   public void put(@NonNull ListOfInt vec) {
-      for(int i = 0; i < vec.size(); ++i) {
-         int key = vec.get(i);
-         this.put(key);
-      }
-   }
-
-   public void put(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int curKey = this.myKeys[index];
-
-      int emptyIndex;
-      for(emptyIndex = -1; curKey != 0; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            return;
-         }
-
-         if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (emptyIndex != -1) {
-         index = emptyIndex;
-      }
-
-      this.myKeys[index] = key;
-      if (emptyIndex == -1) {
-         ++this.mySlots;
-      }
-
-      ++this.myCount;
-      if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-         this.rehash();
-      }
-   }
-
-   public void remove(@NonNull SetOfInt keys) {
-      keys.DEFAULT_ITERATOR.init();
-
-      while(keys.DEFAULT_ITERATOR.hasMoreElements()) {
-         this.remove(keys.DEFAULT_ITERATOR.nextKey());
-      }
-   }
-
-   public void remove(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = Integer.MIN_VALUE;
-      --this.myCount;
-   }
-
-   public int get() {
-      int index = 0;
-
-      while(index < this.myKeys.length) {
-         int key = this.myKeys[index];
-         ++index;
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            if (key == Integer.MAX_VALUE) {
-               key = 0;
-            }
-
-            return key;
-         }
-      }
-
-      return -1;
-   }
-
-   public boolean contains(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int step = (key & Integer.MAX_VALUE) % (this.myKeys.length - 2) + 1;
-      int index = (key & Integer.MAX_VALUE) % this.myKeys.length;
-
-      for(int curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public boolean empty() {
-      return this.myCount == 0;
-   }
-
-   private void rehash() {
-      int[] keys;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         keys = new int[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0);
-
-         this.myOldKeys = this.myKeys;
-      } else {
-         this.myOldKeys = this.myKeys;
-         keys = new int[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for (int key : this.myKeys) {
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            int step = (key & Integer.MAX_VALUE) % (keys.length - 2) + 1;
-            int index = (key & Integer.MAX_VALUE) % keys.length;
-
-            while (keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (!(o instanceof SetOfInt)) {
-         return false;
-      } else {
-         SetOfInt set = (SetOfInt)o;
-         if (set.size() != this.size()) {
-            return false;
-         } else {
-            for (int j : this.myKeys) {
-               int key = j;
-               if (key != 0 && key != Integer.MIN_VALUE) {
-                  if (key == Integer.MAX_VALUE) {
-                     key = 0;
-                  }
-
-                  if (!set.contains(key)) {
-                     return false;
-                  }
-               }
-            }
-
-            return true;
-         }
-      }
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int key;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < SetOfInt.this.myKeys.length) {
-            this.key = SetOfInt.this.myKeys[this.index];
-            ++this.index;
-            if (this.key != 0 && this.key != Integer.MIN_VALUE) {
-               if (this.key == Integer.MAX_VALUE) {
-                  this.key = 0;
-               }
-
-               return true;
-            }
-         }
-
-         return false;
-      }
-
-      public int nextKey() {
-         return this.key;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/collections/SetOfLong.java b/common/src/main/java/com/apkide/common/collections/SetOfLong.java
deleted file mode 100644
index 18ff942..0000000
--- a/common/src/main/java/com/apkide/common/collections/SetOfLong.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package com.apkide.common.collections;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class SetOfLong {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   public static final SetOfLong EMPTY = new SetOfLong();
-   private long[] myKeys;
-   private long[] myOldKeys;
-   private int mySlots;
-   private int myCount;
-   private int mySizeExp;
-
-   public SetOfLong(int size) {
-      super();
-      this.mySizeExp = 1;
-
-      while(SIZES[this.mySizeExp] < size * LOAD_FACTOR) {
-         ++this.mySizeExp;
-      }
-
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public SetOfLong() {
-      super();
-      this.mySizeExp = 1;
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-   }
-
-   public SetOfLong(@NonNull StoreInputStream stream) throws IOException {
-      super();
-      int count = stream.readInt();
-      this.mySizeExp = stream.readInt();
-      this.myKeys = new long[SIZES[this.mySizeExp]];
-      this.mySlots = 0;
-      this.myCount = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.put(stream.readLong());
-      }
-   }
-
-   public void store(@NonNull StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.myCount);
-      stream.writeInt(this.mySizeExp);
-
-      for (long key : this.myKeys) {
-         if (key != 0L && key != Long.MIN_VALUE) {
-            stream.writeLong(key);
-         }
-      }
-   }
-@NonNull
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.mySlots > 0) {
-         Arrays.fill(this.myKeys, 0L);
-
-         this.mySlots = 0;
-         this.myCount = 0;
-      }
-   }
-
-   public void put(@NonNull SetOfLong set) {
-      for(int i = 0; i < set.myKeys.length; ++i) {
-         long key = set.myKeys[i];
-         if (key == Long.MAX_VALUE) {
-            this.put(0L);
-         } else if (key != 0L && key != Long.MIN_VALUE) {
-            this.put(key);
-         }
-      }
-   }
-
-   public void put(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-      long curKey = this.myKeys[index];
-
-      int emptyIndex;
-      for(emptyIndex = -1; curKey != 0L; curKey = this.myKeys[index]) {
-         if (curKey == key) {
-            return;
-         }
-
-         if (curKey == Long.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      if (emptyIndex != -1) {
-         index = emptyIndex;
-      }
-
-      this.myKeys[index] = key;
-      if (emptyIndex == -1) {
-         ++this.mySlots;
-      }
-
-      ++this.myCount;
-      if (this.mySlots * LOAD_FACTOR > this.myKeys.length) {
-         this.rehash();
-      }
-   }
-
-   public void remove(@NonNull SetOfLong keys) {
-      keys.DEFAULT_ITERATOR.init();
-
-      while(keys.DEFAULT_ITERATOR.hasMoreElements()) {
-         this.remove(keys.DEFAULT_ITERATOR.nextKey());
-      }
-   }
-
-   public void remove(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      this.myKeys[index] = Long.MIN_VALUE;
-      --this.myCount;
-   }
-
-   public boolean contains(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.myKeys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.myKeys.length - 2L)) + 1;
-
-      for(long curKey = this.myKeys[index]; curKey != key; curKey = this.myKeys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.myKeys.length;
-      }
-
-      return true;
-   }
-
-   public boolean empty() {
-      return this.myCount == 0;
-   }
-
-   private void rehash() {
-      long[] keys;
-      if (this.myCount * LOAD_FACTOR > this.myKeys.length) {
-         ++this.mySizeExp;
-         this.myOldKeys = null;
-         keys = new long[SIZES[this.mySizeExp]];
-      } else if (this.myOldKeys != null && this.myOldKeys.length == this.myKeys.length) {
-         keys = this.myOldKeys;
-
-         Arrays.fill(keys, 0L);
-
-         this.myOldKeys = this.myKeys;
-      } else {
-         this.myOldKeys = this.myKeys;
-         keys = new long[SIZES[this.mySizeExp]];
-      }
-
-      int slots = 0;
-
-      for (long key : this.myKeys) {
-         if (key != 0L && key != Long.MIN_VALUE) {
-            int index = (int) ((key & Long.MAX_VALUE) % (long) keys.length);
-            int step = (int) ((key & Long.MAX_VALUE) % ((long) keys.length - 2L)) + 1;
-
-            while (keys[index] != 0L) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            ++slots;
-         }
-      }
-
-      this.myKeys = keys;
-      this.mySlots = slots;
-   }
-
-   public int size() {
-      return this.myCount;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (!(o instanceof SetOfLong)) {
-         return false;
-      } else {
-         SetOfLong set = (SetOfLong)o;
-         if (set.size() != this.size()) {
-            return false;
-         } else {
-            for (long l : this.myKeys) {
-               long key = l;
-               if (key != 0L && key != Long.MIN_VALUE) {
-                  if (key == Long.MAX_VALUE) {
-                     key = 0L;
-                  }
-
-                  if (!set.contains(key)) {
-                     return false;
-                  }
-               }
-            }
-
-            return true;
-         }
-      }
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private long key;
-
-      private Iterator() {
-         super();
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < SetOfLong.this.myKeys.length) {
-            this.key = SetOfLong.this.myKeys[this.index];
-            ++this.index;
-            if (this.key != 0L && this.key != Long.MIN_VALUE) {
-               if (this.key == Long.MAX_VALUE) {
-                  this.key = 0L;
-               }
-
-               return true;
-            }
-         }
-
-         return false;
-      }
-
-      public long nextKey() {
-         return this.key;
-      }
-   }
-}
diff --git a/common/src/main/java/com/apkide/common/command/Command.java b/common/src/main/java/com/apkide/common/command/Command.java
new file mode 100644
index 0000000..5243f19
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/command/Command.java
@@ -0,0 +1,5 @@
+package com.apkide.common.command;
+
+public interface Command {
+
+}
diff --git a/common/src/main/java/com/apkide/common/FileUtils.java b/common/src/main/java/com/apkide/common/io/FileUtils.java
similarity index 97%
rename from common/src/main/java/com/apkide/common/FileUtils.java
rename to common/src/main/java/com/apkide/common/io/FileUtils.java
index 9ac644f..cbb46a6 100644
--- a/common/src/main/java/com/apkide/common/FileUtils.java
+++ b/common/src/main/java/com/apkide/common/io/FileUtils.java
@@ -1,8 +1,10 @@
-package com.apkide.common;
+package com.apkide.common.io;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.apkide.common.app.AppLog;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -188,11 +190,6 @@ public static boolean deleteDir(File dir, boolean failFast) {
             return !dir.exists();
     }
 
-    public static boolean deleteDirRecursiveBestEffort(File dir) {
-        internalFileDelete(dir, false);
-        return !dir.exists();
-    }
-
     @Nullable
     private static File internalFileDelete(@NonNull File dir, boolean failFast) {
         if (!dir.exists())
diff --git a/common/src/main/java/com/apkide/common/IOUtils.java b/common/src/main/java/com/apkide/common/io/IOUtils.java
similarity index 59%
rename from common/src/main/java/com/apkide/common/IOUtils.java
rename to common/src/main/java/com/apkide/common/io/IOUtils.java
index 5cb6002..6d2c1d0 100644
--- a/common/src/main/java/com/apkide/common/IOUtils.java
+++ b/common/src/main/java/com/apkide/common/io/IOUtils.java
@@ -1,10 +1,12 @@
-package com.apkide.common;
+package com.apkide.common.io;
 
 import static java.security.MessageDigest.getInstance;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.apkide.common.collections.LineIterator;
+import com.apkide.common.LineIterator;
+import com.apkide.common.app.AppLog;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -17,47 +19,7 @@
 import java.security.NoSuchAlgorithmException;
 
 public final class IOUtils {
-	private static final int BUFFER_SIZE = 4096;
-	public static boolean equals(InputStream stream1, InputStream stream2) throws IOException {
-		try (stream1; stream2) {
-			byte[] buf1 = new byte[8192];
-			byte[] buf2 = new byte[8192];
-			while (true) {
-				int i1 = readMax(stream1, buf1);
-				int i2 = readMax(stream2, buf2);
-				if (i1 != i2) {
-					return false;
-				}
-				if (i1 == -1) {
-					return true;
-				}
-				for (int i = 0; i < i1; i++) {
-					if (buf1[i] != buf2[i]) {
-						return false;
-					}
-				}
-			}
-		}
-	}
-
-	public static int readMax(InputStream inStream, byte[] arr) throws IOException {
-		return readMax(inStream, arr, 0, arr.length);
-	}
-
-	public static int readMax(InputStream inStream, byte[] arr, int off, int len) throws IOException {
-		int count = 0;
-		while (count < len) {
-			int currCount = inStream.read(arr, off + count, len - count);
-			if (currCount == -1) {
-				if (count > 0) {
-					return count;
-				}
-				return -1;
-			}
-			count += currCount;
-		}
-		return count;
-	}
+	private static final int BUFFER_SIZE = 8192;
 
 	@NonNull
 	public static byte[] readBytes(@NonNull InputStream in) throws IOException {
@@ -65,43 +27,38 @@ public static byte[] readBytes(@NonNull InputStream in) throws IOException {
 		copyBytes(in, out);
 		return out.toByteArray();
 	}
-	
+
 	@NonNull
 	public static byte[] readBytes(@NonNull InputStream in, boolean autoClose) throws IOException {
 		byte[] result = readBytes(in);
-		if (autoClose)
-			safeClose(in);
+		if (autoClose) safeClose(in);
 		return result;
 	}
-	
+
 	@NonNull
 	public static String readString(@NonNull Reader reader) throws IOException {
 		char[] buffer = new char[BUFFER_SIZE / 2];
 		StringBuilder builder = new StringBuilder();
 		while (true) {
 			int read = reader.read(buffer);
-			if (read == -1) {
-				break;
-			}
+			if (read == -1) break;
 			builder.append(buffer, 0, read);
 		}
 		return builder.toString();
 	}
-	
+
 	@NonNull
 	public static String readString(@NonNull Reader reader, boolean autoClose) throws IOException {
 		String result = readString(reader);
-		if (autoClose)
-			safeClose(reader);
+		if (autoClose) safeClose(reader);
 		return result;
 	}
-	
+
 	public static void writeString(@NonNull Writer writer, @NonNull CharSequence text, boolean autoClose) throws IOException {
 		writer.append(text);
-		if (autoClose)
-			safeClose(writer);
+		if (autoClose) safeClose(writer);
 	}
-	
+
 	@NonNull
 	public static byte[] toDigest(@NonNull InputStream in, @NonNull String algorithm) throws IOException {
 		MessageDigest digester;
@@ -111,7 +68,7 @@ public static byte[] toDigest(@NonNull InputStream in, @NonNull String algorithm
 			AppLog.e(e);
 			return new byte[0];
 		}
-		
+
 		byte[] buffer = new byte[BUFFER_SIZE];
 		int len;
 		while ((len = in.read(buffer)) != -1) {
@@ -119,40 +76,34 @@ public static byte[] toDigest(@NonNull InputStream in, @NonNull String algorithm
 		}
 		return digester.digest();
 	}
-	
+
 	public static int copyBytes(@NonNull InputStream in, @NonNull OutputStream out) throws IOException {
 		int byteCount = 0;
 		byte[] buffer = new byte[BUFFER_SIZE];
 		while (true) {
 			int read = in.read(buffer);
-			if (read == -1) {
-				break;
-			}
+			if (read == -1) break;
+
 			out.write(buffer, 0, read);
 			byteCount += read;
 		}
 		return byteCount;
 	}
-	
+
 	@NonNull
 	public static LineIterator lineIterator(@NonNull Reader reader) {
 		return new LineIterator(reader);
 	}
-	
-	private static void internalClose(Closeable closeable) {
-		if (closeable==null)return;
-		try {
-			closeable.close();
-		} catch (IOException e) {
-			AppLog.e(e);
-		}
-	}
 
-	public static void safeClose(Closeable... closeable) {
-		if (closeable==null)return;
+	public static void safeClose(@Nullable Closeable... closeable) {
+		if (closeable == null) return;
 		for (Closeable c : closeable) {
-			internalClose(c);
+			try {
+				if (c != null) c.close();
+			} catch (IOException e) {
+				AppLog.e(e);
+			}
 		}
 	}
-	
+
 }
diff --git a/common/src/main/java/com/apkide/common/keybinding/DefaultKeymap.java b/common/src/main/java/com/apkide/common/keybinding/DefaultKeymap.java
new file mode 100644
index 0000000..be3b14e
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/keybinding/DefaultKeymap.java
@@ -0,0 +1,85 @@
+package com.apkide.common.keybinding;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.apkide.common.action.Action;
+
+import java.util.HashMap;
+
+public class DefaultKeymap implements Keymap {
+	private final HashMap<KeyStroke, Action> myBoundMap = new HashMap<>();
+	private final Keymap myParent;
+	private final String myName;
+
+	public DefaultKeymap(@NonNull String name) {
+		this(null, name);
+	}
+
+	public DefaultKeymap(@Nullable Keymap keymap, @NonNull String name) {
+		myName = name;
+		myParent = keymap;
+		if (myParent != null) {
+			for (KeyStroke key : myParent.getKeys()) {
+				if (key != null) {
+					Action action = myParent.getAction(key);
+					if (action != null) {
+						myBoundMap.put(key, action);
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void bound(@NonNull KeyStroke key, @NonNull Action action) {
+		myBoundMap.put(key, action);
+	}
+
+	@Override
+	public void unbound(@NonNull KeyStroke key) {
+		myBoundMap.remove(key);
+	}
+
+	@Nullable
+	@Override
+	public Action getAction(@NonNull KeyStroke key) {
+		if (myBoundMap.containsKey(key)) {
+			return myBoundMap.get(key);
+		}
+		return null;
+	}
+
+	@NonNull
+	@Override
+	public KeyStroke[] getKeys() {
+		KeyStroke[] keys = new KeyStroke[myBoundMap.size()];
+		myBoundMap.keySet().toArray(keys);
+		return keys;
+	}
+
+	@NonNull
+	@Override
+	public Action[] getActions() {
+		Action[] actions = new Action[myBoundMap.size()];
+		myBoundMap.values().toArray(actions);
+		return actions;
+	}
+
+	@Nullable
+	@Override
+	public Keymap getParent() {
+		return myParent;
+	}
+
+	@Override
+	public boolean hasParent() {
+		return myParent != null;
+	}
+
+	@NonNull
+	@Override
+	public String getName() {
+		return myName;
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/keybinding/KeyStroke.java b/common/src/main/java/com/apkide/common/keybinding/KeyStroke.java
new file mode 100644
index 0000000..56c3bc8
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/keybinding/KeyStroke.java
@@ -0,0 +1,166 @@
+package com.apkide.common.keybinding;
+
+import static android.view.KeyEvent.KEYCODE_DEL;
+import static android.view.KeyEvent.KEYCODE_DPAD_DOWN;
+import static android.view.KeyEvent.KEYCODE_DPAD_LEFT;
+import static android.view.KeyEvent.KEYCODE_DPAD_RIGHT;
+import static android.view.KeyEvent.KEYCODE_DPAD_UP;
+import static android.view.KeyEvent.KEYCODE_ENTER;
+import static android.view.KeyEvent.KEYCODE_MOVE_END;
+import static android.view.KeyEvent.KEYCODE_MOVE_HOME;
+import static android.view.KeyEvent.KEYCODE_PAGE_DOWN;
+import static android.view.KeyEvent.KEYCODE_PAGE_UP;
+import static android.view.KeyEvent.KEYCODE_SPACE;
+import static android.view.KeyEvent.KEYCODE_TAB;
+import static android.view.KeyEvent.KEYCODE_VOLUME_DOWN;
+import static android.view.KeyEvent.KEYCODE_VOLUME_MUTE;
+import static android.view.KeyEvent.KEYCODE_VOLUME_UP;
+import static android.view.KeyEvent.keyCodeToString;
+
+import android.view.KeyCharacterMap;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.Serializable;
+
+public class KeyStroke implements Serializable {
+
+    private static final long serialVersionUID = -1170266913954804590L;
+    public static final char CHAR_UNDEFINED = 0xFFFF;
+    private final boolean alt;
+	private final char ch;
+	private final boolean ctrl;
+	private final int keyCode;
+	private final boolean shift;
+
+	public KeyStroke(int keyCode, char ch, boolean shift, boolean ctrl, boolean alt) {
+		this.ch = ch;
+		this.keyCode = keyCode;
+		this.shift = shift;
+		this.ctrl = ctrl;
+		this.alt = alt;
+	}
+
+	public KeyStroke(int keyCode, boolean shift, boolean ctrl, boolean alt) {
+		this.ch = (char) 65535;
+		this.keyCode = keyCode;
+		this.shift = shift;
+		this.ctrl = ctrl;
+		this.alt = alt;
+	}
+
+	public boolean isChar() {
+		return this.ch != 65535;
+	}
+
+	public char getChar() {
+		return this.ch;
+	}
+
+	public int getKeyCode() {
+		return this.keyCode;
+	}
+
+	public boolean isShift() {
+		return this.shift;
+	}
+
+	public boolean isCtrl() {
+		return this.ctrl;
+	}
+
+	public boolean isAlt() {
+		return this.alt;
+	}
+
+	public boolean matches(@Nullable KeyStroke pressedKeyStroke) {
+		if (pressedKeyStroke == null) return false;
+		if (this.alt == pressedKeyStroke.alt && this.ctrl == pressedKeyStroke.ctrl && this.shift == pressedKeyStroke.shift) {
+			if (this.keyCode == -1 || this.keyCode != pressedKeyStroke.keyCode) {
+				return this.ch != CHAR_UNDEFINED && this.ch == pressedKeyStroke.ch;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	@NonNull
+	public String toString() {
+		String str = this.shift ? "Shift+" : "";
+		if (this.ctrl) {
+			str = str + "Ctrl+";
+		}
+		if (this.alt) {
+			str = str + "Alt+";
+		}
+		return str + getDisplayLabel();
+	}
+
+	private String getDisplayLabel() {
+		switch (this.keyCode) {
+			case -1:
+				return String.valueOf(Character.toUpperCase(this.ch));
+			case KEYCODE_DPAD_UP:
+				return "Up";
+			case KEYCODE_DPAD_DOWN:
+				return "Down";
+			case KEYCODE_DPAD_LEFT:
+				return "Left";
+			case KEYCODE_DPAD_RIGHT:
+				return "Right";
+			case KEYCODE_VOLUME_UP:
+				return "VolUp";
+			case KEYCODE_VOLUME_DOWN:
+				return "VolDown";
+			case KEYCODE_TAB:
+				return "Tab";
+			case KEYCODE_SPACE:
+				return "Space";
+			case KEYCODE_ENTER:
+				return "Enter";
+			case KEYCODE_DEL:
+				return "Backspace";
+			case KEYCODE_PAGE_UP:
+				return "PgUp";
+			case KEYCODE_PAGE_DOWN:
+				return "PgDown";
+			case KEYCODE_MOVE_HOME:
+				return "Home";
+			case KEYCODE_MOVE_END:
+				return "End";
+			case KEYCODE_VOLUME_MUTE:
+				return "VolMute";
+			default:
+				String displayLabel = (String.valueOf(KeyCharacterMap.load(0).getDisplayLabel(this.keyCode))).trim();
+				if (displayLabel.length() == 0) {
+					String name = keyCodeToString(this.keyCode).toLowerCase();
+					if (name.startsWith("keycode_")) {
+						name = name.substring("keycode_".length());
+					}
+					String name2 = name.replace("_", " ");
+					return name2.substring(0, 1).toUpperCase() + name2.substring(1);
+				}
+				return displayLabel;
+		}
+	}
+
+	@NonNull
+	public String store() {
+		return this.keyCode + "," + ((int) this.ch) + "," + this.shift + "," + this.ctrl + "," + this.alt;
+	}
+
+	@Nullable
+	public static KeyStroke load(@NonNull String value) {
+		String[] split = value.split(",");
+		if (split.length != 5) {
+			return null;
+		}
+		return new KeyStroke(
+				Integer.parseInt(split[0]),
+				(char) Integer.parseInt(split[1]),
+				Boolean.parseBoolean(split[2]),
+				Boolean.parseBoolean(split[3]),
+				Boolean.parseBoolean(split[4]));
+	}
+}
diff --git a/common/src/main/java/com/apkide/common/KeyStrokeDetector.java b/common/src/main/java/com/apkide/common/keybinding/KeyStrokeDetector.java
similarity index 99%
rename from common/src/main/java/com/apkide/common/KeyStrokeDetector.java
rename to common/src/main/java/com/apkide/common/keybinding/KeyStrokeDetector.java
index b868a78..cc25e01 100644
--- a/common/src/main/java/com/apkide/common/KeyStrokeDetector.java
+++ b/common/src/main/java/com/apkide/common/keybinding/KeyStrokeDetector.java
@@ -1,4 +1,4 @@
-package com.apkide.common;
+package com.apkide.common.keybinding;
 
 import static android.content.res.Configuration.KEYBOARD_NOKEYS;
 import static android.view.KeyEvent.FLAG_SOFT_KEYBOARD;
diff --git a/common/src/main/java/com/apkide/common/keybinding/Keymap.java b/common/src/main/java/com/apkide/common/keybinding/Keymap.java
new file mode 100644
index 0000000..fa07f77
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/keybinding/Keymap.java
@@ -0,0 +1,30 @@
+package com.apkide.common.keybinding;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.apkide.common.action.Action;
+
+public interface Keymap {
+
+	void bound(@NonNull KeyStroke key, @NonNull Action action);
+
+	void unbound(@NonNull KeyStroke key);
+
+	@Nullable
+	Action getAction(@NonNull KeyStroke key);
+
+	@NonNull
+	KeyStroke[] getKeys();
+
+	@NonNull
+	Action[] getActions();
+
+	@Nullable
+	Keymap getParent();
+
+	boolean hasParent();
+
+	@NonNull
+	String getName();
+}
diff --git a/common/src/main/java/com/apkide/common/log/LogListener.java b/common/src/main/java/com/apkide/common/log/LogListener.java
deleted file mode 100644
index 270150e..0000000
--- a/common/src/main/java/com/apkide/common/log/LogListener.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.apkide.common.log;
-
-public interface LogListener {
-    void loggingInfo(String name, String msg);
-
-    void loggingError(String name, String msg);
-
-    void loggingWarning(String name, String msg);
-}
diff --git a/common/src/main/java/com/apkide/common/log/LogOutputStream.java b/common/src/main/java/com/apkide/common/log/LogOutputStream.java
deleted file mode 100644
index 97b7d52..0000000
--- a/common/src/main/java/com/apkide/common/log/LogOutputStream.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.apkide.common.log;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class LogOutputStream extends OutputStream {
-
-    public static final int LEVEL_WARNING = 2;
-    public static final int LEVEL_ERROR = 1;
-    public static final int LEVEL_INFO = 0;
-    private static final byte LineFeed = '\n';
-    private final StringBuffer msg = new StringBuffer();
-    private final String name;
-    private final int level;
-
-    public LogOutputStream(String name, int level) {
-        this.name = name;
-        this.level = level;
-    }
-
-    @Override
-    public void write(int b) throws IOException {
-        byte[] bytes = new byte[1];
-        bytes[0] = (byte) b;
-        msg.append(new String(bytes));
-        if (bytes[0] == LineFeed) {
-            msg.deleteCharAt(msg.length());
-            flush();
-        }
-    }
-
-    @Override
-    public void flush() throws IOException {
-        switch (level) {
-            case LEVEL_ERROR:
-                Logger.get(name).error(msg.toString());
-                break;
-            case LEVEL_WARNING:
-                Logger.get(name).warning(msg.toString());
-                break;
-            case LEVEL_INFO:
-                Logger.get(name).info(msg.toString());
-                break;
-        }
-        msg.setLength(0);
-    }
-}
diff --git a/common/src/main/java/com/apkide/common/log/Logger.java b/common/src/main/java/com/apkide/common/log/Logger.java
deleted file mode 100644
index a13842b..0000000
--- a/common/src/main/java/com/apkide/common/log/Logger.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.apkide.common.log;
-
-import android.util.ArrayMap;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.common.SafeListenerList;
-
-public  class Logger {
-
-    private static final Object lock = new Object();
-    private static Logger defaultLogger=new Logger("Default");
-    private static final SafeListenerList<LogListener> listeners = new SafeListenerList<>();
-    private static final ArrayMap<String, Logger> loggers = new ArrayMap<>();
-
-    private final String name;
-
-    private Logger(String name) {
-        this.name = name;
-    }
-
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    public  static void addListener(LogListener listener){
-        listeners.add(listener);
-    }
-
-    public static void removeListener(LogListener listener){
-        listeners.remove(listener);
-    }
-
-    @NonNull
-    public static Logger get() {
-        synchronized (lock) {
-            return defaultLogger;
-        }
-    }
-
-    public static void set(Logger logger) {
-        synchronized (lock) {
-            defaultLogger = logger;
-        }
-    }
-
-    public static Logger get(String name) {
-        synchronized (lock) {
-            Logger logger = loggers.get(name);
-            if (logger == null) {
-                logger = new Logger(name);
-                loggers.put(name, logger);
-            }
-            return logger;
-        }
-    }
-
-    public static void set(String name, Logger logger) {
-        synchronized (lock) {
-            loggers.put(name, logger);
-        }
-    }
-
-    public final void info(String msg) {
-        onInfo(msg);
-    }
-
-    protected void onInfo(String msg){
-        for (LogListener listener : listeners) {
-            listener.loggingInfo(name,msg);
-        }
-    }
-
-    public final void warning(String msg) {
-        onWarning(msg);
-    }
-
-    protected void onWarning(String msg){
-        for (LogListener listener : listeners) {
-            listener.loggingWarning(name,msg);
-        }
-    }
-
-    public final void error(String msg) {
-        onError(msg);
-    }
-
-    protected void onError(String msg){
-        for (LogListener listener : listeners) {
-            listener.loggingError(name,msg);
-        }
-    }
-
-}
diff --git a/common/src/main/java/com/apkide/common/store/StoreInputStream.java b/common/src/main/java/com/apkide/common/store/StoreInputStream.java
new file mode 100644
index 0000000..0c2acdf
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/store/StoreInputStream.java
@@ -0,0 +1,17 @@
+package com.apkide.common.store;
+
+import androidx.annotation.NonNull;
+
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+
+public class StoreInputStream extends DataInputStream {
+	public StoreInputStream(@NonNull String filePath, @NonNull Inflater inflater) throws IOException {
+		super(new BufferedInputStream(new InflaterInputStream(new FileInputStream(filePath), inflater)));
+	}
+
+}
diff --git a/common/src/main/java/com/apkide/common/store/StoreOutputStream.java b/common/src/main/java/com/apkide/common/store/StoreOutputStream.java
new file mode 100644
index 0000000..6ab1549
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/store/StoreOutputStream.java
@@ -0,0 +1,17 @@
+package com.apkide.common.store;
+
+import androidx.annotation.NonNull;
+
+import java.io.BufferedOutputStream;
+import java.io.DataOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
+
+public class StoreOutputStream extends DataOutputStream {
+	public StoreOutputStream(@NonNull String filePath,@NonNull Deflater deflater) throws IOException {
+		super(new BufferedOutputStream(new DeflaterOutputStream(new FileOutputStream(filePath), deflater)));
+	}
+
+}
diff --git a/common/src/main/java/com/apkide/common/store/Storeable.java b/common/src/main/java/com/apkide/common/store/Storeable.java
new file mode 100644
index 0000000..614fbb6
--- /dev/null
+++ b/common/src/main/java/com/apkide/common/store/Storeable.java
@@ -0,0 +1,11 @@
+package com.apkide.common.store;
+
+import androidx.annotation.NonNull;
+
+import java.io.IOException;
+
+public interface Storeable {
+	void store(@NonNull StoreOutputStream out) throws IOException;
+
+	void restore(@NonNull StoreInputStream in) throws IOException;
+}
diff --git a/engine/build.gradle b/engine/build.gradle
index 38224d2..e14a92a 100644
--- a/engine/build.gradle
+++ b/engine/build.gradle
@@ -30,6 +30,7 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     coreLibraryDesugaring libs.desugar.jdk.libs.nio
+    implementation libs.androidx.annotation
     implementation project(':common')
     implementation project(':openapi')
     testImplementation libs.junit
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 928815e..a28d935 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,51 +1,28 @@
 [versions]
-agp = "8.2.0-alpha08"
-android-r8 = "8.0.40"
-androidx-annotation = "1.6.0"
-antlr4-runtime = "4.13.0"
-com-android-tools-smali-smali = "3.0.3"
-com-android-tools-smali-smali-util = "3.0.3"
-com-android-tools-smali-smali-baksmali = "3.0.3"
-com-google-guava-guava = "31.1-jre"
-dialogx = "0.0.48"
-eclipse-org-eclipse-lsp4j = "0.21.0"
-editor = "0.21.1"
+agp = "8.2.0-alpha15"
+android-r8 = "8.1.56"
 gradle = "8.2.0-alpha15"
 desugar_jdk_libs_nio = "2.0.3"
 jakewharton-dalvik-dx = "11.0.0_r3"
 junit = "4.13.2"
-androidx-test-ext-junit = "1.1.5"
-espresso-core = "3.5.1"
 multidex = "2.0.1"
+#noinspection GradleDependency
 annotation = "1.2.0"
-org-apache-commons-commons-text = "1.10.0"
+#noinspection GradleDependency
 preference = "1.1.0"
+#noinspection GradleDependency
 material = "1.5.0"
-xmlunit-xmlunit = "1.6"
-appcompat = "1.6.1"
 
 [libraries]
-androidx-annotation-1_6_0 = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
 androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
-antlr4-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr4-runtime" }
-com-android-tools-smali-smali = { module = "com.android.tools.smali:smali", version.ref = "com-android-tools-smali-smali" }
-com-android-tools-smali-smali-util = { module = "com.android.tools.smali:smali-util", version.ref = "com-android-tools-smali-smali-util" }
-com-android-tools-smali-smali-baksmali = { module = "com.android.tools.smali:smali-baksmali", version.ref = "com-android-tools-smali-smali-baksmali" }
-com-google-guava-guava = { module = "com.google.guava:guava", version.ref = "com-google-guava-guava" }
-dialogx = { module = "com.kongzue.dialogx:DialogX", version.ref = "dialogx" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
-org-apache-commons-commons-text = { module = "org.apache.commons:commons-text", version.ref = "org-apache-commons-commons-text" }
-xmlunit-xmlunit = { module = "xmlunit:xmlunit", version.ref = "xmlunit-xmlunit" }
 tools-r8 = { module = "com.android.tools:r8", version.ref = "android-r8" }
-repackaged-dalvik-dx = { module = "com.jakewharton.android.repackaged:dalvik-dx", version.ref = "jakewharton-dalvik-dx" }
-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+tools-dx = { module = "com.jakewharton.android.repackaged:dalvik-dx", version.ref = "jakewharton-dalvik-dx" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
diff --git a/openapi/build.gradle b/openapi/build.gradle
index 8ca272b..2ace02c 100644
--- a/openapi/build.gradle
+++ b/openapi/build.gradle
@@ -28,7 +28,7 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     coreLibraryDesugaring libs.desugar.jdk.libs.nio
-    implementation project(':common')
-    api libs.antlr4.runtime
+    implementation libs.androidx.annotation
+    api project(':common')
     testImplementation libs.junit
 }
\ No newline at end of file
diff --git a/openapi/src/main/java/com/apkide/openapi/language/Analyzer.java b/openapi/src/main/java/com/apkide/openapi/language/Analyzer.java
deleted file mode 100644
index 302ed6d..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/Analyzer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.apkide.openapi.language;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-public interface Analyzer {
-
-    void analyzeErrors(@NonNull FileEntry file, @NonNull SyntaxTree ast);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/Compiler.java b/openapi/src/main/java/com/apkide/openapi/language/Compiler.java
deleted file mode 100644
index ec35d31..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/Compiler.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.apkide.openapi.language;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-public interface Compiler {
-    void compile(@NonNull FileEntry file, @NonNull SyntaxTree syntaxTree);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/Formatter.java b/openapi/src/main/java/com/apkide/openapi/language/Formatter.java
deleted file mode 100644
index 100787f..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/Formatter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.apkide.openapi.language;
-
-import androidx.annotation.NonNull;
-
-import java.io.Reader;
-import java.util.List;
-import java.util.Set;
-
-public interface Formatter {
-    @NonNull
-    List<? extends FormatterOption> getAllOptions();
-
-    @NonNull
-    Set<String> getDefaultOptions();
-
-    void setOptions(@NonNull Set<String> options);
-
-    @NonNull
-    Set<String> getOptions();
-
-    void outCommentLines(@NonNull FormatterCallback callback, int startLine, int endLine);
-
-    void unOutCommentLines(@NonNull FormatterCallback callback, int startLine, int endLine);
-
-    void expandSelection(@NonNull FormatterCallback callback, int startLine, int startColumn, int endLine, int endColumn);
-
-    void expandSelectionToStatements(@NonNull FormatterCallback callback, int startLine, int startColumn, int endLine, int endColumn);
-
-    void learnStyle(@NonNull FormatterCallback callback, @NonNull Set<String> options);
-
-    void autoIndentAfterPaste(@NonNull FormatterCallback callback, int startLine, int endLine);
-
-    void autoFormatLines(@NonNull FormatterCallback callback, int startLine, int endLine);
-
-    void autoIndentLines(@NonNull FormatterCallback callback, int startLine, int endLine);
-
-    void autoIndentLine(@NonNull FormatterCallback callback, int line);
-
-    void indentAfterLineBreak(@NonNull FormatterCallback callback, int line, int column);
-
-    void indentAfterCharEvent(@NonNull FormatterCallback callback, int line, int column, char c);
-
-    interface FormatterOption {
-
-        @NonNull
-        String getGroup();
-
-        @NonNull
-        String getName();
-
-        @NonNull
-        String getPreview(boolean preview);
-
-    }
-
-    interface FormatterCallback {
-
-        void setCaretPosition(int line, int column);
-
-        int getCaretLine();
-
-        int getCaretColumn();
-
-        void select(int startLine, int startColumn, int endLine, int endColumn);
-
-        @NonNull
-        Reader getReader();
-
-        char getChar(int line, int column);
-
-        int getLineCount();
-
-        int getLineLength(int line);
-
-        int getStyle(int line, int column);
-
-        void setIndentationSize(int indentationSize);
-
-        int getIndentationSize();
-
-        void setTabSize(int tabSize);
-
-        int getTabSize();
-
-        void setLineMaxColumn(int maxColumn);
-
-        int getLineMaxColumn();
-
-        int getIndentation(int line);
-
-        void indentationLine(int line, int indentationSize);
-
-        void insertLineBreak(int line, int column);
-
-        void removeLineBreak(int line);
-
-        void removeLineBreak(int startLine, int startColumn, int endLine, int endColumn);
-
-        void insertSpace(int line, int column);
-
-        void removeSpace(int startLine, int startColumn, int endLine, int endColumn);
-
-        void insertChar(int line, int column, char c);
-
-        void insertChars(int line, int column, char[] chars);
-
-        void removeChars(int startLine, int startColumn, int endLine, int endColumn);
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/Language.java b/openapi/src/main/java/com/apkide/openapi/language/Language.java
deleted file mode 100644
index fcc2e24..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/Language.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.apkide.openapi.language;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.apkide.openapi.language.api.FileEntry;
-import com.apkide.openapi.language.api.Highlights;
-
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-import java.io.IOException;
-import java.io.Reader;
-
-public interface Language {
-
-    @NonNull
-    String getName();
-
-    @NonNull
-    String[] getDefaultFilePatterns();
-
-    @Nullable
-    Formatter getFormatter();
-
-    @Nullable
-    Lexer getLexer();
-
-    @Nullable
-    Parser getParser();
-
-    @Nullable
-    Analyzer getAnalyzer();
-
-    @Nullable
-    Tools getTools();
-
-    boolean isArchiveFileSupported();
-
-    @Nullable
-    String[] getArchiveEntries(@NonNull String filePath) throws IOException;
-
-    @Nullable
-    Reader getArchiveEntryReader(@NonNull String filePath, @NonNull String entryPath, @NonNull String encoding) throws IOException;
-
-    long getArchiveVersion(@NonNull String filePath);
-
-    void closeArchiveFile();
-
-    void processVersion(@NonNull FileEntry file);
-
-    void fileHighlighting(@NonNull FileEntry file, @NonNull Reader reader, @NonNull ResultCallback<Highlights> callback) throws IOException;
-
-    void semanticHighlighting(@NonNull FileEntry file,@NonNull Language language,@Nullable SyntaxTree ast)throws IOException;
-
-    void createSyntaxTree(@NonNull Reader reader, @NonNull FileEntry file, long syntaxVersion, @NonNull ResultCallback<SyntaxTree> callback, boolean errors, boolean parseCode, boolean parseComments) throws IOException;
-
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/ResultCallback.java b/openapi/src/main/java/com/apkide/openapi/language/ResultCallback.java
deleted file mode 100644
index 24d0d35..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/ResultCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.apkide.openapi.language;
-
-public interface ResultCallback<T> {
-    void resultFound(T result);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/Tools.java b/openapi/src/main/java/com/apkide/openapi/language/Tools.java
deleted file mode 100644
index 6eb1b36..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/Tools.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.apkide.openapi.language;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-public interface Tools {
-
-    void requestCompletionList(@NonNull FileEntry file, int line, int column);
-
-    void requestClassesCompletionList(@NonNull FileEntry file);
-
-    void requestSuperMethodsCompletionList(@NonNull FileEntry file, int line, int column);
-
-    void documentation(@NonNull FileEntry file);
-
-    void documentation(@NonNull FileEntry file, int line, int column);
-
-    void safeDelete(@NonNull FileEntry file, @NonNull SyntaxTree element);
-
-    void surroundWithTryCatch(FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void addThrows(@NonNull FileEntry file, int line, int column);
-
-    void createVariable(@NonNull FileEntry file, int line, int column, int identifier, @NonNull ParseTree type);
-
-    void createField(@NonNull FileEntry file, int line, int column, int modifiers, int identifier, @NonNull ParseTree type);
-
-    void createMethod(@NonNull FileEntry file, int line, int column, int modifiers, int identifier, @NonNull ParseTree type, int[] argModifiers, @NonNull ParseTree[] argTypes, int[] argNames);
-
-    void inlineVariable(@NonNull FileEntry file, int line, int column);
-
-    void createSettersAndGetters(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void createConstructor(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void extractMethod(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void implementMembers(@NonNull FileEntry file, int line, int column);
-
-    void overrideMember(@NonNull FileEntry file, int line, int column, @NonNull ParseTree member);
-
-    void introduceVariable(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/Assembly.java b/openapi/src/main/java/com/apkide/openapi/language/api/Assembly.java
deleted file mode 100644
index a835032..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/Assembly.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import java.util.List;
-
-public class Assembly {
-
-    public String assembly;
-    public String projectFilePath;
-    public String rootNamespace;
-    public String configuration;
-    public List<String> defaultImports;
-    public List<String> definedSymbols;
-    public List<String> tagLibPaths;
-    public String destinationPath;
-    public String targetVersion;
-    public boolean isExternal;
-    public boolean isDebug;
-    public boolean isRelease;
-
-    public Assembly(String assembly, String projectFilePath, String rootNamespace, String configuration, List<String> defaultImports, List<String> definedSymbols, List<String> tagLibPaths, String destinationPath, String targetVersion, boolean isExternal, boolean isDebug, boolean isRelease) {
-        this.assembly = assembly;
-        this.projectFilePath = projectFilePath;
-        this.rootNamespace = rootNamespace;
-        this.configuration = configuration;
-        this.defaultImports = defaultImports;
-        this.definedSymbols = definedSymbols;
-        this.tagLibPaths = tagLibPaths;
-        this.destinationPath = destinationPath;
-        this.targetVersion = targetVersion;
-        this.isExternal = isExternal;
-        this.isDebug = isDebug;
-        this.isRelease = isRelease;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/ErrorKind.java b/openapi/src/main/java/com/apkide/openapi/language/api/ErrorKind.java
deleted file mode 100644
index 50a2ced..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/ErrorKind.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apkide.openapi.language.api;
-
-public interface ErrorKind {
-   int PARSER_ERROR = 0;
-   int SYNTAX_ERROR = 1;
-   int RULE_ERROR = 2;
-   int FLOW_ERROR = 3;
-   int SEMANTIC_ERROR = 4;
-   int SEMANTIC_WARNING = 5;
-   int UNCHECKED_WARNING = 6;
-   int FALLTHROUGH_WARNING = 8;
-   int UNUSEDVARIABLE_WARNING = 9;
-   int UNUSEDPARAMETER_WARNING = 10;
-   int UNUSEDLOCALCODE_WARNING = 11;
-   int REDUNDANTCAST_WARNING = 12;
-   int EMPTYSTATEMENT_WARNING = 13;
-   int IDENTICALIFELSE_WARNING = 14;
-   int STATICACCESS_WARNING = 15;
-   int REDUNDANTASSIGNMENT_WARNING = 16;
-   int REDUNDANTTHROWS_WARNING = 23;
-   int UPCAST_WARNING = 24;
-   int DEPRECATED_WARNING = 25;
-   int JAVA15_WARNING = 26;
-   int TODO = 17;
-   int UNREACHEDCLASS_INSPECTION = 18;
-   int UNREACHEDCODE_INSPECTION = 19;
-   int CANBEPRIVATECLASS_INSPECTION = 20;
-   int CANBEPRIVATECODE_INSPECTION = 21;
-   int RETURN_INSPECTION = 22;
-   int OVERRIDDEN_METHOD = 30;
-   int OVERRIDING_METHOD = 31;
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/ErrorTable.java b/openapi/src/main/java/com/apkide/openapi/language/api/ErrorTable.java
deleted file mode 100644
index 3c49762..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/ErrorTable.java
+++ /dev/null
@@ -1,711 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import com.apkide.common.collections.HashtableOfInt;
-import com.apkide.common.collections.SetOfInt;
-import com.apkide.openapi.language.Language;
-import com.apkide.openapi.language.Tools;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import java.util.Vector;
-
-
-public class ErrorTable {
-    private final Model model;
-    private final FileSpace filespace;
-    private HashtableOfInt<FileContent> filecontents;
-    private SetOfInt semanticerrors;
-    private SetOfInt compileerrors;
-    private Error lastError;
-
-    protected ErrorTable(Model model) {
-        this.model = model;
-        this.filespace = model.getFileSpace();
-        this.semanticerrors = new SetOfInt();
-        this.compileerrors = new SetOfInt();
-        this.filecontents = new HashtableOfInt<>();
-    }
-    public void addInspection(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String msg, int kind) {
-        Error error = new Error(startLine, startColumn, endLine, endColumn, "Warning: " + msg, kind);
-        if (!this.filecontents.contains(file.getID())) {
-            this.filecontents.put(file.getID(), new FileContent());
-        }
-
-        this.filecontents.get(file.getID()).inspections.addElement(error);
-        this.lastError = error;
-    }
-
-    public void addWarning(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String msg, int kind) {
-        if (startLine > 0) {
-            Error error = new Error(startLine, startColumn, endLine, endColumn, msg, kind);
-            if (!this.filecontents.contains(file.getID())) {
-                this.filecontents.put(file.getID(), new FileContent());
-            }
-
-            this.filecontents.get(file.getID()).analysiserrors.addElement(error);
-            this.lastError = error;
-        } else {
-            this.lastError = null;
-        }
-    }
-
-    public void addSemanticWarning(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String msg, int kind) {
-        if (startLine > 0) {
-            Error error = new Error(startLine, startColumn, endLine, endColumn, msg, kind);
-            if (!this.filecontents.contains(file.getID())) {
-                this.filecontents.put(file.getID(), new FileContent());
-            }
-
-            this.filecontents.get(file.getID()).analysiserrors.addElement(error);
-            this.semanticerrors.put(file.getID());
-            this.lastError = error;
-        } else {
-            this.lastError = null;
-        }
-    }
-
-    public void addSemanticError(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String msg, int kind) {
-        if (startLine > 0) {
-            Error error = new Error(startLine, startColumn, endLine, endColumn, msg, kind);
-            if (!this.filecontents.contains(file.getID())) {
-                this.filecontents.put(file.getID(), new FileContent());
-            }
-
-            this.filecontents.get(file.getID()).analysiserrors.addElement(error);
-            this.semanticerrors.put(file.getID());
-            this.compileerrors.put(file.getID());
-            this.lastError = error;
-        } else {
-            this.lastError = null;
-        }
-    }
-
-    public void addError(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String msg, int kind) {
-        if (startLine > 0) {
-            Error error = new Error(startLine, startColumn, endLine, endColumn, msg, kind);
-            if (!this.filecontents.contains(file.getID())) {
-                this.filecontents.put(file.getID(), new FileContent());
-            }
-
-            this.filecontents.get(file.getID()).analysiserrors.addElement(error);
-            this.compileerrors.put(file.getID());
-            this.lastError = error;
-        } else {
-            this.lastError = null;
-        }
-    }
-
-    public void addParseError(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String msg, int kind) {
-        if (startLine > 0) {
-            Error error = new Error(startLine, startColumn, endLine, endColumn, msg, kind);
-            if (!this.filecontents.contains(file.getID())) {
-                this.filecontents.put(file.getID(), new FileContent());
-            }
-
-            this.filecontents.get(file.getID()).parseerrors.addElement(error);
-            this.compileerrors.put(file.getID());
-            this.lastError = error;
-        } else {
-            this.lastError = null;
-        }
-    }
-
-    public void addFixClass(FileEntry file, FileEntry dir, int identifier, String msg) {
-    }
-
-    public void addFixGenerify(FileEntry file, String p1) {
-    }
-
-    public void addFixSafeDelete(ParseTree entity, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(6, entity, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixMethod(
-            FileEntry file, int line, int column, int modifiers, int identifier, ParseTree type, int[] argmodifiers, ParseTree[] argtypes, int[] argnames, String msg
-    ) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(5, file, line, column, modifiers, identifier, type, argmodifiers, argtypes, argnames, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixField(FileEntry file, int line, int column, int modifiers, int identifier, ParseTree type, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(4, file, line, column, modifiers, identifier, type, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixVariable(FileEntry file, int line, int column, int identifier, ParseTree type, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(3, line, column, identifier, type, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixParameter(FileEntry file, int line, int column, int identifier, ParseTree type, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(10, line, column, identifier, type, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixSurround(FileEntry file, int line, int column, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(8, line, column, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixAddThrows(FileEntry file, int line, int column, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(9, line, column, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixImplement(FileEntry file, int line, int column, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(1, line, column, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixImport(FileEntry file, ParseTree classtype, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(2, classtype, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixReplace(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String replacement, String msg) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(0, startLine, startColumn, endLine, endColumn, replacement, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public void addFixRemoveTwice(
-            FileEntry file,
-            int startLine1,
-            int startColumn1,
-            int endLine1,
-            int endColumn1,
-            int startLine2,
-            int startColumn2,
-            int endLine2,
-            int endColumn2,
-            String msg
-    ) {
-        if (this.lastError != null) {
-            Fix fix = new Fix(7, startLine1, startColumn1, endLine1, endColumn1, startLine2, startColumn2, endLine2, endColumn2, msg);
-            if (this.lastError.fixes == null) {
-                this.lastError.fixes = new Vector<>(3);
-            }
-
-            this.lastError.fixes.addElement(fix);
-        }
-    }
-
-    public SetOfFileEntry getFilesWithErrors() {
-        SetOfFileEntry files = new SetOfFileEntry(this.filespace);
-        this.filecontents.DEFAULT_ITERATOR.init();
-
-        while (this.filecontents.DEFAULT_ITERATOR.hasMoreElements()) {
-            files.put(this.filespace.getFileEntry(this.filecontents.DEFAULT_ITERATOR.nextKey()));
-        }
-
-        return files;
-    }
-
-    public void clearInspections(FileEntry file) {
-        if (this.filecontents.contains(file.getID())) {
-            this.filecontents.get(file.getID()).inspections = new Vector<>();
-        }
-    }
-
-    public void clearNonParserErrors(FileEntry file) {
-        if (this.filecontents.contains(file.getID())) {
-            this.filecontents.get(file.getID()).analysiserrors = new Vector<>();
-        }
-
-        this.semanticerrors.remove(file.getID());
-        this.compileerrors.remove(file.getID());
-    }
-
-    public void clearParseErrors(FileEntry file) {
-        if (this.filecontents.contains(file.getID())) {
-            this.filecontents.get(file.getID()).parseerrors = new Vector<>();
-        }
-    }
-
-    public boolean containsInspections(FileEntry file) {
-        return this.filecontents.contains(file.getID()) && this.filecontents.get(file.getID()).inspections.size() > 0;
-    }
-
-    public boolean containsCompileErrors(FileEntry file) {
-        return this.compileerrors.contains(file.getID());
-    }
-
-    public boolean containsErrorsOrWarnings(FileEntry file) {
-        return this.filecontents.contains(file.getID());
-    }
-
-    public boolean containsSemanticErrors(FileEntry file) {
-        return this.semanticerrors.contains(file.getID());
-    }
-
-    public int getInspectionCount(FileEntry file) {
-        return !this.filecontents.contains(file.getID()) ? 0 : this.filecontents.get(file.getID()).inspections.size();
-    }
-
-    public int getInspectionStartLine(FileEntry file, int n) {
-        return this.filecontents.get(file.getID()).inspections.elementAt(n).startLine;
-    }
-
-    public int getInspectionStartColumn(FileEntry file, int n) {
-        return this.filecontents.get(file.getID()).inspections.elementAt(n).startColumn;
-    }
-
-    public int getInspectionEndLine(FileEntry file, int n) {
-        return this.filecontents.get(file.getID()).inspections.elementAt(n).endLine;
-    }
-
-    public int getInspectionEndColumn(FileEntry file, int n) {
-        return this.filecontents.get(file.getID()).inspections.elementAt(n).endColumn;
-    }
-
-    public String getInspectionText(FileEntry file, int n) {
-        return this.filecontents.get(file.getID()).inspections.elementAt(n).msg;
-    }
-
-    public int getInspectionKind(FileEntry file, int n) {
-        return this.filecontents.get(file.getID()).inspections.elementAt(n).kind;
-    }
-
-    public int getInspectionFixesCount(FileEntry file, int n) {
-        Vector<Fix> fixes = this.filecontents.get(file.getID()).inspections.elementAt(n).fixes;
-        return fixes == null ? 0 : fixes.size();
-    }
-
-    public String getInspectionFixText(FileEntry file, int n, int i) {
-        Fix fix = this.filecontents.get(file.getID()).inspections.elementAt(n).fixes.elementAt(i);
-        return fix.msg;
-    }
-
-    public int getErrorCount(FileEntry file) {
-        if (!this.filecontents.contains(file.getID())) {
-            return 0;
-        } else {
-            Vector<Error> analysiserrors = this.filecontents.get(file.getID()).analysiserrors;
-            Vector<Error> parseerrors = this.filecontents.get(file.getID()).parseerrors;
-            return analysiserrors.size() + parseerrors.size();
-        }
-    }
-
-    public int getErrorStartLine(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        return n >= pn
-                ? this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn).startLine
-                : this.filecontents.get(file.getID()).parseerrors.elementAt(n).startLine;
-    }
-
-    public int getErrorStartColumn(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        return n >= pn
-                ? this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn).startColumn
-                : this.filecontents.get(file.getID()).parseerrors.elementAt(n).startColumn;
-    }
-
-    public int getErrorEndLine(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        return n >= pn
-                ? this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn).endLine
-                : this.filecontents.get(file.getID()).parseerrors.elementAt(n).endLine;
-    }
-
-    public int getErrorEndColumn(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        return n >= pn
-                ? this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn).endColumn
-                : this.filecontents.get(file.getID()).parseerrors.elementAt(n).endColumn;
-    }
-
-    public String getErrorText(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        return n >= pn
-                ? this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn).msg
-                : this.filecontents.get(file.getID()).parseerrors.elementAt(n).msg;
-    }
-
-    public int getErrorKind(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        return n >= pn
-                ? this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn).kind
-                : this.filecontents.get(file.getID()).parseerrors.elementAt(n).kind;
-    }
-
-    public int getErrorFixesCount(FileEntry file, int n) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        Error error;
-        if (n >= pn) {
-            error = this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn);
-        } else {
-            error = this.filecontents.get(file.getID()).parseerrors.elementAt(n);
-        }
-
-        return error.fixes == null ? 0 : error.fixes.size();
-    }
-
-    public String getErrorFixText(FileEntry file, int n, int i) {
-        int pn = this.filecontents.get(file.getID()).parseerrors.size();
-        Error error;
-        if (n >= pn) {
-            error = this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn);
-        } else {
-            error = this.filecontents.get(file.getID()).parseerrors.elementAt(n);
-        }
-
-        Fix fix = error.fixes.elementAt(i);
-        return fix.msg;
-    }
-
-    public void applyFix(FileEntry file, Language language, boolean inspection, int n, int i) {
-        Tools tools = language.getTools();
-        if (tools != null) {
-            Fix fix;
-            if (inspection) {
-                Vector<Fix> fixes = this.filecontents.get(file.getID()).inspections.elementAt(n).fixes;
-                fix = fixes.elementAt(i);
-            } else {
-                int pn = this.filecontents.get(file.getID()).parseerrors.size();
-                Error error;
-                if (n >= pn) {
-                    error = this.filecontents.get(file.getID()).analysiserrors.elementAt(n - pn);
-                } else {
-                    error = this.filecontents.get(file.getID()).parseerrors.elementAt(n);
-                }
-
-                fix = error.fixes.elementAt(i);
-            }
-
-            switch (fix.kind) {
-                case 0:
-                    this.fixReplaceText(file, fix.startLine, fix.startColumn, fix.endLine, fix.endColumn, fix.replacement);
-                    break;
-                case 1:
-                    tools.implementMembers(file, fix.startLine, fix.startColumn);
-                    break;
-                case 2:
-                    this.addImport(file,  fix.entity);
-                    break;
-                case 3:
-                    tools.createVariable(file, fix.startLine, fix.startColumn, fix.identifier,  fix.entity);
-                    break;
-                case 4:
-                    tools.createField(fix.file, fix.startLine, fix.startColumn, fix.modifiers, fix.identifier, fix.entity);
-                    break;
-                case 5:
-                    tools.createMethod(
-                            fix.file, fix.startLine, fix.startColumn, fix.modifiers, fix.identifier,  fix.entity, fix.argmodifiers, fix.argtypes, fix.argnames
-                    );
-                    break;
-                case 6:
-                    tools.safeDelete(file,fix.entity);
-                    break;
-                case 7:
-                    this.fixRemoveTextTwice(
-                            file, fix.startLine, fix.startColumn, fix.endLine, fix.endColumn, fix.startLine2, fix.startColumn2, fix.endLine2, fix.endColumn2
-                    );
-                    break;
-                case 8:
-                    tools.surroundWithTryCatch(file, fix.startLine, fix.startColumn, fix.startLine, fix.startColumn);
-                    break;
-                case 9:
-                    tools.addThrows(file, fix.startLine, fix.startColumn);
-                    break;
-                case 10:
-                    this.addParameter(file, fix.startLine, fix.startColumn, fix.identifier, fix.entity);
-            }
-        }
-    }
-
-    protected void addImport(FileEntry file, ParseTree entity) {
-    }
-
-    protected void addParameter(FileEntry file, int startLine, int startColumn, int identifier, ParseTree entity) {
-    }
-
-    private void fixRemoveTextTwice(
-            FileEntry file,
-            int startLine,
-            int startColumn,
-            int endLine,
-            int endColumn,
-            int startLine2,
-            int startColumn2,
-            int endLine2,
-            int endColumn2
-    ) {
-        this.model.getRefactoringCallback().analysisStarted(file);
-        this.model.getRefactoringCallback().replaceText(file, startLine, startColumn, endLine, endColumn, "");
-        this.model.getRefactoringCallback().replaceText(file, startLine2, startColumn2, endLine2, endColumn2, "");
-        this.model.getRefactoringCallback().fixAnalysisFinished(file);
-    }
-
-    private void fixReplaceText(FileEntry file, int startLine, int startColumn, int endLine, int endColumn, String replacement) {
-        this.model.getRefactoringCallback().analysisStarted(file);
-        int lineCount = this.getLineCount(replacement);
-        if (lineCount > 0) {
-            this.model.getRefactoringCallback().replaceText(file, startLine, startColumn, endLine, endColumn, replacement);
-            this.model.getRefactoringCallback().indentLines(file, startLine, startLine + lineCount);
-        } else {
-            this.model.getRefactoringCallback().replaceText(file, startLine, startColumn, endLine, endColumn, replacement);
-        }
-
-        this.model.getRefactoringCallback().fixAnalysisFinished(file);
-    }
-
-    private int getLineCount(String doc) {
-        int count = 0;
-
-        for (int i = 0; i < doc.length(); ++i) {
-            if (doc.charAt(i) == '\r') {
-                if (i + 1 < doc.length() && doc.charAt(i + 1) == '\n')
-                    i++;
-                count++;
-            } else if (doc.charAt(i) == '\n') {
-                ++count;
-            }
-        }
-
-        return count;
-    }
-
-    private class Error {
-        public final int kind;
-        public final int startLine;
-        public final int startColumn;
-        public final int endLine;
-        public final int endColumn;
-        public final String msg;
-        public Vector<Fix> fixes;
-
-        public Error(int startLine,
-                     int startColumn,
-                     int endLine,
-                     int endColumn,
-                     String msg,
-                     int kind) {
-            this.kind = kind;
-            this.startLine = startLine;
-            this.startColumn = startColumn;
-            this.endLine = endLine;
-            this.endColumn = endColumn;
-            this.msg = msg;
-        }
-
-    }
-
-    private class FileContent {
-        public Vector<Error> inspections;
-        public Vector<Error> parseerrors;
-        public Vector<Error> analysiserrors;
-
-        public FileContent() {
-            this.inspections = new Vector<>();
-            this.parseerrors = new Vector<>();
-            this.analysiserrors = new Vector<>();
-        }
-    }
-
-    private class Fix {
-        public static final int REPLACE = 0;
-        public static final int IMPLEMENT = 1;
-        public static final int IMPORT = 2;
-        public static final int CREATEVARIABLE = 3;
-        public static final int CREATEPARAMETER = 10;
-        public static final int CREATEFIELD = 4;
-        public static final int CREATEMETHOD = 5;
-        public static final int SAFEDELETE = 6;
-        public static final int REMOVETWICE = 7;
-        public static final int SURROUND = 8;
-        public static final int ADDTHROWS = 9;
-        public int kind;
-        public String msg;
-        public ParseTree entity;
-        public FileEntry file;
-        public int identifier;
-        public int modifiers;
-        public int[] argmodifiers;
-        public ParseTree[] argtypes;
-        public int[] argnames;
-        public int startLine;
-        public int startColumn;
-        public int endLine;
-        public int endColumn;
-        public int startLine2;
-        public int startColumn2;
-        public int endLine2;
-        public int endColumn2;
-        public String replacement = "";
-
-        public Fix(
-                int kind,
-                FileEntry file,
-                int line,
-                int column,
-                int modifiers,
-                int identifier,
-                ParseTree type,
-                int[] argmodifiers,
-                ParseTree[] argtypes,
-                int[] argnames,
-                String msg
-        ) {
-            this.kind = kind;
-            this.msg = msg;
-            this.file = file;
-            this.startLine = line;
-            this.startColumn = column;
-            this.entity = type;
-            this.identifier = identifier;
-            this.modifiers = modifiers;
-            this.argtypes = argtypes;
-            this.argnames = argnames;
-            this.argmodifiers = argmodifiers;
-        }
-
-        public Fix(int kind, String msg) {
-            this.kind = kind;
-            this.msg = msg;
-        }
-
-        public Fix(int kind, ParseTree entity, String msg) {
-            this.kind = kind;
-            this.msg = msg;
-            this.entity = entity;
-        }
-
-        public Fix(int kind, int line, int column, String msg) {
-            this.kind = kind;
-            this.msg = msg;
-            this.startLine = line;
-            this.startColumn = column;
-        }
-
-        public Fix(int kind,
-                   int line,
-                   int column,
-                   int identifier,
-                   ParseTree type,
-                   String msg) {
-            this.kind = kind;
-            this.msg = msg;
-            this.startLine = line;
-            this.startColumn = column;
-            this.entity = type;
-            this.identifier = identifier;
-        }
-
-        public Fix(int kind,
-                   FileEntry file,
-                   int line,
-                   int column,
-                   int modifiers,
-                   int identifier,
-                   ParseTree type,
-                   String msg) {
-            this.kind = kind;
-            this.msg = msg;
-            this.file = file;
-            this.startLine = line;
-            this.startColumn = column;
-            this.entity = type;
-            this.identifier = identifier;
-            this.modifiers = modifiers;
-        }
-
-        public Fix(int kind,
-                   int startLine,
-                   int startColumn,
-                   int endLine,
-                   int endColumn,
-                   String replacement, String msg) {
-            this.kind = kind;
-            this.msg = msg;
-            this.startLine = startLine;
-            this.startColumn = startColumn;
-            this.endLine = endLine;
-            this.endColumn = endColumn;
-            this.replacement = replacement;
-        }
-
-        public Fix(
-                int kind,
-                int startLine1,
-                int startColumn1,
-                int endLine1,
-                int endColumn1,
-                int startLine2,
-                int startColumn2,
-                int endLine2,
-                int endColumn2,
-                String msg
-        ) {
-            this.kind = kind;
-            this.msg = msg;
-            this.startLine = startLine1;
-            this.startColumn = startColumn1;
-            this.endLine = endLine1;
-            this.endColumn = endColumn1;
-            this.startLine2 = startLine2;
-            this.startColumn2 = startColumn2;
-            this.endLine2 = endLine2;
-            this.endColumn2 = endColumn2;
-        }
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/FileEntry.java b/openapi/src/main/java/com/apkide/openapi/language/api/FileEntry.java
deleted file mode 100644
index d54d56b..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/FileEntry.java
+++ /dev/null
@@ -1,557 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import static java.io.File.separator;
-import static java.io.File.separatorChar;
-import static java.lang.System.getProperty;
-import static java.lang.System.out;
-import static java.util.Objects.requireNonNull;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-import com.apkide.common.collections.ListOfInt;
-import com.apkide.common.collections.MapOfIntInt;
-import com.apkide.openapi.language.Language;
-import com.apkide.openapi.language.api.callback.OpenFileCallback;
-
-import java.io.CharArrayReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.List;
-
-
-public class FileEntry {
-    private final FileSpace myFileSpace;
-    private final IdentifierSpace myIdentifiers;
-    private final OpenFileCallback myOpenFileCallback;
-    private int myNameIdentifier;
-    private FileEntry myParentDir;
-    private int myID;
-    private MapOfIntInt myEntries;
-    private ListOfInt myChildren;
-    private FileEntry myParentArchiveFile;
-    private String myRelativeArchiveEntryPath;
-    private boolean myIsArchiveEntry;
-    private boolean myIsArchive;
-    private boolean myIsDirectory;
-    private long myVersion;
-    private boolean myLoaded;
-    private boolean myExists;
-    private long myDiskVersion;
-    private long myLastModified;
-
-    public FileEntry(IdentifierSpace identifiers, FileSpace fileSpace, OpenFileCallback openFileCallback, int nameIdentifier, FileEntry parentDir) {
-        myIdentifiers = identifiers;
-        myFileSpace = fileSpace;
-        myOpenFileCallback = openFileCallback;
-        myNameIdentifier = nameIdentifier;
-        myParentDir = parentDir;
-        myID = fileSpace.declareEntry(this);
-        myVersion = -1L;
-        init();
-    }
-
-    public FileEntry(IdentifierSpace identifiers, FileSpace fileSpace, OpenFileCallback openFileCallback) {
-        myIdentifiers = identifiers;
-        myFileSpace = fileSpace;
-        myOpenFileCallback = openFileCallback;
-        myVersion = -1L;
-        init();
-    }
-
-    protected void load(StoreInputStream stream) throws IOException {
-        myID = stream.readInt();
-        myNameIdentifier = stream.readInt();
-        myParentDir = myFileSpace.getFileEntry(stream.readInt());
-        if (stream.readBoolean())
-            myEntries = new MapOfIntInt(stream);
-
-        myVersion = stream.readLong();
-        myIsArchiveEntry = stream.readBoolean();
-        myDiskVersion = stream.readLong();
-        myLastModified = stream.readLong();
-    }
-
-    protected void store(StoreOutputStream stream) throws IOException {
-        stream.writeInt(myID);
-        stream.writeInt(myNameIdentifier);
-        stream.writeInt(myFileSpace.getID(myParentDir));
-        stream.writeBoolean(myEntries != null);
-        if (myEntries != null)
-            myEntries.store(stream);
-
-        stream.writeLong(myVersion);
-        stream.writeBoolean(myIsArchiveEntry);
-        stream.writeLong(myDiskVersion);
-        stream.writeLong(myLastModified);
-    }
-
-    public boolean canAnalyzer() {
-        return getLanguage() != null && getLanguage().getAnalyzer() != null;
-    }
-
-    public boolean isCheckedSolutionFile() {
-        return myFileSpace.isCheckedSolutionFile(this);
-    }
-
-    public boolean isSolutionFile() {
-        return myFileSpace.isSolutionFile(this);
-    }
-
-    public String getExtension() {
-        String filename = getFullName();
-        return filename.lastIndexOf('.') > 0 ? filename.substring(filename.lastIndexOf('.')) : "";
-    }
-
-    public String getFullName() {
-        return myIdentifiers.getString(myNameIdentifier);
-    }
-
-    public int getNameIdentifier() {
-        String filename = getFullName();
-        if (!isDirectory() && filename.lastIndexOf('.') > 0)
-            filename = filename.substring(0, filename.lastIndexOf('.'));
-        return myIdentifiers.get(filename);
-    }
-
-    public int getFullNameIdentifier() {
-        return myNameIdentifier;
-    }
-
-    public int getAssembly() {
-        return myFileSpace.getAssembly(this);
-    }
-
-    public boolean isReferable(FileEntry file) {
-        return myFileSpace.isReferableFrom(this, file);
-    }
-
-    public String getRootNamespace() {
-        return myFileSpace.getRootNamespace(this);
-    }
-
-    public List<String> getDefaultImports() {
-        return myFileSpace.getDefaultImports(this);
-    }
-
-    public List<String> getDefinedSymbols() {
-        return myFileSpace.getDefinedSymbols(this);
-    }
-
-    public FileEntry getParentDirectory() {
-        return myParentDir;
-    }
-
-    public long getSize() {
-        load();
-        if (isOpen()) {
-            return myOpenFileCallback.getOpenFileSize(this);
-        } else {
-            String path = getPathString();
-            return new File(path).exists() ? new File(path).length() : 0L;
-        }
-    }
-
-    public FileEntry getParentArchive() {
-        return myParentArchiveFile;
-    }
-
-    public String getRelativeArchivePath() {
-        return myRelativeArchiveEntryPath;
-    }
-
-    public boolean isArchive() {
-        return myIsArchive;
-    }
-
-    public boolean isArchiveEntry() {
-        return myIsArchiveEntry;
-    }
-
-    public long getArchiveVersion() {
-        return !isArchiveEntry() ? 0L : getParentArchive().getSyntaxVersion();
-    }
-
-    public boolean isEnclosingDir(FileEntry child) {
-        while (!child.isRootDirectory()) {
-            if (child == this) {
-                return true;
-            }
-
-            child = child.getParentDirectory();
-        }
-
-        return false;
-    }
-
-    public long getSyntaxVersion() {
-        return myFileSpace.getSyntaxVersion(this);
-    }
-
-    public long getDiskVersion() {
-        load();
-        return isOpen() ? fetchDiskVersion() : getVersion();
-    }
-
-    public long getVersion() {
-        load();
-        if (!myIsArchiveEntry && isOpen()) {
-            myVersion = -1L;
-            return myOpenFileCallback.getOpenFileVersion(this);
-        } else {
-            if (myVersion == -1L) {
-                myVersion = fetchDiskVersion();
-            }
-
-            return myVersion;
-        }
-    }
-
-    public Reader getReaderForInclude() {
-        myFileSpace.fileIncluded(this);
-        return getReader();
-    }
-
-    public boolean isOpen() {
-        return myOpenFileCallback != null && myOpenFileCallback.isOpenFile(this);
-    }
-
-    public boolean isDirectory() {
-        load();
-        return myIsDirectory;
-    }
-
-    public boolean isRootDirectory() {
-        return myParentDir == null;
-    }
-
-    public Reader getReader() {
-        load();
-        if (isOpen()) {
-            return myOpenFileCallback.getOpenFileReader(this);
-        } else if (!exists()) {
-            return new CharArrayReader(new char[0]);
-        } else {
-            if (!isSynchronized())
-                out.println("File not synchronized " + getPathString());
-
-            try {
-                String encoding = myFileSpace.getEncoding();
-                if (myIsArchiveEntry) {
-                    String filePath = myParentArchiveFile.getPathString();
-                    return myFileSpace
-                            .createLineEndingNormalizedReader(getLanguage().
-                                    getArchiveEntryReader(filePath, getRelativeArchivePath(), encoding)
-                            );
-                } else {
-                    return myFileSpace.createLineEndingNormalizedReader(myFileSpace.createBomReader(new FileInputStream(getPathString()), encoding));
-                }
-            } catch (IOException e) {
-                return new CharArrayReader(new char[0]);
-            }
-        }
-    }
-
-    public String getPathString() {
-        if (myParentDir == null && !requireNonNull(getProperty("os.name")).toUpperCase().contains("WINDOWS")) {
-            return separator;
-        } else {
-            String path = "";
-            if (myParentDir != null)
-                path = myParentDir.getPathString();
-
-            if (path.length() > 1)
-                path = path + separator;
-
-            return path + getFullName();
-        }
-    }
-
-    public int getChildCount() {
-        load();
-        return myChildren == null ? 0 : myChildren.size();
-    }
-
-    public FileEntry getChildEntry(int number) {
-        return myFileSpace.getFileEntry(myChildren.get(number));
-    }
-
-    public FileEntry getEntry(String name) {
-        if (myEntries == null) {
-            myEntries = new MapOfIntInt();
-        }
-
-        int nameidentifier = myIdentifiers.get(name);
-        if (!myEntries.contains(nameidentifier)) {
-            FileEntry entry = new FileEntry(myIdentifiers, myFileSpace, myOpenFileCallback, nameidentifier, this);
-            myEntries.insert(nameidentifier, entry.getID());
-        }
-
-        return myFileSpace.getFileEntry(myEntries.get(nameidentifier));
-    }
-
-    public FileEntry getSuccessorFile() {
-        FileEntry dir = getParentDirectory();
-        int count = dir.getChildCount();
-
-        for (int i = 0; i < count - 1; ++i) {
-            if (dir.getChildEntry(i) == this) {
-                return dir.getChildEntry(i + 1);
-            }
-        }
-
-        return null;
-    }
-
-
-    public Language getLanguage() {
-        return myFileSpace.getLanguage(this);
-    }
-
-    public int getID() {
-        return myID;
-    }
-
-    public boolean isSynchronized() {
-        if (isOpen()) {
-            return true;
-        } else if (myVersion == -1L) {
-            return true;
-        } else if (myIsArchive) {
-            return myVersion == fetchDiskVersion();
-        } else if (!myIsDirectory && !myIsArchiveEntry) {
-            return myVersion == fetchFileDiskVersion();
-        } else {
-            return true;
-        }
-    }
-
-    public void synchronize() {
-        if (myParentDir != null) {
-            myParentDir.myLoaded = false;
-        }
-
-        if (myParentArchiveFile != null) {
-            myParentArchiveFile.myLoaded = false;
-
-            for (FileEntry dir = myParentDir; dir != null && dir != myParentArchiveFile; dir = dir.myParentDir) {
-                dir.myLoaded = false;
-            }
-        }
-
-        if (myChildren != null) {
-            myChildren.clear();
-        }
-
-        if (!myIsDirectory && !myIsArchiveEntry && myVersion != -1L) {
-            myVersion = fetchFileDiskVersion();
-        } else {
-            myVersion = -1L;
-        }
-
-        init();
-    }
-
-    public boolean exists() {
-        load();
-        return myExists;
-    }
-
-    @Override
-    public int hashCode() {
-        return myID;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof FileEntry)) {
-            return false;
-        } else {
-            return ((FileEntry) obj).getID() == myID;
-        }
-    }
-
-    private void init() {
-        myLoaded = false;
-        myParentArchiveFile = null;
-        myRelativeArchiveEntryPath = null;
-        myIsArchiveEntry = false;
-        myIsDirectory = false;
-        myIsArchive = false;
-        myExists = false;
-    }
-
-    private long fetchDiskVersion() {
-        if (!exists()) {
-            return 0L;
-        } else if (myIsArchive) {
-            return getLanguage().getArchiveVersion(getPathString());
-        } else if (myIsArchiveEntry) {
-            return myParentArchiveFile.getVersion();
-        } else {
-            return isRootDirectory() && requireNonNull(getProperty("os.name")).toUpperCase().contains("WINDOWS") ? 0L : fetchFileDiskVersion();
-        }
-    }
-
-    private long fetchFileDiskVersion() {
-        File f = new File(getPathString());
-        if (f.isFile()) {
-            long lastModified = f.lastModified();
-            if (myLastModified == -1 || myLastModified != lastModified) {
-                myLastModified = lastModified;
-                try {
-                    byte[] bytes = myFileSpace.bytes;
-                    myFileSpace.crc32.reset();
-                    FileInputStream fileInputStream = new FileInputStream(f);
-                    while (true) {
-                        int read = fileInputStream.read(bytes);
-                        if (read == -1)
-                            break;
-
-                        myFileSpace.crc32.update(bytes, 0, read);
-                    }
-                    fileInputStream.close();
-                    myDiskVersion = myFileSpace.crc32.getValue();
-                    if (myDiskVersion == 0) {
-                        myDiskVersion = 4294967296L;
-                    }
-                } catch (IOException ignored) {
-                }
-            }
-            return myDiskVersion;
-        } else {
-            return f.isDirectory() ? f.lastModified() : 0L;
-        }
-    }
-
-    private void sort(String[] names, int i, int j) {
-        if (i < j) {
-            int oldi = i;
-            int oldj = j;
-            int z = i + (j - i) / 2;
-            String pivot = names[z];
-
-            while (i <= j) {
-                while (names[i].compareTo(pivot) < 0) {
-                    ++i;
-                }
-
-                while (pivot.compareTo(names[j]) < 0) {
-                    --j;
-                }
-
-                if (i <= j) {
-                    String temp = names[j];
-                    names[j] = names[i];
-                    names[i] = temp;
-                    ++i;
-                    --j;
-                }
-            }
-
-            sort(names, oldi, j);
-            sort(names, i, oldj);
-        }
-    }
-
-    private void load() {
-        if (!myLoaded) {
-            if (myParentDir != null)
-                myParentDir.load();
-
-            if (myLoaded)
-                return;
-
-            myLoaded = true;
-            String path = getPathString();
-            if (isRootDirectory() && requireNonNull(getProperty("os.name")).toUpperCase().contains("WINDOWS")) {
-                for (char c = 'A'; c <= 'Z'; ++c) {
-                    String drivePath = c + ":";
-                    addDirectory(drivePath);
-                }
-
-                myExists = true;
-            } else if (getLanguage() != null && getLanguage().isArchiveFileSupported()) {
-                myIsArchive = true;
-
-                try {
-                    myVersion = getLanguage().getArchiveVersion(path);
-                    String[] entries = getLanguage().getArchiveEntries(path);
-                    if (entries != null) {
-                        myParentArchiveFile = this;
-                        myIsDirectory = true;
-
-                        for (String relativePath : entries) {
-                            if (relativePath != null)
-                                addCustomEntry(relativePath, relativePath);
-                        }
-                    }
-                } catch (IOException ignored) {
-                }
-
-                myExists = true;
-            } else if (new File(path).isDirectory()) {
-                String[] entries = new File(path + separatorChar).list();
-                if (entries != null) {
-                    for (String entry : entries) {
-                        String entryPath = path + separatorChar + entry;
-                        if (new File(entryPath).isDirectory())
-                            addDirectory(entry);
-                        else
-                            addFile(entry);
-                    }
-                }
-
-                myExists = true;
-            }
-        }
-    }
-
-    private void addCustomEntry(String relativePath, String entryPath) {
-        int p = relativePath.indexOf(47);
-        if (p == -1)
-            p = relativePath.indexOf(92);
-
-        if (p == -1) {
-            FileEntry file = addFile(relativePath);
-            file.myLoaded = true;
-            file.myIsArchiveEntry = true;
-            file.myRelativeArchiveEntryPath = entryPath;
-            file.myParentArchiveFile = myParentArchiveFile;
-        } else {
-            String dirname = relativePath.substring(0, p);
-            FileEntry dir = getEntry(dirname);
-            if (!dir.myExists)
-                addDirectory(dirname);
-
-            dir.myLoaded = true;
-            dir.myIsArchiveEntry = true;
-            dir.myParentArchiveFile = myParentArchiveFile;
-            dir.myRelativeArchiveEntryPath = entryPath;
-            dir.addCustomEntry(relativePath.substring(p + 1), entryPath);
-        }
-    }
-
-    private FileEntry addDirectory(String name) {
-        FileEntry entry = getEntry(name);
-        entry.myIsDirectory = true;
-        entry.myExists = true;
-        if (myChildren == null)
-            myChildren = new ListOfInt();
-
-        myChildren.add(entry.getID());
-        return entry;
-    }
-
-    private FileEntry addFile(String name) {
-        FileEntry entry = getEntry(name);
-        entry.myIsDirectory = false;
-        entry.myExists = true;
-        if (myChildren == null)
-            myChildren = new ListOfInt();
-
-        myChildren.add(entry.getID());
-        return entry;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/FileSpace.java b/openapi/src/main/java/com/apkide/openapi/language/api/FileSpace.java
deleted file mode 100644
index 739dd6b..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/FileSpace.java
+++ /dev/null
@@ -1,637 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import static java.io.File.separator;
-import static java.io.File.separatorChar;
-import static java.util.Objects.requireNonNull;
-
-import com.apkide.common.FileNameMatcher;
-import com.apkide.common.collections.FunctionOfIntInt;
-import com.apkide.common.collections.FunctionOfIntLong;
-import com.apkide.common.collections.MapOfIntLong;
-import com.apkide.common.collections.OrderedMapOfIntInt;
-import com.apkide.common.collections.SetOfInt;
-import com.apkide.openapi.language.Language;
-import com.apkide.openapi.language.api.callback.OpenFileCallback;
-import com.apkide.openapi.language.api.callback.StopCallback;
-
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PushbackInputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.zip.CRC32;
-
-
-public class FileSpace {
-    private final IdentifierSpace myIdentifiers;
-    private final OpenFileCallback myOpenFileCallback;
-    private final StopCallback myStopCallback;
-    private MapOfIntLong myIncludedEntryVersions;
-    private OrderedMapOfIntInt myIncludes;
-    private FileEntry myCurrentIncludeFile;
-    private final SetOfInt myChangedIncludeFiles = new SetOfInt();
-    private final SetOfInt myChangedFiles = new SetOfInt();
-    private String myEncoding;
-    private FileEntry[] myEntries;
-    private int myEntryCount;
-    private Language[] myLanguages;
-    private final HashMap<Integer, Assembly> myAssemblyMap;
-    private final HashMap<Language, List<String>> myFilePatterns;
-    private final FunctionOfIntLong mySyntaxVersion;
-    private FunctionOfIntInt myFileLanguages;
-    private final FunctionOfIntInt myFileAssembles;
-    private final RelationOfIntInt myReferences;
-    private final OrderedMapOfIntInt myAssemblyReferences;
-    private final SetOfFileEntry myRegisteredCheckedFiles;
-    private final SetOfFileEntry myRegisteredSolutionFiles;
-    private final SetOfFileEntry myRegisteredResourceFiles;
-    private final SetOfFileEntry myCheckedFiles;
-    private final SetOfFileEntry mySolutionFiles;
-    private final HashMap<Integer, String> myResourcePackageNames;
-    private boolean myPacked;
-    protected char[] chars = new char[10000];
-    protected byte[] bytes = new byte[10000];
-    protected CRC32 crc32 = new CRC32();
-
-    public FileSpace(IdentifierSpace identifiers, OpenFileCallback openFileCallback, StopCallback stopCallback) {
-        myIdentifiers = identifiers;
-        myOpenFileCallback = openFileCallback;
-        myStopCallback = stopCallback;
-        myEntries = new FileEntry[1000];
-        myEntries[0] = new FileEntry(identifiers, this, openFileCallback, identifiers.get(""), null);
-        myEntryCount = 1;
-        mySyntaxVersion = new FunctionOfIntLong();
-        myIncludedEntryVersions = new MapOfIntLong();
-        myIncludes = new OrderedMapOfIntInt();
-        myFileLanguages = new FunctionOfIntInt();
-        myFileAssembles = new FunctionOfIntInt();
-        myReferences = new RelationOfIntInt();
-        myAssemblyReferences = new OrderedMapOfIntInt();
-        myRegisteredCheckedFiles = new SetOfFileEntry(this);
-        myRegisteredSolutionFiles = new SetOfFileEntry(this);
-        myRegisteredResourceFiles = new SetOfFileEntry(this);
-        myCheckedFiles = new SetOfFileEntry(this);
-        mySolutionFiles = new SetOfFileEntry(this);
-        myAssemblyMap = new HashMap<>();
-        myResourcePackageNames = new HashMap<>();
-        myFilePatterns = new HashMap<>();
-    }
-
-    protected void configureLanguages(Language[] languages) {
-        List<Language> list = new ArrayList<>();
-        for (Language language : languages) {
-            if (!list.contains(language)) {
-                list.add(language);
-                myFilePatterns.put(language, List.of(language.getDefaultFilePatterns()));
-            }
-        }
-
-        myLanguages = list.toArray(new Language[0]);
-    }
-
-    public void close() {
-        for (Language language : myLanguages) {
-            if (language.isArchiveFileSupported())
-                language.closeArchiveFile();
-        }
-    }
-
-    protected void update(boolean updateFileSpace) {
-        if (updateFileSpace)
-            synchronize();
-
-        myChangedIncludeFiles.clear();
-        myIncludedEntryVersions.DEFAULT_ITERATOR.init();
-        while (myIncludedEntryVersions.DEFAULT_ITERATOR.hasMoreElements()) {
-            FileEntry entry = getFileEntry(myIncludedEntryVersions.DEFAULT_ITERATOR.nextKey());
-            long version = myIncludedEntryVersions.DEFAULT_ITERATOR.nextValue();
-            if (version != entry.getVersion())
-                myChangedIncludeFiles.put(entry.getID());
-        }
-
-        myChangedIncludeFiles.DEFAULT_ITERATOR.init();
-        while (myChangedIncludeFiles.DEFAULT_ITERATOR.hasMoreElements()) {
-            myIncludedEntryVersions.remove(myChangedIncludeFiles.DEFAULT_ITERATOR.nextKey());
-        }
-
-        myChangedFiles.clear();
-        myIncludes.DEFAULT_ITERATOR.init();
-        while (myIncludes.DEFAULT_ITERATOR.hasMoreElements()) {
-            FileEntry entry = getFileEntry(myIncludes.DEFAULT_ITERATOR.nextValue());
-            FileEntry file = getFileEntry(myIncludes.DEFAULT_ITERATOR.nextKey());
-            if (myChangedIncludeFiles.contains(entry.getID()))
-                myChangedFiles.put(file.getID());
-        }
-
-        myChangedFiles.DEFAULT_ITERATOR.init();
-        while (myChangedFiles.DEFAULT_ITERATOR.hasMoreElements()) {
-            int nextKey = myChangedFiles.DEFAULT_ITERATOR.nextKey();
-            myIncludes.remove(nextKey);
-            mySyntaxVersion.remove(nextKey);
-        }
-    }
-
-    private void synchronize() {
-        for (FileEntry entry : myEntries) {
-            if (entry != null)
-                entry.synchronize();
-        }
-        myPacked = false;
-    }
-
-
-    protected int getLanguageID(Language language) {
-        for (int i = 0; i < myLanguages.length; ++i) {
-            if (language == myLanguages[i])
-                return i;
-        }
-        return -1;
-    }
-
-    protected Language getLanguage(int id) {
-        return id < 0 ? null : myLanguages[id];
-    }
-
-    public Language[] getLanguages() {
-        return myLanguages;
-    }
-
-    protected int getLanguage(Language language) {
-        for (int i = 0; i < myLanguages.length; i++) {
-            if (myLanguages[i] == language)
-                return i;
-        }
-        return -1;
-    }
-
-    protected int getAssembly(FileEntry file) {
-        pack();
-        return myFileAssembles.get(file.getID());
-    }
-
-    protected String getRootNamespace(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).rootNamespace;
-        }
-        return "";
-    }
-
-    protected List<String> getDefaultImports(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).defaultImports;
-        }
-        return Collections.emptyList();
-    }
-
-    protected List<String> getDefinedSymbols(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).definedSymbols;
-        }
-        return Collections.emptyList();
-    }
-
-    protected void configureEncoding(String encoding) {
-        myEncoding = encoding;
-    }
-
-    protected void configureReference(int assembly1, int assembly2) {
-        myReferences.put(assembly1, assembly2);
-        myAssemblyReferences.insert(assembly1, assembly2);
-    }
-
-    protected void configureAssembly(int assembly,
-                                     String projectAssembly,
-                                     String projectFilePath,
-                                     String rootNamespace,
-                                     String configuration,
-                                     List<String> defaultImports,
-                                     List<String> definedSymbols,
-                                     List<String> tagLibPaths,
-                                     String destinationPath,
-                                     String targetVersion,
-                                     boolean isExternal,
-                                     boolean isDebug,
-                                     boolean isRelease
-    ) {
-        myAssemblyMap.put(assembly, new Assembly(
-                projectAssembly,
-                projectFilePath,
-                rootNamespace,
-                configuration,
-                defaultImports,
-                definedSymbols,
-                tagLibPaths,
-                destinationPath,
-                targetVersion,
-                isExternal,
-                isDebug,
-                isRelease));
-    }
-
-    protected void configureFile(FileEntry file, int assembly, Language lang, boolean checked) {
-        for (FileEntry fileEntry = file; !fileEntry.isRootDirectory() && !new File(fileEntry.getPathString()).isDirectory(); fileEntry = fileEntry.getParentDirectory()) {
-            myFileLanguages.put(fileEntry.getID(), getLanguage(lang));
-        }
-
-        myFileLanguages.put(file.getID(), getLanguage(lang));
-        myFileAssembles.put(file.getID(), assembly);
-        if (checked)
-            myRegisteredCheckedFiles.put(file);
-
-        myRegisteredSolutionFiles.put(file);
-    }
-
-    protected void configureResourceFile(FileEntry file, int assembly, String packageName) {
-        myFileAssembles.put(file.getID(), assembly);
-        if (packageName != null)
-            myResourcePackageNames.put(file.getID(), packageName);
-
-        myRegisteredResourceFiles.put(file);
-    }
-
-    protected void configure() {
-        myFileAssembles.clear();
-        myReferences.clear();
-        myAssemblyReferences.clear();
-        myRegisteredCheckedFiles.clear();
-        myRegisteredSolutionFiles.clear();
-        myRegisteredResourceFiles.clear();
-        myCheckedFiles.clear();
-        mySolutionFiles.clear();
-        myAssemblyMap.clear();
-        myResourcePackageNames.clear();
-        myFilePatterns.clear();
-        synchronize();
-    }
-
-    public List<String> getAssemblyTagLibPaths(int assembly) {
-        if (myAssemblyMap.containsKey(assembly)) {
-            return requireNonNull(myAssemblyMap.get(assembly)).tagLibPaths;
-        }
-        return Collections.emptyList();
-    }
-
-    public FileEntry getAssemblyHome(int assembly) {
-        return getEntry(requireNonNull(myAssemblyMap.get(assembly)).projectFilePath).getParentDirectory();
-    }
-
-    public String getAssemblyName(int assembly) {
-        if (myAssemblyMap.containsKey(assembly)) {
-            return requireNonNull(myAssemblyMap.get(assembly)).assembly;
-        }
-        return "";
-    }
-
-    public String getTargetVersion(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).targetVersion;
-        }
-        return "";
-    }
-
-    public boolean isExternally(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).isExternal;
-        }
-        return false;
-    }
-
-    public boolean isDebug(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).isDebug;
-        }
-        return false;
-    }
-
-    public boolean isRelease(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).isRelease;
-        }
-        return false;
-    }
-
-    private String getConfiguration(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).configuration;
-        }
-        return "";
-    }
-
-    public String getDestinationPath(FileEntry file) {
-        if (myAssemblyMap.containsKey(getAssembly(file))) {
-            return requireNonNull(myAssemblyMap.get(getAssembly(file))).destinationPath;
-        }
-        return "";
-    }
-
-    protected boolean hasHigherPriority(FileEntry file, FileEntry referedFile1, FileEntry referedFile2) {
-        int assembly1 = myFileAssembles.get(referedFile1.getID());
-        int assembly2 = myFileAssembles.get(referedFile2.getID());
-        int assembly = myFileAssembles.get(file.getID());
-        myAssemblyReferences.DEFAULT_ITERATOR.init(assembly);
-
-        while (myAssemblyReferences.DEFAULT_ITERATOR.hasMoreElements()) {
-            int referedAssembly = myAssemblyReferences.DEFAULT_ITERATOR.nextValue();
-            if (referedAssembly == assembly1)
-                return true;
-
-            if (referedAssembly == assembly2)
-                return false;
-        }
-
-        return false;
-    }
-
-    protected boolean isReferableFrom(FileEntry file, FileEntry referingFile) {
-        pack();
-        return myReferences.contains(myFileAssembles.get(referingFile.getID()), myFileAssembles.get(file.getID()));
-    }
-
-    protected boolean isReferableFrom(int assembly, int referingAssembly) {
-        pack();
-        return myReferences.contains(referingAssembly, assembly);
-    }
-
-    private void pack() {
-        if (!myPacked) {
-            myPacked = true;
-            myRegisteredCheckedFiles.DEFAULT_ITERATOR.init();
-            while (myRegisteredCheckedFiles.DEFAULT_ITERATOR.hasMoreElements()) {
-                FileEntry file = myRegisteredCheckedFiles.DEFAULT_ITERATOR.nextKey();
-                pack(file, myFileAssembles.get(file.getID()),
-                        myFileLanguages.get(file.getID()),
-                        myCheckedFiles);
-            }
-
-            myRegisteredSolutionFiles.DEFAULT_ITERATOR.init();
-            while (myRegisteredSolutionFiles.DEFAULT_ITERATOR.hasMoreElements()) {
-                FileEntry file = myRegisteredSolutionFiles.DEFAULT_ITERATOR.nextKey();
-                pack(file, myFileAssembles.get(file.getID()),
-                        myFileLanguages.get(file.getID()),
-                        mySolutionFiles);
-            }
-        }
-    }
-
-    private void pack(FileEntry file, int assembly, int codeModel, SetOfFileEntry files) {
-        if (file.isDirectory()) {
-            int count = file.getChildCount();
-
-            for (int i = 0; i < count; ++i) {
-                FileEntry child = file.getChildEntry(i);
-                pack(child, assembly, codeModel, files);
-            }
-        } else {
-            myFileAssembles.put(file.getID(), assembly);
-            myFileLanguages.put(file.getID(), codeModel);
-            files.put(file);
-        }
-    }
-
-    public String getResourcePackageName(FileEntry file) {
-        if (myResourcePackageNames.containsKey(file.getID())) {
-            return myResourcePackageNames.get(file.getID());
-        }
-        return "";
-    }
-
-    public Language getLanguage(FileEntry file) {
-        if (myFileLanguages.contains(file.getID()))
-            return getLanguage(myFileLanguages.get(file.getID()));
-
-        pack();
-        Language lang = getLanguage(myFileLanguages.get(file.getID()));
-        if (lang == null) {
-            String name = file.getFullName();
-            for (Language language : myLanguages) {
-                if (myFilePatterns.containsKey(language)) {
-                    for (String filePattern : requireNonNull(myFilePatterns.get(language))) {
-                        if (FileNameMatcher.get() != null && FileNameMatcher.get().match(name, filePattern)) {
-                            myFileLanguages.put(file.getID(), getLanguage(language));
-                            return language;
-                        }
-                    }
-                }
-            }
-            myFileLanguages.put(file.getID(), -1);
-            return null;
-        }
-        return lang;
-    }
-
-    protected boolean isCheckedSolutionFile(FileEntry file) {
-        pack();
-        return myCheckedFiles.contains(file);
-    }
-
-    protected boolean isSolutionFile(FileEntry file) {
-        pack();
-        return mySolutionFiles.contains(file);
-    }
-
-    public SetOfFileEntry getCheckedSolutionFiles() {
-        pack();
-        return myCheckedFiles;
-    }
-
-    public SetOfFileEntry getSolutionFiles() {
-        pack();
-        return mySolutionFiles;
-    }
-
-    public SetOfFileEntry getResourceFiles() {
-        pack();
-        return myRegisteredResourceFiles;
-    }
-
-    public int getID(FileEntry file) {
-        return file == null ? -1 : file.getID();
-    }
-
-    public FileEntry getFileEntry(int id) {
-        return id == -1 ? null : myEntries[id];
-    }
-
-    public boolean checkSynchronized() throws InterruptedException {
-        for (int i = 0; i < myEntryCount; ++i) {
-            FileEntry entry = myEntries[i];
-            if (!entry.isSynchronized() && entry.getLanguage() != null)
-                return false;
-
-            if (myStopCallback.stopAsyncSynchronize())
-                throw new InterruptedException();
-        }
-
-        return true;
-    }
-
-    public FileEntry getRootDirectory() {
-        return myEntries[0];
-    }
-
-    public FileEntry getEntry(String path) {
-        while (path.endsWith(separator)) {
-            path = path.substring(0, path.length() - 1);
-        }
-
-        while (path.startsWith(separator)) {
-            path = path.substring(1);
-        }
-
-        FileEntry entry = getRootDirectory();
-        int oldpos = 0;
-
-        int pos = path.indexOf(separatorChar, oldpos);
-        while (pos != -1) {
-            String name = path.substring(oldpos, pos);
-            if (!name.equals(".")) {
-                if (name.equals("..") && getRootDirectory() != entry)
-                    entry = entry.getParentDirectory();
-                else
-                    entry = entry.getEntry(name);
-            }
-
-            oldpos = pos + 1;
-
-            while (path.charAt(oldpos) == separatorChar) {
-                ++oldpos;
-            }
-            pos = path.indexOf(separatorChar, oldpos);
-        }
-
-        return entry.getEntry(path.substring(oldpos));
-    }
-
-    protected String getEncoding() {
-        return myEncoding;
-    }
-
-    protected int declareEntry(FileEntry e) {
-        if (myEntryCount >= myEntries.length) {
-            FileEntry[] entities = new FileEntry[myEntries.length * 2 + 1];
-            System.arraycopy(myEntries, 0, entities, 0, myEntries.length);
-            myEntries = entities;
-        }
-
-        myEntries[myEntryCount] = e;
-        return myEntryCount++;
-    }
-
-    protected void fileIncluded(FileEntry entry) {
-        if (myCurrentIncludeFile != null && myCurrentIncludeFile != entry) {
-            myIncludedEntryVersions.put(entry.getID(), entry.getVersion());
-            myIncludes.insert(myCurrentIncludeFile.getID(), entry.getID());
-        }
-    }
-
-    protected long getSyntaxVersion(FileEntry file) {
-        Language language = file.getLanguage();
-        if (language != null) {
-            if (mySyntaxVersion.contains(file.getID())) {
-                return mySyntaxVersion.get(file.getID());
-            }
-
-            if (!myIncludes.contains(file.getID())) {
-                myIncludes.put(file.getID(), file.getID());
-                myIncludedEntryVersions.put(file.getID(), file.getVersion());
-                myCurrentIncludeFile = file;
-
-                language.processVersion(file);
-
-                myCurrentIncludeFile = null;
-
-                long version = 0L;
-                myIncludes.DEFAULT_ITERATOR.init(file.getID());
-
-                while (myIncludes.DEFAULT_ITERATOR.hasMoreElements()) {
-                    FileEntry includedFile = getFileEntry(myIncludes.DEFAULT_ITERATOR.nextValue());
-                    version = version * 37L ^ includedFile.getVersion();
-                }
-
-                return version;
-            }
-        }
-        return file.getVersion();
-    }
-
-
-    public SyntaxTree getSyntaxTree(FileEntry file, Language language) {
-        return getSyntaxTree(file, language, true, true, true);
-    }
-
-    public SyntaxTree getSyntaxTree(FileEntry file, Language language, boolean errors, boolean parseCode, boolean parseComments) {
-        return createSyntaxTree(file, language, errors, parseCode, parseComments);
-    }
-
-    protected SyntaxTree createSyntaxTree(FileEntry file, Language language, boolean errors, boolean parseCode, boolean parseComments) {
-        try {
-            Reader reader = file.getReader();
-            final SyntaxTree[] syntaxTree = new SyntaxTree[1];
-            language.createSyntaxTree(reader, file, file.getSyntaxVersion(), result -> syntaxTree[0]=result, errors,parseCode,parseComments);
-            reader.close();
-            return syntaxTree[0];
-        } catch (IOException ignored) {
-        }
-        return null;
-    }
-
-    protected Reader createBomReader(InputStream inStream, String fallbackEncoding) throws IOException {
-        int BOM_LENGTH = 4;
-        PushbackInputStream pbInputStream = new PushbackInputStream(inStream, BOM_LENGTH);
-        byte[] bomBytes = new byte[BOM_LENGTH];
-
-        int totalCount;
-        int count;
-        for (totalCount = 0; totalCount < BOM_LENGTH; totalCount += count) {
-            count = pbInputStream.read(bomBytes, totalCount, BOM_LENGTH - totalCount);
-            if (count == -1) {
-                break;
-            }
-        }
-
-        String encoding = null;
-        if (totalCount == BOM_LENGTH) {
-            if ((bomBytes[0] & 255) == 0 && (bomBytes[1] & 255) == 0 && (bomBytes[2] & 255) == 254 && (bomBytes[3] & 255) == 255) {
-                encoding = "UTF-32BE";
-            } else if ((bomBytes[0] & 255) == 255 && (bomBytes[1] & 255) == 254 && (bomBytes[2] & 255) == 0 && (bomBytes[3] & 255) == 0) {
-                encoding = "UTF-32LE";
-            }
-        }
-
-        if (encoding == null && totalCount >= 3 && (bomBytes[0] & 255) == 239 && (bomBytes[1] & 255) == 187 && (bomBytes[2] & 255) == 191) {
-            encoding = "UTF-8";
-            pbInputStream.unread(bomBytes, 3, totalCount - 3);
-        }
-
-        if (encoding == null && totalCount >= 2) {
-            if ((bomBytes[0] & 255) == 254 && (bomBytes[1] & 255) == 255) {
-                encoding = "UTF-16BE";
-            } else if ((bomBytes[0] & 255) == 255 && (bomBytes[1] & 255) == 254) {
-                encoding = "UTF-16LE";
-                pbInputStream.unread(bomBytes, 2, totalCount - 2);
-            }
-        }
-
-        if (encoding == null) {
-            pbInputStream.unread(bomBytes, 0, totalCount);
-        }
-
-        if (encoding == null) {
-            return fallbackEncoding != null ? new InputStreamReader(pbInputStream, fallbackEncoding) : new InputStreamReader(pbInputStream);
-        } else {
-            return new InputStreamReader(pbInputStream, encoding);
-        }
-    }
-
-    protected Reader createLineEndingNormalizedReader(Reader reader) {
-        return new LineEndingNormalizedReader(reader);
-    }
-
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/Highlights.java b/openapi/src/main/java/com/apkide/openapi/language/api/Highlights.java
deleted file mode 100644
index 60cb31b..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/Highlights.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import static java.lang.System.arraycopy;
-
-public class Highlights {
-
-    public int[] kinds = new int[1000];
-    public int[] startLines = new int[1000];
-    public int[] startColumns = new int[1000];
-    public int[] endLines = new int[1000];
-    public int[] endColumns = new int[1000];
-    public int size = 0;
-
-
-    public void reset() {
-        size = 0;
-    }
-
-    public void highlight(int kind, int startLine, int startColumn, int endLine, int endColumn) {
-        resize();
-        kinds[size] = kind;
-        startLines[size] = startLine;
-        startColumns[size] = startColumn;
-        endLines[size] = endLine;
-        endColumns[size] = endColumn;
-        size++;
-    }
-
-    private void resize() {
-        if (kinds.length <= size) {
-            int[] temp = new int[size * 5 / 4];
-            arraycopy(kinds, 0, temp, 0, kinds.length);
-            kinds = temp;
-            arraycopy(startLines, 0, temp, 0, startLines.length);
-            startLines = temp;
-            arraycopy(startColumns, 0, temp, 0, startColumns.length);
-            startColumns = temp;
-            arraycopy(endLines, 0, temp, 0, endLines.length);
-            endLines = temp;
-            arraycopy(endColumns, 0, temp, 0, endColumns.length);
-            endColumns = temp;
-        }
-    }
-
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/IdentifierSpace.java b/openapi/src/main/java/com/apkide/openapi/language/api/IdentifierSpace.java
deleted file mode 100644
index c56a2dc..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/IdentifierSpace.java
+++ /dev/null
@@ -1,575 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-import com.apkide.common.collections.FunctionOfIntInt;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-
-public class IdentifierSpace {
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private int[] hashes;
-   private int[] tablePoss;
-   private int count;
-   private int sizeexp;
-   private byte[] utfTable;
-   private int utfTablePos;
-   private int[] shortMap;
-   private char[] shortMapInverted;
-   private FunctionOfIntInt uidentifiers = new FunctionOfIntInt();
-   private char[] uchars = new char[100];
-   private char[] temp1 = new char[1000];
-   private char[] temp2 = new char[1000];
-
-   public IdentifierSpace() {
-      this.sizeexp = 0;
-      this.hashes = new int[SIZES[this.sizeexp]];
-      this.tablePoss = new int[SIZES[this.sizeexp]];
-      this.count = 0;
-      this.utfTable = new byte[10000];
-      this.utfTablePos = 1;
-      this.shortMap = new int[123];
-      int p = 1;
-
-      for(int i = 97; i <= 122; ++i) {
-         this.shortMap[i] = p++;
-      }
-
-      for(int i = 65; i <= 90; ++i) {
-         this.shortMap[i] = p++;
-      }
-
-      for(int i = 48; i <= 57; ++i) {
-         this.shortMap[i] = p++;
-      }
-
-      this.shortMap[95] = p++;
-      this.shortMapInverted = new char[64];
-
-      for(int i = 0; i < this.shortMap.length; ++i) {
-         this.shortMapInverted[this.shortMap[i]] = (char)i;
-      }
-   }
-
-   protected void load(StoreInputStream stream) throws IOException {
-      this.sizeexp = stream.readInt();
-      this.count = stream.readInt();
-      this.hashes = new int[SIZES[this.sizeexp]];
-      this.tablePoss = new int[SIZES[this.sizeexp]];
-
-      for(int i = 0; i < this.hashes.length; ++i) {
-         this.hashes[i] = stream.readInt();
-      }
-
-      for(int i = 0; i < this.hashes.length; ++i) {
-         this.tablePoss[i] = stream.readInt();
-      }
-
-      this.utfTablePos = stream.readInt();
-      this.utfTable = new byte[this.utfTablePos * 5 / 4];
-
-      for(int i = 0; i < this.utfTablePos; ++i) {
-         this.utfTable[i] = stream.readByte();
-      }
-   }
-
-   protected void store(StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.sizeexp);
-      stream.writeInt(this.count);
-
-      for (int hash : this.hashes) {
-         stream.writeInt(hash);
-      }
-
-      for(int i = 0; i < this.hashes.length; ++i) {
-         stream.writeInt(this.tablePoss[i]);
-      }
-
-      stream.writeInt(this.utfTablePos);
-
-      for(int i = 0; i < this.utfTablePos; ++i) {
-         stream.writeByte(this.utfTable[i]);
-      }
-   }
-
-   public void clear() {
-      if (this.count > 0) {
-         Arrays.fill(this.hashes, 0);
-
-         this.count = 0;
-      }
-
-      this.utfTablePos = 1;
-   }
-
-   public int get(String string) {
-      return this.get(string, 0, string.length());
-   }
-
-   public int get(String string, int offset, int length) {
-      return this.get(string.toCharArray(), offset, length);
-   }
-
-   public int get(char[] chars, int off, int len) {
-      switch(len) {
-         case 0:
-         case 2:
-         case 3:
-         case 4:
-         case 5:
-         {
-            int identifier = 0;
-            int i = 0;
-
-            while (true) {
-               if (i >= len) {
-                  return 1073741824 | identifier;
-               }
-
-               char c = chars[off + i];
-               if (c >= this.shortMap.length) {
-                  break;
-               }
-
-               int map = this.shortMap[c];
-               if (map == 0) {
-                  break;
-               }
-
-               identifier = identifier << 6 | map;
-               ++i;
-            }
-      }
-         default: {
-            int hash = 0;
-            if (len < 4) {
-               int offset = off;
-
-               for (int i = len; i > 0; --i) {
-                  hash = hash * 37 + chars[offset++];
-               }
-            } else {
-               int offset = off;
-               int skip = len / 4;
-
-               for (int i = len; i > 0; offset += skip) {
-                  hash = hash * 39 + chars[offset];
-                  i -= skip;
-               }
-            }
-
-            int step = (hash & 2147483647) % (this.hashes.length - 2) + 1;
-            int index = (hash & 2147483647) % this.hashes.length;
-
-            for (int curHash = this.hashes[index]; curHash != 0; curHash = this.hashes[index]) {
-               if (curHash == hash) {
-                  int identifier = this.tablePoss[index];
-                  if (this.equals(identifier, chars, off, len)) {
-                     return identifier;
-                  }
-               }
-
-               index = (index + step) % this.hashes.length;
-            }
-
-            int identifier = this.utfTablePos;
-            this.insert(hash);
-            this.insert(chars, off, len);
-            return identifier;
-         }
-         case 1:
-            return -2147483648 | chars[off];
-      }
-   }
-
-   private void insert(int hash) {
-      int index = (hash & 2147483647) % this.hashes.length;
-      int step = (hash & 2147483647) % (this.hashes.length - 2) + 1;
-
-      for(int curHash = this.hashes[index]; curHash != 0; curHash = this.hashes[index]) {
-         index = (index + step) % this.hashes.length;
-      }
-
-      this.hashes[index] = hash;
-      this.tablePoss[index] = this.utfTablePos;
-      ++this.count;
-      if (this.count * 2 > this.hashes.length) {
-         this.rehash();
-      }
-   }
-
-   private void rehash() {
-      ++this.sizeexp;
-      int[] keys = new int[SIZES[this.sizeexp]];
-      int[] values = new int[SIZES[this.sizeexp]];
-      int slots = 0;
-
-      for(int i = 0; i < this.hashes.length; ++i) {
-         int hash = this.hashes[i];
-         if (hash != 0) {
-            int step = (hash & 2147483647) % (keys.length - 2) + 1;
-            int index = (hash & 2147483647) % keys.length;
-
-            while(keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = hash;
-            values[index] = this.tablePoss[i];
-            ++slots;
-         }
-      }
-
-      this.hashes = keys;
-      this.tablePoss = values;
-   }
-
-   private void insert(char[] chars, int off, int len) {
-      while(this.utfTablePos + len * 3 + 1 >= this.utfTable.length) {
-         byte[] utfTable = new byte[this.utfTable.length * 2 + 1];
-         System.arraycopy(this.utfTable, 0, utfTable, 0, this.utfTable.length);
-         this.utfTable = utfTable;
-      }
-
-      int endIndex = off + len;
-      int i = 0;
-
-      for(i = off; i < endIndex; ++i) {
-         char c = chars[i];
-         if (c < 1 || c > 127) {
-            break;
-         }
-
-         this.utfTable[this.utfTablePos++] = (byte)c;
-      }
-
-      for(; i < endIndex; ++i) {
-         char c = chars[i];
-         if (c >= 1 && c <= 127) {
-            this.utfTable[this.utfTablePos++] = (byte)c;
-         } else if (c > 2047) {
-            this.utfTable[this.utfTablePos++] = (byte)(224 | c >> '\f' & 15);
-            this.utfTable[this.utfTablePos++] = (byte)(128 | c >> 6 & 63);
-            this.utfTable[this.utfTablePos++] = (byte)(128 | c & 63);
-         } else {
-            this.utfTable[this.utfTablePos++] = (byte)(192 | c >> 6 & 31);
-            this.utfTable[this.utfTablePos++] = (byte)(128 | c & 63);
-         }
-      }
-
-      this.utfTable[this.utfTablePos++] = 0;
-   }
-
-   private boolean equals(int identifier, char[] chars, int off, int len) {
-      int pos = identifier;
-      int endIndex = off + len;
-      int i = 0;
-
-      for(i = off; i < endIndex; ++i) {
-         char c = chars[i];
-         if (c == 0) {
-            return false;
-         }
-
-         if (c > 127) {
-            break;
-         }
-
-         if ((byte)c != this.utfTable[pos++]) {
-            return false;
-         }
-      }
-
-      for(; i < endIndex; ++i) {
-         char c = chars[i];
-         if (c == 0) {
-            return false;
-         }
-
-         if (c <= 127) {
-            if ((byte)c != this.utfTable[pos++]) {
-               return false;
-            }
-         } else if (c > 2047) {
-            if ((byte)(224 | c >> '\f' & 15) != this.utfTable[pos++]) {
-               return false;
-            }
-
-            if ((byte)(128 | c >> 6 & 63) != this.utfTable[pos++]) {
-               return false;
-            }
-
-            if ((byte)(128 | c & 63) != this.utfTable[pos++]) {
-               return false;
-            }
-         } else {
-            if ((byte)(192 | c >> 6 & 31) != this.utfTable[pos++]) {
-               return false;
-            }
-
-            if ((byte)(128 | c & 63) != this.utfTable[pos++]) {
-               return false;
-            }
-         }
-      }
-
-      return this.utfTable[pos++] == 0;
-   }
-
-   public String getString(int identifier) {
-      if ((identifier & -2147483648) == Integer.MIN_VALUE) {
-         return Character.toString((char)(identifier & 2147483647));
-      } else if ((identifier & 1073741824) == 1073741824) {
-         identifier &= -1073741825;
-         char[] chars = new char[5];
-         int len = 0;
-
-         for(int i = 0; i < 5; ++i) {
-            int map = identifier & 63;
-            if (map == 0) {
-               break;
-            }
-
-            ++len;
-            chars[5 - len] = this.shortMapInverted[map];
-            identifier >>= 6;
-         }
-
-         return new String(chars, 5 - len, len);
-      } else {
-         StringBuilder buf = new StringBuilder();
-         int pos = identifier;
-
-         while(pos < this.utfTablePos) {
-            int c = this.utfTable[pos++] & 255;
-            if (c == 0) {
-               break;
-            }
-
-            switch(c >> 4) {
-               case 0:
-               case 1:
-               case 2:
-               case 3:
-               case 4:
-               case 5:
-               case 6:
-               case 7:
-                  buf.append((char) c);
-                  break;
-               case 8:
-               case 9:
-               case 10:
-               case 11:
-               default:
-                  throw new RuntimeException("Malformed input");
-               case 12:
-               case 13: {
-                  if (pos >= this.utfTablePos) {
-                     throw new RuntimeException("End index not on boundary");
-                  }
-
-                  int char2 = this.utfTable[pos++] & 255;
-                  buf.append((char) ((c & 31) << 6 | char2 & 63));
-                  break;
-               }
-               case 14: {
-                  if (pos + 1 >= this.utfTablePos) {
-                     throw new RuntimeException("End index not on boundary");
-                  }
-
-                  int char2 = this.utfTable[pos++] & 255;
-                  int char3 = this.utfTable[pos++] & 255;
-                  buf.append((char) ((c & 15) << 12 | (char2 & 63) << 6 | (char3 & 63)));
-               }
-            }
-         }
-
-         return buf.toString();
-      }
-   }
-
-   public int getChars(int identifier, char[] chars, int off) {
-      if ((identifier & -2147483648) == Integer.MIN_VALUE) {
-         if (off + 1 >= chars.length) {
-            return -1;
-         } else {
-            chars[off++] = (char)(identifier & 2147483647);
-            return off;
-         }
-      } else if ((identifier & 1073741824) == 1073741824) {
-         identifier &= -1073741825;
-         int oldidentifier = identifier;
-         int len = 0;
-
-         for(int i = 0; i < 5 && identifier != 0; ++i) {
-            ++len;
-            identifier >>= 6;
-         }
-
-         if (off + len >= chars.length) {
-            return -1;
-         } else {
-            identifier = oldidentifier;
-
-            for(int i = 0; i < len; ++i) {
-               int map = identifier & 63;
-               if (map == 0) {
-                  break;
-               }
-
-               chars[off + len - i - 1] = this.shortMapInverted[map];
-               identifier >>= 6;
-            }
-
-            return off + len;
-         }
-      } else {
-         int pos = identifier;
-
-         while(pos < this.utfTablePos) {
-            int c = this.utfTable[pos++] & 255;
-            if (c == 0) {
-               break;
-            }
-
-            if (off >= chars.length) {
-               return -1;
-            }
-
-            switch(c >> 4) {
-               case 0:
-               case 1:
-               case 2:
-               case 3:
-               case 4:
-               case 5:
-               case 6:
-               case 7:
-                  chars[off++] = (char) c;
-                  break;
-               case 8:
-               case 9:
-               case 10:
-               case 11:
-               default:
-                  throw new RuntimeException("Malformed input");
-               case 12:
-               case 13: {
-                  if (pos >= this.utfTablePos) {
-                     throw new RuntimeException("End index not on boundary");
-                  }
-
-                  int char2 = this.utfTable[pos++] & 255;
-                  chars[off++] = (char) ((c & 31) << 6 | char2 & 63);
-                  break;
-               }
-               case 14: {
-                  if (pos + 1 >= this.utfTablePos) {
-                     throw new RuntimeException("End index not on boundary");
-                  }
-
-                  int char2 = this.utfTable[pos++] & 255;
-                  int char3 = this.utfTable[pos++] & 255;
-                  chars[off++] = (char) ((c & 15) << 12 | (char2 & 63) << 6 | (char3 & 63));
-               }
-            }
-         }
-
-         return off;
-      }
-   }
-
-   public int length(int identifier) {
-      int len1;
-      while((len1 = this.getChars(identifier, this.temp1, 0)) == -1) {
-         this.temp1 = new char[this.temp1.length * 2 + 1];
-      }
-
-      return len1;
-   }
-
-   public int substring(int identifier, int startoffset, int endoffset) {
-      while(this.getChars(identifier, this.temp1, 0) == -1) {
-         this.temp1 = new char[this.temp1.length * 2 + 1];
-      }
-
-      return this.get(this.temp1, startoffset, endoffset - startoffset);
-   }
-
-   public boolean endsWith(int identifier, int postfixIdentifier) {
-      int len1;
-      while((len1 = this.getChars(identifier, this.temp1, 0)) == -1) {
-         this.temp1 = new char[this.temp1.length * 2 + 1];
-      }
-
-      int len2;
-      while((len2 = this.getChars(postfixIdentifier, this.temp2, 0)) == -1) {
-         this.temp2 = new char[this.temp2.length * 2 + 1];
-      }
-
-      if (len1 < len2) {
-         return false;
-      } else {
-         for(int i = 0; i < len2; ++i) {
-            if (this.temp2[i] != this.temp1[len1 - len2 + i]) {
-               return false;
-            }
-         }
-
-         return true;
-      }
-   }
-
-   public int toUpperCase(int identifier) {
-      int uidentifier = this.uidentifiers.get(identifier);
-      if (uidentifier == -1) {
-         int off;
-         while ((off = this.getChars(identifier, this.uchars, 0)) == -1) {
-            this.uchars = new char[this.uchars.length * 2 + 1];
-         }
-
-         for (int i = 0; i < off; ++i) {
-            this.uchars[i] = Character.toUpperCase(this.uchars[i]);
-         }
-
-         uidentifier = this.get(this.uchars, 0, off);
-         this.uidentifiers.put(identifier, uidentifier);
-      }
-      return uidentifier;
-   }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/LineEndingNormalizedReader.java b/openapi/src/main/java/com/apkide/openapi/language/api/LineEndingNormalizedReader.java
deleted file mode 100644
index 1598b97..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/LineEndingNormalizedReader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import java.io.IOException;
-import java.io.Reader;
-
-class LineEndingNormalizedReader extends Reader {
-    private Reader reader;
-    private boolean rseen;
-
-    public LineEndingNormalizedReader(Reader reader) {
-        this.reader = reader;
-        this.rseen = false;
-    }
-
-    @Override
-    public int read(char[] cbuf, int off, int len) throws IOException {
-        int readlen = this.reader.read(cbuf, off, len);
-        if (readlen == -1) {
-            return -1;
-        } else {
-            boolean rseen = this.rseen;
-            int destoff = off;
-            int srcoff = off;
-            int maxoff = off + readlen;
-
-            while (srcoff < maxoff) {
-                char c = cbuf[srcoff++];
-                switch (c) {
-                    case '\n':
-                        if (!rseen) {
-                            cbuf[destoff++] = '\n';
-                        }
-
-                        rseen = false;
-                        break;
-                    case '\r':
-                        cbuf[destoff++] = '\n';
-                        rseen = true;
-                        break;
-                    default:
-                        cbuf[destoff++] = c;
-                        rseen = false;
-                }
-            }
-
-            this.rseen = rseen;
-            return destoff - off;
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        this.reader.close();
-        this.reader = null;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/Model.java b/openapi/src/main/java/com/apkide/openapi/language/api/Model.java
deleted file mode 100644
index 99264c6..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/Model.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.Language;
-import com.apkide.openapi.language.api.callback.CodeCompleterCallback;
-import com.apkide.openapi.language.api.callback.HighlighterCallback;
-import com.apkide.openapi.language.api.callback.OpenFileCallback;
-import com.apkide.openapi.language.api.callback.RefactorCallback;
-import com.apkide.openapi.language.api.callback.StopCallback;
-import com.apkide.openapi.language.api.callback.StructureCallback;
-import com.apkide.openapi.language.api.callback.SymbolSearcherCallback;
-import com.apkide.openapi.language.api.callback.UsageSearcherCallback;
-
-import java.util.List;
-
-public class Model {
-    protected static int modelCount = 0;
-    private final StructureCallback myStructureCallback;
-    private final HighlighterCallback myHighlighterCallback;
-    private final SymbolSearcherCallback mySymbolSearcherCallback;
-    private final CodeCompleterCallback myCodeCompleterCallback;
-    private final RefactorCallback myRefactoringCallback;
-    private final UsageSearcherCallback myUsageSearcherCallback;
-    private final StopCallback myStopCallback;
-    private final OpenFileCallback myOpenFileCallback;
-    private final IdentifierSpace myIdentifiers;
-    private final FileSpace myFileSpace;
-    private final ErrorTable myErrorTable;
-
-    public Model(
-            @NonNull
-            StructureCallback structureCallback,
-            @NonNull
-            HighlighterCallback highlighterCallback,
-            @NonNull
-            SymbolSearcherCallback symbolSearcherCallback,
-            @NonNull
-            CodeCompleterCallback codeCompleterCallback,
-            @NonNull
-            RefactorCallback refactoringCallback,
-            @NonNull
-            UsageSearcherCallback usageSearcherCallback,
-            @NonNull
-            StopCallback stopCallback,
-            @NonNull
-            OpenFileCallback openFileCallback
-    ) {
-        myStructureCallback = structureCallback;
-        myHighlighterCallback = highlighterCallback;
-        mySymbolSearcherCallback = symbolSearcherCallback;
-        myCodeCompleterCallback = codeCompleterCallback;
-        myRefactoringCallback = refactoringCallback;
-        myUsageSearcherCallback = usageSearcherCallback;
-        myStopCallback = stopCallback;
-        myOpenFileCallback = openFileCallback;
-        ++modelCount;
-        myIdentifiers = new IdentifierSpace();
-        myFileSpace = new FileSpace(myIdentifiers, openFileCallback, stopCallback);
-        myErrorTable = new ErrorTable(this);
-    }
-
-    @Override
-    protected void finalize() {
-        --modelCount;
-    }
-
-    public void close() {
-    }
-
-
-    public void begin(boolean updateFileSpace) {
-        myFileSpace.update(updateFileSpace);
-    }
-
-    public void done() {
-        myFileSpace.close();
-    }
-
-    public void configure() {
-        myFileSpace.configure();
-    }
-
-    public void configureLanguages(@NonNull Language[] languages) {
-        myFileSpace.configureLanguages(languages);
-    }
-
-    public Language[] getLanguages() {
-        return myFileSpace.getLanguages();
-    }
-
-    public void configureEncoding(@NonNull String encoding) {
-        myFileSpace.configureEncoding(encoding);
-    }
-
-    public void configureAssembly(int assembly,
-                                  @NonNull String projectAssembly,
-                                  @NonNull String projectFilePath,
-                                  @NonNull String rootNamespace,
-                                  @NonNull String configuration,
-                                  @NonNull List<String> defaultImports,
-                                  @NonNull List<String> defaultSymbols,
-                                  @NonNull List<String> targetLibs,
-                                  @NonNull String destinationPath,
-                                  @NonNull String targetVersion,
-                                  boolean isExternal,
-                                  boolean isDebug,
-                                  boolean isRelease
-    ) {
-        myFileSpace.configureAssembly(assembly,
-                projectAssembly,
-                projectFilePath,
-                rootNamespace,
-                configuration,
-                defaultImports,
-                defaultSymbols,
-                targetLibs,
-                destinationPath,
-                targetVersion,
-                isExternal,
-                isDebug,
-                isRelease);
-    }
-
-    public void configureReference(int assembly1, int assembly2) {
-        myFileSpace.configureReference(assembly1, assembly2);
-    }
-
-    public void configureFile(@NonNull FileEntry file, int assembly, @NonNull Language language, boolean checked) {
-        myFileSpace.configureFile(file, assembly, language, checked);
-    }
-
-    public void configureResourceFile(@NonNull FileEntry file, int assembly, @NonNull String packageName) {
-        myFileSpace.configureResourceFile(file, assembly, packageName);
-    }
-
-
-    @NonNull
-    public StructureCallback getStructureCallback() {
-        return myStructureCallback;
-    }
-
-    @NonNull
-    public HighlighterCallback getHighlighterCallback() {
-        return myHighlighterCallback;
-    }
-
-    @NonNull
-    public SymbolSearcherCallback getSymbolSearcherCallback() {
-        return mySymbolSearcherCallback;
-    }
-
-    @NonNull
-    public CodeCompleterCallback getCodeCompleterCallback() {
-        return myCodeCompleterCallback;
-    }
-
-    @NonNull
-    public RefactorCallback getRefactoringCallback() {
-        return myRefactoringCallback;
-    }
-
-    @NonNull
-    public UsageSearcherCallback getUsageSearcherCallback() {
-        return myUsageSearcherCallback;
-    }
-
-    @NonNull
-    public StopCallback getStopCallback() {
-        return myStopCallback;
-    }
-
-    @NonNull
-    public OpenFileCallback getOpenFileCallback() {
-        return myOpenFileCallback;
-    }
-
-    @NonNull
-    public IdentifierSpace getIdentifiers() {
-        return myIdentifiers;
-    }
-
-    @NonNull
-    public FileSpace getFileSpace() {
-        return myFileSpace;
-    }
-
-    @NonNull
-    public ErrorTable getErrorTable() {
-        return myErrorTable;
-    }
-}
-
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/RelationOfIntInt.java b/openapi/src/main/java/com/apkide/openapi/language/api/RelationOfIntInt.java
deleted file mode 100644
index 17e6cfd..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/RelationOfIntInt.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-import com.apkide.common.collections.SetOfInt;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class RelationOfIntInt {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   private long[] keys;
-   private long[] oldkeys;
-   private int slots;
-   private int count;
-   private int sizeexp;
-
-   public RelationOfIntInt(int size) {
-      this.sizeexp = 0;
-
-      while(SIZES[this.sizeexp] < size * 2) {
-         ++this.sizeexp;
-      }
-
-      this.keys = new long[SIZES[this.sizeexp]];
-      this.slots = 0;
-      this.count = 0;
-   }
-
-   public RelationOfIntInt() {
-      this.sizeexp = 0;
-      this.keys = new long[SIZES[this.sizeexp]];
-      this.slots = 0;
-      this.count = 0;
-   }
-
-   public RelationOfIntInt(StoreInputStream stream) throws IOException {
-      this.count = stream.readInt();
-      this.slots = stream.readInt();
-      this.sizeexp = stream.readInt();
-      this.keys = new long[SIZES[this.sizeexp]];
-
-      for(int i = 0; i < this.keys.length; ++i) {
-         this.keys[i] = stream.readLong();
-      }
-   }
-
-   public void remove(SetOfFileEntry value1s) {
-      for(int i = 0; i < this.keys.length; ++i) {
-         long key = this.keys[i];
-         if (key != 0L && key != Long.MIN_VALUE) {
-            if (key == Long.MAX_VALUE) {
-               key = 0L;
-            }
-
-            int v1 = (int)(key >> 32);
-            if (value1s.contains(v1)) {
-               this.keys[i] = Long.MIN_VALUE;
-               --this.count;
-            }
-         }
-      }
-   }
-
-   public void store(StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.count);
-      stream.writeInt(this.slots);
-      stream.writeInt(this.sizeexp);
-
-      for (long key : this.keys) {
-         stream.writeLong(key);
-      }
-   }
-
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.slots > 0) {
-         Arrays.fill(this.keys, 0L);
-
-         this.slots = 0;
-         this.count = 0;
-      }
-   }
-
-   public void put(RelationOfIntInt relation) {
-      for(int i = 0; i < relation.keys.length; ++i) {
-         long key = relation.keys[i];
-         if (key == Long.MAX_VALUE) {
-            this.put(0L);
-         } else if (key != 0L && key != Long.MIN_VALUE) {
-            this.put(key);
-         }
-      }
-   }
-
-   public void put(long key) {
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != 0L; curKey = this.keys[index]) {
-         if (curKey == key) {
-            return;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      this.keys[index] = key;
-      ++this.count;
-      ++this.slots;
-      if (this.slots * 2 > this.keys.length) {
-         this.rehash();
-      }
-   }
-
-   public void put(int value1, int value2) {
-      long key = (long)value1 << 32 | (long)value2;
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != 0L; curKey = this.keys[index]) {
-         if (curKey == key) {
-            return;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      this.keys[index] = key;
-      ++this.count;
-      ++this.slots;
-      if (this.slots * 2 > this.keys.length) {
-         this.rehash();
-      }
-   }
-
-   public void remove(int value1, int value2) {
-      long key = (long)value1 << 32 | (long)value2;
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != key; curKey = this.keys[index]) {
-         if (curKey == 0L) {
-            return;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      this.keys[index] = Long.MIN_VALUE;
-      --this.count;
-   }
-
-   public void remove(int value1) {
-      for(int i = 0; i < this.keys.length; ++i) {
-         long key = this.keys[i];
-         if (key != 0L && key != Long.MIN_VALUE) {
-            if (key == Long.MAX_VALUE) {
-               key = 0L;
-            }
-
-            int v1 = (int)(key >> 32);
-            if (v1 == value1) {
-               this.keys[i] = Long.MIN_VALUE;
-               --this.count;
-            }
-         }
-      }
-   }
-
-   public void remove(SetOfInt value1s) {
-      for(int i = 0; i < this.keys.length; ++i) {
-         long key = this.keys[i];
-         if (key != 0L && key != Long.MIN_VALUE) {
-            if (key == Long.MAX_VALUE) {
-               key = 0L;
-            }
-
-            int v1 = (int)(key >> 32);
-            if (value1s.contains(v1)) {
-               this.keys[i] = Long.MIN_VALUE;
-               --this.count;
-            }
-         }
-      }
-   }
-
-   public boolean contains(int value1, int value2) {
-      long key = (long)value1 << 32 | (long)value2;
-      if (key == 0L) {
-         key = Long.MAX_VALUE;
-      }
-
-      int index = (int)((key & Long.MAX_VALUE) % (long)this.keys.length);
-      int step = (int)((key & Long.MAX_VALUE) % ((long)this.keys.length - 2L)) + 1;
-
-      for(long curKey = this.keys[index]; curKey != key; curKey = this.keys[index]) {
-         if (curKey == 0L) {
-            return false;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      return true;
-   }
-
-   public boolean empty() {
-      return this.count == 0;
-   }
-
-   private void rehash() {
-      long[] keys;
-      if (this.count * 2 > this.keys.length) {
-         ++this.sizeexp;
-         this.oldkeys = null;
-         keys = new long[SIZES[this.sizeexp]];
-      } else if (this.oldkeys != null && this.oldkeys.length == this.keys.length) {
-         keys = this.oldkeys;
-
-         Arrays.fill(keys, 0L);
-
-         this.oldkeys = this.keys;
-      } else {
-         this.oldkeys = this.keys;
-         keys = new long[SIZES[this.sizeexp]];
-      }
-
-      int slots = 0;
-
-      for (long key : this.keys) {
-         if (key != 0L && key != Long.MIN_VALUE) {
-            int index = (int) ((key & Long.MAX_VALUE) % (long) keys.length);
-            int step = (int) ((key & Long.MAX_VALUE) % ((long) keys.length - 2L)) + 1;
-
-            while (keys[index] != 0L) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            ++slots;
-         }
-      }
-
-      this.keys = keys;
-      this.slots = slots;
-   }
-
-   public int memSize() {
-      return this.slots * 8;
-   }
-
-   public int totalSize() {
-      return this.keys.length * 8 + (this.oldkeys != null ? this.oldkeys.length * 8 : 0);
-   }
-
-   public int size() {
-      return this.count;
-   }
-   public class Iterator {
-      private int index = 0;
-      private int value1;
-      private int value2;
-
-      private Iterator() {
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < RelationOfIntInt.this.keys.length) {
-            long key = RelationOfIntInt.this.keys[this.index];
-            ++this.index;
-            if (key != 0L && key != Long.MIN_VALUE) {
-               if (key == Long.MAX_VALUE) {
-                  key = 0L;
-               }
-
-               this.value1 = (int)(key >> 32);
-               this.value2 = (int)(key);
-               return true;
-            }
-         }
-
-         return false;
-      }
-
-      public int nextValue1() {
-         return this.value1;
-      }
-
-      public int nextValue2() {
-         return this.value2;
-      }
-   }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/SetOfFileEntry.java b/openapi/src/main/java/com/apkide/openapi/language/api/SetOfFileEntry.java
deleted file mode 100644
index 96deb18..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/SetOfFileEntry.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.apkide.openapi.language.api;
-
-import com.apkide.common.StoreInputStream;
-import com.apkide.common.StoreOutputStream;
-import com.apkide.common.collections.SetOfInt;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class SetOfFileEntry {
-   public final Iterator DEFAULT_ITERATOR = new Iterator();
-   private static final int LOAD_FACTOR = 2;
-   private final FileSpace filespace;
-   private static final int[] SIZES = new int[]{
-      5,
-      11,
-      17,
-      37,
-      67,
-      131,
-      257,
-      521,
-      1031,
-      2053,
-      4099,
-      8209,
-      16411,
-      32771,
-      65537,
-      131101,
-      262147,
-      524309,
-      1048583,
-      2097169,
-      4194319,
-      8388617,
-      16777259,
-      33554467,
-      67108879,
-      134217757,
-      268435459,
-      536870923,
-      1073741827,
-      2147383649
-   };
-   public static final SetOfInt EMPTY = new SetOfInt();
-   private int[] keys;
-   private int[] oldkeys;
-   private int slots;
-   private int count;
-   private int sizeexp;
-
-   public SetOfFileEntry(FileSpace filespace) {
-      this.filespace = filespace;
-      this.sizeexp = 1;
-      this.keys = new int[SIZES[this.sizeexp]];
-      this.slots = 0;
-      this.count = 0;
-   }
-
-   public SetOfFileEntry(FileSpace filespace, StoreInputStream stream) throws IOException {
-      this.filespace = filespace;
-      int count = stream.readInt();
-      this.sizeexp = stream.readInt();
-      this.keys = new int[SIZES[this.sizeexp]];
-      this.slots = 0;
-      this.count = 0;
-
-      for(int i = 0; i < count; ++i) {
-         this.put(stream.readInt());
-      }
-   }
-
-   public void store(StoreOutputStream stream) throws IOException {
-      stream.writeInt(this.count);
-      stream.writeInt(this.sizeexp);
-
-      for (int key : this.keys) {
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            stream.writeInt(key);
-         }
-      }
-   }
-
-   public Iterator createIterator() {
-      return new Iterator();
-   }
-
-   public void clear() {
-      if (this.slots > 0) {
-         Arrays.fill(this.keys, 0);
-
-         this.slots = 0;
-         this.count = 0;
-      }
-   }
-
-   public void put(SetOfFileEntry set) {
-      for(int i = 0; i < set.keys.length; ++i) {
-         int key = set.keys[i];
-         if (key == Integer.MAX_VALUE) {
-            this.put(0);
-         } else if (key != 0 && key != Integer.MIN_VALUE) {
-            this.put(key);
-         }
-      }
-   }
-
-   public void put(FileEntry file) {
-      int key = this.filespace.getID(file);
-      this.put(key);
-   }
-
-   private void put(int key) {
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & 2147483647) % this.keys.length;
-      int step = (key & 2147483647) % (this.keys.length - 2) + 1;
-      int curKey = this.keys[index];
-
-      int emptyIndex;
-      for(emptyIndex = -1; curKey != 0; curKey = this.keys[index]) {
-         if (curKey == key) {
-            return;
-         }
-
-         if (curKey == Integer.MIN_VALUE) {
-            emptyIndex = index;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      if (emptyIndex != -1) {
-         index = emptyIndex;
-      }
-
-      this.keys[index] = key;
-      if (emptyIndex == -1) {
-         ++this.slots;
-      }
-
-      ++this.count;
-      if (this.slots * 2 > this.keys.length) {
-         this.rehash();
-      }
-   }
-
-   public void remove(FileEntry file) {
-      int key = this.filespace.getID(file);
-      if (key == 0) {
-         key = Integer.MAX_VALUE;
-      }
-
-      int index = (key & 2147483647) % this.keys.length;
-      int step = (key & 2147483647) % (this.keys.length - 2) + 1;
-
-      for(int curKey = this.keys[index]; curKey != key; curKey = this.keys[index]) {
-         if (curKey == 0) {
-            return;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      this.keys[index] = Integer.MIN_VALUE;
-      --this.count;
-   }
-
-   public FileEntry get() {
-      int index = 0;
-
-      while(index < this.keys.length) {
-         int key = this.keys[index];
-         ++index;
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            if (key == Integer.MAX_VALUE) {
-               key = 0;
-            }
-
-            return this.filespace.getFileEntry(key);
-         }
-      }
-
-      return null;
-   }
-
-   public boolean contains(FileEntry file) {
-      return this.contains(this.filespace.getID(file));
-   }
-
-   public boolean contains(int id) {
-      if (id == 0) {
-         id = Integer.MAX_VALUE;
-      }
-
-      int step = (id & 2147483647) % (this.keys.length - 2) + 1;
-      int index = (id & 2147483647) % this.keys.length;
-
-      for(int curKey = this.keys[index]; curKey != id; curKey = this.keys[index]) {
-         if (curKey == 0) {
-            return false;
-         }
-
-         index = (index + step) % this.keys.length;
-      }
-
-      return true;
-   }
-
-   public boolean empty() {
-      return this.count == 0;
-   }
-
-   private void rehash() {
-      int[] keys;
-      if (this.count * 2 > this.keys.length) {
-         ++this.sizeexp;
-         this.oldkeys = null;
-         keys = new int[SIZES[this.sizeexp]];
-      } else if (this.oldkeys != null && this.oldkeys.length == this.keys.length) {
-         keys = this.oldkeys;
-
-         Arrays.fill(keys, 0);
-
-         this.oldkeys = this.keys;
-      } else {
-         this.oldkeys = this.keys;
-         keys = new int[SIZES[this.sizeexp]];
-      }
-
-      int slots = 0;
-
-      for (int key : this.keys) {
-         if (key != 0 && key != Integer.MIN_VALUE) {
-            int step = (key & 2147483647) % (keys.length - 2) + 1;
-            int index = (key & 2147483647) % keys.length;
-
-            while (keys[index] != 0) {
-               index = (index + step) % keys.length;
-            }
-
-            keys[index] = key;
-            ++slots;
-         }
-      }
-
-      this.keys = keys;
-      this.slots = slots;
-   }
-
-   public int size() {
-      return this.count;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (!(o instanceof SetOfInt)) {
-         return false;
-      } else {
-         SetOfInt set = (SetOfInt)o;
-         if (set.size() != this.size()) {
-            return false;
-         } else {
-            for (int j : this.keys) {
-               int key = j;
-               if (key != 0 && key != Integer.MIN_VALUE) {
-                  if (key == Integer.MAX_VALUE) {
-                     key = 0;
-                  }
-
-                  if (!set.contains(key)) {
-                     return false;
-                  }
-               }
-            }
-
-            return true;
-         }
-      }
-   }
-
-   public class Iterator {
-      private int index = 0;
-      private int key;
-
-      private Iterator() {
-      }
-
-      public void init() {
-         this.index = 0;
-      }
-
-      public boolean hasMoreElements() {
-         while(this.index < SetOfFileEntry.this.keys.length) {
-            this.key = SetOfFileEntry.this.keys[this.index];
-            ++this.index;
-            if (this.key != 0 && this.key != Integer.MIN_VALUE) {
-               if (this.key == Integer.MAX_VALUE) {
-                  this.key = 0;
-               }
-
-               return true;
-            }
-         }
-
-         return false;
-      }
-
-      public FileEntry nextKey() {
-         return SetOfFileEntry.this.filespace.getFileEntry(this.key);
-      }
-   }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/CodeCompleterCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/CodeCompleterCallback.java
deleted file mode 100644
index f4ecc24..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/CodeCompleterCallback.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-
-public interface CodeCompleterCallback {
-
-    void fileStarted(@NonNull FileEntry file);
-
-    void listStarted();
-
-    void listElementUnknownIdentifierFound(@NonNull FileEntry file,@NonNull String identifier);
-
-    void listElementKeywordFound(@NonNull FileEntry file, @NonNull String keyword);
-
-    void listElementFound(@NonNull FileEntry file, @NonNull ParseTree element);
-
-    void listElementFound(@NonNull FileEntry file, @NonNull ParseTree element, boolean enclosing);
-
-    void listCompleted(@NonNull FileEntry file, int line, int column);
-
-    void fileFinished(@NonNull FileEntry file);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/HighlighterCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/HighlighterCallback.java
deleted file mode 100644
index db17393..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/HighlighterCallback.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.Language;
-import com.apkide.openapi.language.api.FileEntry;
-import com.apkide.openapi.language.api.Highlights;
-
-public interface HighlighterCallback {
-
-    void fileStarted(@NonNull FileEntry file);
-
-    void fileHighlightingFinished(@NonNull FileEntry file, @NonNull Language language, @NonNull Highlights highlights);
-
-    void keywordFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void packageFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void fieldFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void variableFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void functionFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void functionCallFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void parameterFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void identifierFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void constructorFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void typeFound(@NonNull FileEntry file, @NonNull Language language, int startLine, int startColumn, int endLine, int endColumn);
-
-    void semanticHighlightingFinished(@NonNull FileEntry file);
-
-    void fileFinished(@NonNull FileEntry file);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/OpenFileCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/OpenFileCallback.java
deleted file mode 100644
index 65745ba..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/OpenFileCallback.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import java.io.Reader;
-
-public interface OpenFileCallback {
-
-    @NonNull
-    Reader getOpenFileReader(@NonNull FileEntry file);
-
-    long getOpenFileVersion(@NonNull FileEntry file);
-
-    long getOpenFileSize(@NonNull FileEntry file);
-
-    boolean isOpenFile(@NonNull FileEntry file);
-
-    void update();
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/RefactorCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/RefactorCallback.java
deleted file mode 100644
index 99e3f49..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/RefactorCallback.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-public interface RefactorCallback {
-
-    void pasteText(@NonNull FileEntry file, int line, int column);
-
-    void cutText(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void replaceText(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn, @NonNull String newText);
-
-    void moveText(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn, int line, int column);
-
-    void copyText(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn, int line, int column);
-
-    void selectText(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void indentLines(@NonNull FileEntry file, int startLine, int endLine);
-
-    void renameFile(@NonNull FileEntry file, @NonNull String name);
-
-    void moveFile(@NonNull FileEntry file, @NonNull FileEntry newFile);
-
-    void deleteFile(@NonNull FileEntry file);
-
-    void reportUnSupportedOfRefactoring(@NonNull FileEntry file);
-
-    void reportWarning(@NonNull FileEntry file, @NonNull String msg);
-
-    void analysisStarted(@NonNull FileEntry file);
-
-    void renameAnalysisFinished(@NonNull FileEntry file);
-
-    void reportRenameProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void moveAnalysisFinished(@NonNull FileEntry file);
-
-    void reportMoveProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void fixAnalysisFinished(@NonNull FileEntry file);
-
-    void reportFixProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void documentationAnalysisFinished(@NonNull FileEntry file);
-
-    void reportDocumentationProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void createAnalysisFinished(@NonNull FileEntry file);
-
-    void reportCreateProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void implementationAnalysisFinished(@NonNull FileEntry file);
-
-    void reportImplementationProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void introduceAnalysisFinished(@NonNull FileEntry file);
-
-    void reportIntroduceProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void extractAnalysisFinished(@NonNull FileEntry file);
-
-    void reportExtractProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void inlineVariableAnalysisFinished(@NonNull FileEntry file);
-
-    void reportInlineVariableProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void optimizeImportAnalysisFinished(@NonNull FileEntry file);
-
-    void reportOptimizeImportProblem(@NonNull FileEntry file, @NonNull String msg);
-
-    void surroundAnalysisFinished(@NonNull FileEntry file);
-
-    void reportSurroundProblem(@NonNull FileEntry file, @NonNull String msg);
-
-
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/StopCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/StopCallback.java
deleted file mode 100644
index c74c303..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/StopCallback.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-public interface StopCallback {
-    boolean stopSearchSymbols();
-
-    boolean stopUsageSearch();
-
-    boolean stopRefactoring();
-
-    boolean stopCheckInFile();
-
-    boolean stopCheck();
-
-    boolean stopAsyncSynchronize();
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/StructureCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/StructureCallback.java
deleted file mode 100644
index c61b765..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/StructureCallback.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-
-public interface StructureCallback {
-    void fileStarted(@NonNull FileEntry file);
-
-    void elementFound(@NonNull FileEntry file,
-                   @NonNull ParseTree element,
-                   int identifierLine,
-                   int identifierStartColumn,
-                   int identifierEndColumn,
-                   int startLine,
-                   int startColumn,
-                   int endLine,
-                   int endColumn,
-                   int node);
-
-    void elementFound(@NonNull FileEntry file,
-                      @NonNull ParseTree element,
-                      int identifierLine,
-                      int identifierStartColumn,
-                      int identifierEndColumn,
-                      int startLine,
-                      int startColumn,
-                      int endLine,
-                      int endColumn
-    );
-
-    void fileFinished(@NonNull FileEntry file);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/SymbolSearcherCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/SymbolSearcherCallback.java
deleted file mode 100644
index 266e03d..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/SymbolSearcherCallback.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-
-public interface SymbolSearcherCallback {
-    void fileStarted(@NonNull FileEntry file);
-
-    void elementFound(@NonNull FileEntry file, @NonNull ParseTree element);
-
-    void fileFinished(@NonNull FileEntry file);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/callback/UsageSearcherCallback.java b/openapi/src/main/java/com/apkide/openapi/language/api/callback/UsageSearcherCallback.java
deleted file mode 100644
index bfa826c..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/callback/UsageSearcherCallback.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.apkide.openapi.language.api.callback;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.api.FileEntry;
-
-public interface UsageSearcherCallback {
-    void searchStarted(@NonNull FileEntry file);
-
-    void usageFound(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn);
-
-    void searchFinished(@NonNull FileEntry file);
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Highlighter.java b/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Highlighter.java
deleted file mode 100644
index 2b951c8..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Highlighter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.apkide.openapi.language.api.runtime;
-
-import com.apkide.common.collections.FunctionOfIntLong;
-import com.apkide.common.collections.SetOfInt;
-import com.apkide.openapi.language.api.FileEntry;
-import com.apkide.openapi.language.api.Model;
-
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-import java.io.IOException;
-import java.io.Reader;
-
-public class Highlighter {
-    private final Model myModel;
-    private final FunctionOfIntLong myVersions = new FunctionOfIntLong();
-    private final FunctionOfIntLong mySyntaxVersions = new FunctionOfIntLong();
-
-    public Highlighter(Model model) {
-        myModel = model;
-    }
-
-
-    public void begin() {
-        SetOfInt set = new SetOfInt();
-        myVersions.DEFAULT_ITERATOR.init();
-        while (myVersions.DEFAULT_ITERATOR.hasMoreElements()) {
-            int id = myVersions.DEFAULT_ITERATOR.nextKey();
-            if (myModel.getFileSpace().getFileEntry(id).isOpen()) {
-                set.put(id);
-            }
-        }
-
-        mySyntaxVersions.DEFAULT_ITERATOR.init();
-        while (mySyntaxVersions.DEFAULT_ITERATOR.hasMoreElements()) {
-            int id = mySyntaxVersions.DEFAULT_ITERATOR.nextKey();
-            if (myModel.getFileSpace().getFileEntry(id).isOpen()) {
-                set.put(id);
-            }
-        }
-
-        set.DEFAULT_ITERATOR.init();
-        while (set.DEFAULT_ITERATOR.hasMoreElements()) {
-            myVersions.remove(set.DEFAULT_ITERATOR.nextKey());
-            mySyntaxVersions.remove(set.DEFAULT_ITERATOR.nextKey());
-        }
-    }
-
-
-    public void highlighting(FileEntry file, Reader reader) throws IOException {
-        if (myModel.getLanguages() != null && myVersions.get(file.getID()) != file.getVersion()) {
-            myVersions.put(file.getID(), file.getVersion());
-            myModel.getHighlighterCallback().fileStarted(file);
-
-            if (reader == null)
-                reader = file.getReader();
-            file.getLanguage().fileHighlighting(file, reader, result -> myModel.getHighlighterCallback().fileHighlightingFinished(file, file.getLanguage(), result));
-            reader.close();
-        }
-    }
-
-    public void semanticHighlighting(FileEntry file, boolean analyzeErrors) throws IOException {
-        if (file.getLanguage() != null && mySyntaxVersions.get(file.getID()) != file.getVersion()) {
-            mySyntaxVersions.put(file.getID(), file.getVersion());
-
-            SyntaxTree ast = myModel.getFileSpace().getSyntaxTree(file, file.getLanguage());
-            if (file.getLanguage().getAnalyzer() != null && analyzeErrors)
-                file.getLanguage().getAnalyzer().analyzeErrors(file, ast);
-
-            file.getLanguage().semanticHighlighting(file,file.getLanguage(),ast);
-
-            myModel.getHighlighterCallback().fileFinished(file);
-        }
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Refactor.java b/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Refactor.java
deleted file mode 100644
index 19a5c0d..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Refactor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.apkide.openapi.language.api.runtime;
-
-import com.apkide.openapi.language.api.Model;
-
-public class Refactor {
-    private final Model myModel;
-
-    public Refactor(Model model) {
-        myModel = model;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Structure.java b/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Structure.java
deleted file mode 100644
index c1a3c2a..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/Structure.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.apkide.openapi.language.api.runtime;
-
-import com.apkide.openapi.language.api.Model;
-
-public class Structure {
-    private final Model myModel;
-
-    public Structure(Model model) {
-        myModel = model;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/SymbolSearcher.java b/openapi/src/main/java/com/apkide/openapi/language/api/runtime/SymbolSearcher.java
deleted file mode 100644
index 37cee9b..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/SymbolSearcher.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.apkide.openapi.language.api.runtime;
-
-import com.apkide.openapi.language.api.Model;
-
-public class SymbolSearcher {
-    private final Model myModel;
-
-    public SymbolSearcher(Model model) {
-        myModel = model;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/UsageSearcher.java b/openapi/src/main/java/com/apkide/openapi/language/api/runtime/UsageSearcher.java
deleted file mode 100644
index d662b0b..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/api/runtime/UsageSearcher.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.apkide.openapi.language.api.runtime;
-
-import com.apkide.openapi.language.api.Model;
-
-public class UsageSearcher {
-    private final Model myModel;
-
-    public UsageSearcher(Model model) {
-        myModel = model;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/JavaAnalyzer.java b/openapi/src/main/java/com/apkide/openapi/language/java/JavaAnalyzer.java
deleted file mode 100644
index 31d39d2..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/JavaAnalyzer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.apkide.openapi.language.java;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.Analyzer;
-import com.apkide.openapi.language.api.FileEntry;
-import com.apkide.openapi.language.api.Model;
-
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-public class JavaAnalyzer implements Analyzer {
-    private final Model myModel;
-    private final JavaLanguage myLanguage;
-
-    public JavaAnalyzer(Model model, JavaLanguage language) {
-        myModel = model;
-        myLanguage = language;
-    }
-
-    @Override
-    public void analyzeErrors(@NonNull FileEntry file, @NonNull SyntaxTree ast) {
-
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/JavaFormatter.java b/openapi/src/main/java/com/apkide/openapi/language/java/JavaFormatter.java
deleted file mode 100644
index 8508cc3..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/JavaFormatter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.apkide.openapi.language.java;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.Formatter;
-import com.apkide.openapi.language.api.Model;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class JavaFormatter implements Formatter {
-    private final Model myModel;
-    private final JavaLanguage myLanguage;
-    private final Set<String> options = new HashSet<>();
-
-    public JavaFormatter(Model model, JavaLanguage language) {
-        myModel = model;
-        myLanguage = language;
-    }
-
-    @NonNull
-    @Override
-    public List<? extends FormatterOption> getAllOptions() {
-        return JavaFormatterOption.getAll();
-    }
-
-    @NonNull
-    @Override
-    public Set<String> getDefaultOptions() {
-        return JavaFormatterOption.getDefaultOptions();
-    }
-
-    @Override
-    public void setOptions(@NonNull Set<String> options) {
-        this.options.clear();
-        this.options.addAll(options);
-    }
-
-    @NonNull
-    @Override
-    public Set<String> getOptions() {
-        return options;
-    }
-
-    @Override
-    public void outCommentLines(@NonNull FormatterCallback callback, int startLine, int endLine) {
-        if (startLine == endLine) {
-            callback.insertChar(startLine, 0, '/');
-            callback.insertChar(startLine, 1, '/');
-            return;
-        }
-        callback.insertChar(startLine, 0, '/');
-        callback.insertChar(startLine, 1, '*');
-        for (int i = startLine + 1; i < endLine; i++) {
-            callback.insertSpace(i, 0);
-            callback.insertChar(i, 1, '*');
-        }
-        callback.insertChar(endLine, 0, '*');
-        callback.insertChar(endLine, 1, '/');
-    }
-
-    @Override
-    public void unOutCommentLines(@NonNull FormatterCallback callback, int startLine, int endLine) {
-        if (startLine == endLine) {
-            if (callback.getLineLength(startLine) >= 2) {
-                char first = callback.getChar(startLine, 0);
-                char second = callback.getChar(startLine, 1);
-                if ((first == '/' && second == '*') || (first == '/' && second == '/')) {
-                    callback.removeChars(startLine, 0, startLine, 2);
-                }
-                return;
-            }
-        }
-        for (int i = startLine; i < endLine; i++) {
-            if (callback.getLineLength(i) >= 2) {
-                char first = callback.getChar(i, 0);
-                char second = callback.getChar(i, 1);
-                if ((first == '/' && second == '*') || (first == '/' && second == '/'))
-                    callback.removeChars(i, 0, i, 2);
-            }
-        }
-    }
-
-    @Override
-    public void expandSelection(@NonNull FormatterCallback callback, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-
-    @Override
-    public void expandSelectionToStatements(@NonNull FormatterCallback callback, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-
-    @Override
-    public void learnStyle(@NonNull FormatterCallback callback, @NonNull Set<String> options) {
-
-    }
-
-    @Override
-    public void autoIndentAfterPaste(@NonNull FormatterCallback callback, int startLine, int endLine) {
-
-    }
-
-    @Override
-    public void autoFormatLines(@NonNull FormatterCallback callback, int startLine, int endLine) {
-
-    }
-
-    @Override
-    public void autoIndentLines(@NonNull FormatterCallback callback, int startLine, int endLine) {
-
-    }
-
-    @Override
-    public void autoIndentLine(@NonNull FormatterCallback callback, int line) {
-
-    }
-
-    @Override
-    public void indentAfterLineBreak(@NonNull FormatterCallback callback, int line, int column) {
-
-    }
-
-    @Override
-    public void indentAfterCharEvent(@NonNull FormatterCallback callback, int line, int column, char c) {
-
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/JavaFormatterOption.java b/openapi/src/main/java/com/apkide/openapi/language/java/JavaFormatterOption.java
deleted file mode 100644
index 9b1f44c..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/JavaFormatterOption.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.apkide.openapi.language.java;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.Formatter;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public enum JavaFormatterOption implements Formatter.FormatterOption {
-
-    ;
-
-    final String group;
-    final String name;
-    final String before, after;
-
-    JavaFormatterOption(String group, String name, String before, String after) {
-        this.group = group;
-        this.name = name;
-        this.before = before;
-        this.after = after;
-    }
-
-    @NonNull
-    @Override
-    public String getGroup() {
-        return group;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @NonNull
-    @Override
-    public String getPreview(boolean preview) {
-        return preview ? after : before;
-    }
-
-
-    public static List<JavaFormatterOption> getAll(){
-        List<JavaFormatterOption> options=new ArrayList<>();
-
-        return options;
-    }
-
-    public static Set<String> getDefaultOptions(){
-        HashSet<String> set=new HashSet<>();
-
-        return set;
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/JavaLanguage.java b/openapi/src/main/java/com/apkide/openapi/language/java/JavaLanguage.java
deleted file mode 100644
index 1295c85..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/JavaLanguage.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.apkide.openapi.language.java;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.apkide.openapi.language.Analyzer;
-import com.apkide.openapi.language.Formatter;
-import com.apkide.openapi.language.Language;
-import com.apkide.openapi.language.ResultCallback;
-import com.apkide.openapi.language.Tools;
-import com.apkide.openapi.language.api.ErrorKind;
-import com.apkide.openapi.language.api.FileEntry;
-import com.apkide.openapi.language.api.Highlights;
-import com.apkide.openapi.language.api.Model;
-import com.apkide.openapi.language.java.ast.JavaLexer;
-import com.apkide.openapi.language.java.ast.JavaParser;
-import com.apkide.openapi.language.java.ast.JavaParserBaseVisitor;
-
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-import java.io.IOException;
-import java.io.Reader;
-
-public class JavaLanguage implements Language {
-    private final Model myModel;
-    private final JavaLexer myLexer = new JavaLexer(null);
-    private final JavaParser myParser = new JavaParser(null);
-    private JavaFormatter myFormatter;
-    private JavaAnalyzer myAnalyzer;
-    private JavaTools myTools;
-
-    public JavaLanguage(Model model) {
-        myModel = model;
-        if (myModel != null) {
-            myAnalyzer = new JavaAnalyzer(model, this);
-            myTools = new JavaTools(model, this);
-        }
-        myFormatter = new JavaFormatter(model, this);
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Java";
-    }
-
-    @NonNull
-    @Override
-    public String[] getDefaultFilePatterns() {
-        return new String[]{"*.java"};
-    }
-
-    @Nullable
-    @Override
-    public Formatter getFormatter() {
-        return myFormatter;
-    }
-
-    @Nullable
-    @Override
-    public JavaLexer getLexer() {
-        return myLexer;
-    }
-
-    @Nullable
-    @Override
-    public JavaParser getParser() {
-        return myParser;
-    }
-
-    @Nullable
-    @Override
-    public Analyzer getAnalyzer() {
-        return myAnalyzer;
-    }
-
-    @Nullable
-    @Override
-    public Tools getTools() {
-        return myTools;
-    }
-
-    @Override
-    public boolean isArchiveFileSupported() {
-        return false;
-    }
-
-    @Nullable
-    @Override
-    public String[] getArchiveEntries(@NonNull String filePath) throws IOException {
-        return new String[0];
-    }
-
-    @Nullable
-    @Override
-    public Reader getArchiveEntryReader(@NonNull String filePath, @NonNull String entryPath, @NonNull String encoding) throws IOException {
-        return null;
-    }
-
-    @Override
-    public long getArchiveVersion(@NonNull String filePath) {
-        return 0;
-    }
-
-    @Override
-    public void closeArchiveFile() {
-
-    }
-
-    @Override
-    public void processVersion(@NonNull FileEntry file) {
-
-    }
-
-    @Override
-    public void fileHighlighting(@NonNull FileEntry file, @NonNull Reader reader, @NonNull ResultCallback<Highlights> callback) throws IOException {
-        JavaLexer lexer = new JavaLexer(CharStreams.fromReader(reader));
-        Highlights highlights = new Highlights();
-        if (myModel != null) {
-            lexer.addErrorListener(new BaseErrorListener() {
-                @Override
-                public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
-                    myModel.getErrorTable().addError(
-                            file,
-                            line - 1,
-                            charPositionInLine - 1,
-                            line - 1,
-                            charPositionInLine,
-                            msg, ErrorKind.SYNTAX_ERROR);
-                }
-            });
-        }
-        while (!lexer._hitEOF) {
-            Token token = lexer.nextToken();
-            int startLine = token.getLine() - 1;
-            int startColumn = token.getCharPositionInLine() - 1;
-            int endLine = lexer.getLine() - 1;
-            int endColumn = lexer.getCharPositionInLine() - 1;
-            highlights.highlight(token.getType(), startLine, startColumn, endLine, endColumn);
-        }
-        callback.resultFound(highlights);
-    }
-
-    @Override
-    public void semanticHighlighting(@NonNull FileEntry file, @NonNull Language language, @Nullable SyntaxTree ast) throws IOException {
-        if (ast instanceof JavaParser.CompilationUnitContext) {
-            JavaParser.CompilationUnitContext unit = (JavaParser.CompilationUnitContext) ast;
-            JavaParserBaseVisitor<Void> visitor = new JavaParserBaseVisitor<>() {
-                @Override
-                public Void visitPackageDeclaration(JavaParser.PackageDeclarationContext ctx) {
-                    if (ctx != null && !ctx.isEmpty()) {
-                        if (ctx.PACKAGE() != null) {
-                            Token symbol = ctx.PACKAGE().getSymbol();
-                            myModel.getHighlighterCallback().keywordFound(
-                                    file,
-                                    language,
-                                    symbol.getLine() - 1,
-                                    symbol.getCharPositionInLine() - 1,
-                                    symbol.getLine() - 1,
-                                    symbol.getCharPositionInLine() - 1 + symbol.getText().length());
-                        }
-                        if (ctx.qualifiedName() != null) {
-                            if (ctx.qualifiedName().identifier() != null) {
-                                for (JavaParser.IdentifierContext context : ctx.qualifiedName().identifier()) {
-                                    myModel.getHighlighterCallback().packageFound(
-                                            file,
-                                            language,
-                                            context.getStart().getLine() - 1,
-                                            context.getStart().getCharPositionInLine() - 1,
-                                            context.getStop().getLine() - 1,
-                                            context.getStop().getCharPositionInLine() - 1
-                                    );
-                                }
-                            }
-                        }
-                    }
-                    return super.visitPackageDeclaration(ctx);
-                }
-            };
-            visitor.visitCompilationUnit(unit);
-        }
-    }
-
-    @Override
-    public void createSyntaxTree(@NonNull Reader reader, @NonNull FileEntry file, long syntaxVersion, @NonNull ResultCallback<SyntaxTree> callback, boolean errors, boolean parseCode, boolean parseComments) throws IOException {
-
-    }
-
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/JavaTools.java b/openapi/src/main/java/com/apkide/openapi/language/java/JavaTools.java
deleted file mode 100644
index 3fc3484..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/JavaTools.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.apkide.openapi.language.java;
-
-import androidx.annotation.NonNull;
-
-import com.apkide.openapi.language.Tools;
-import com.apkide.openapi.language.api.FileEntry;
-import com.apkide.openapi.language.api.Model;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.SyntaxTree;
-
-public class JavaTools implements Tools {
-    private final Model myModel;
-    private final JavaLanguage myLanguage;
-    public JavaTools(Model model, JavaLanguage language) {
-        myModel = model;
-        myLanguage = language;
-    }
-
-    @Override
-    public void requestCompletionList(@NonNull FileEntry file, int line, int column) {
-
-    }
-
-    @Override
-    public void requestClassesCompletionList(@NonNull FileEntry file) {
-
-    }
-
-    @Override
-    public void requestSuperMethodsCompletionList(@NonNull FileEntry file, int line, int column) {
-
-    }
-
-    @Override
-    public void documentation(@NonNull FileEntry file) {
-
-    }
-
-    @Override
-    public void documentation(@NonNull FileEntry file, int line, int column) {
-
-    }
-
-    @Override
-    public void safeDelete(@NonNull FileEntry file, @NonNull SyntaxTree element) {
-
-    }
-
-    @Override
-    public void surroundWithTryCatch(FileEntry file, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-
-    @Override
-    public void addThrows(@NonNull FileEntry file, int line, int column) {
-
-    }
-
-    @Override
-    public void createVariable(@NonNull FileEntry file, int line, int column, int identifier, @NonNull ParseTree type) {
-
-    }
-
-    @Override
-    public void createField(@NonNull FileEntry file, int line, int column, int modifiers, int identifier, @NonNull ParseTree type) {
-
-    }
-
-    @Override
-    public void createMethod(@NonNull FileEntry file, int line, int column, int modifiers, int identifier, @NonNull ParseTree type, int[] argModifiers, @NonNull ParseTree[] argTypes, int[] argNames) {
-
-    }
-
-    @Override
-    public void inlineVariable(@NonNull FileEntry file, int line, int column) {
-
-    }
-
-    @Override
-    public void createSettersAndGetters(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-
-    @Override
-    public void createConstructor(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-
-    @Override
-    public void extractMethod(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-
-    @Override
-    public void implementMembers(@NonNull FileEntry file, int line, int column) {
-
-    }
-
-    @Override
-    public void overrideMember(@NonNull FileEntry file, int line, int column, @NonNull ParseTree member) {
-
-    }
-
-    @Override
-    public void introduceVariable(@NonNull FileEntry file, int startLine, int startColumn, int endLine, int endColumn) {
-
-    }
-}
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaLexer.g4 b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaLexer.g4
deleted file mode 100644
index a340c6a..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaLexer.g4
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- [The "BSD licence"]
- Copyright (c) 2013 Terence Parr, Sam Harwell
- Copyright (c) 2017 Ivan Kochurkin (upgrade to Java 8)
- Copyright (c) 2021 Michał Lorek (upgrade to Java 11)
- Copyright (c) 2022 Michał Lorek (upgrade to Java 17)
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-lexer grammar JavaLexer;
-
-// Keywords
-
-ABSTRACT:           'abstract';
-ASSERT:             'assert';
-BOOLEAN:            'boolean';
-BREAK:              'break';
-BYTE:               'byte';
-CASE:               'case';
-CATCH:              'catch';
-CHAR:               'char';
-CLASS:              'class';
-CONST:              'const';
-CONTINUE:           'continue';
-DEFAULT:            'default';
-DO:                 'do';
-DOUBLE:             'double';
-ELSE:               'else';
-ENUM:               'enum';
-EXTENDS:            'extends';
-FINAL:              'final';
-FINALLY:            'finally';
-FLOAT:              'float';
-FOR:                'for';
-IF:                 'if';
-GOTO:               'goto';
-IMPLEMENTS:         'implements';
-IMPORT:             'import';
-INSTANCEOF:         'instanceof';
-INT:                'int';
-INTERFACE:          'interface';
-LONG:               'long';
-NATIVE:             'native';
-NEW:                'new';
-PACKAGE:            'package';
-PRIVATE:            'private';
-PROTECTED:          'protected';
-PUBLIC:             'public';
-RETURN:             'return';
-SHORT:              'short';
-STATIC:             'static';
-STRICTFP:           'strictfp';
-SUPER:              'super';
-SWITCH:             'switch';
-SYNCHRONIZED:       'synchronized';
-THIS:               'this';
-THROW:              'throw';
-THROWS:             'throws';
-TRANSIENT:          'transient';
-TRY:                'try';
-VOID:               'void';
-VOLATILE:           'volatile';
-WHILE:              'while';
-
-// Module related keywords
-MODULE:             'module';
-OPEN:               'open';
-REQUIRES:           'requires';
-EXPORTS:            'exports';
-OPENS:              'opens';
-TO:                 'to';
-USES:               'uses';
-PROVIDES:           'provides';
-WITH:               'with';
-TRANSITIVE:         'transitive';
-
-// Local Variable Type Inference
-VAR:                'var'; // reserved type name
-
-// Switch Expressions
-YIELD:              'yield';  // reserved type name from Java 14
-
-// Records
-RECORD:             'record';
-
-// Sealed Classes
-SEALED:             'sealed';
-PERMITS:            'permits';
-NON_SEALED:         'non-sealed';
-
-// Literals
-
-DECIMAL_LITERAL:    ('0' | [1-9] (Digits? | '_'+ Digits)) [lL]?;
-HEX_LITERAL:        '0' [xX] [0-9a-fA-F] ([0-9a-fA-F_]* [0-9a-fA-F])? [lL]?;
-OCT_LITERAL:        '0' '_'* [0-7] ([0-7_]* [0-7])? [lL]?;
-BINARY_LITERAL:     '0' [bB] [01] ([01_]* [01])? [lL]?;
-
-FLOAT_LITERAL:      (Digits '.' Digits? | '.' Digits) ExponentPart? [fFdD]?
-             |       Digits (ExponentPart [fFdD]? | [fFdD])
-             ;
-
-HEX_FLOAT_LITERAL:  '0' [xX] (HexDigits '.'? | HexDigits? '.' HexDigits) [pP] [+-]? Digits [fFdD]?;
-
-BOOL_LITERAL:       'true'
-            |       'false'
-            ;
-
-CHAR_LITERAL:       '\'' (~['\\\r\n] | EscapeSequence) '\'';
-
-STRING_LITERAL:     '"' (~["\\\r\n] | EscapeSequence)* '"';
-
-TEXT_BLOCK:         '"""' [ \t]* [\r\n] (. | EscapeSequence)*? '"""';
-
-NULL_LITERAL:       'null';
-
-// Separators
-
-LPAREN:             '(';
-RPAREN:             ')';
-LBRACE:             '{';
-RBRACE:             '}';
-LBRACK:             '[';
-RBRACK:             ']';
-SEMI:               ';';
-COMMA:              ',';
-DOT:                '.';
-
-// Operators
-
-ASSIGN:             '=';
-GT:                 '>';
-LT:                 '<';
-BANG:               '!';
-TILDE:              '~';
-QUESTION:           '?';
-COLON:              ':';
-EQUAL:              '==';
-LE:                 '<=';
-GE:                 '>=';
-NOTEQUAL:           '!=';
-AND:                '&&';
-OR:                 '||';
-INC:                '++';
-DEC:                '--';
-ADD:                '+';
-SUB:                '-';
-MUL:                '*';
-DIV:                '/';
-BITAND:             '&';
-BITOR:              '|';
-CARET:              '^';
-MOD:                '%';
-
-ADD_ASSIGN:         '+=';
-SUB_ASSIGN:         '-=';
-MUL_ASSIGN:         '*=';
-DIV_ASSIGN:         '/=';
-AND_ASSIGN:         '&=';
-OR_ASSIGN:          '|=';
-XOR_ASSIGN:         '^=';
-MOD_ASSIGN:         '%=';
-LSHIFT_ASSIGN:      '<<=';
-RSHIFT_ASSIGN:      '>>=';
-URSHIFT_ASSIGN:     '>>>=';
-
-// Java 8 tokens
-
-ARROW:              '->';
-COLONCOLON:         '::';
-
-// Additional symbols not defined in the lexical specification
-
-AT:                 '@';
-ELLIPSIS:           '...';
-
-// Whitespace and comments
-
-WS:                 [ \t\r\n\u000C]+ -> channel(HIDDEN);
-COMMENT:            '/*' .*? '*/'    -> channel(HIDDEN);
-LINE_COMMENT:       '//' ~[\r\n]*    -> channel(HIDDEN);
-
-// Identifiers
-
-IDENTIFIER:         Letter LetterOrDigit*;
-
-// Fragment rules
-
-fragment ExponentPart
-    : [eE] [+-]? Digits
-    ;
-
-fragment EscapeSequence
-    : '\\' 'u005c'? [btnfr"'\\]
-    | '\\' 'u005c'? ([0-3]? [0-7])? [0-7]
-    | '\\' 'u'+ HexDigit HexDigit HexDigit HexDigit
-    ;
-
-fragment HexDigits
-    : HexDigit ((HexDigit | '_')* HexDigit)?
-    ;
-
-fragment HexDigit
-    : [0-9a-fA-F]
-    ;
-
-fragment Digits
-    : [0-9] ([0-9_]* [0-9])?
-    ;
-
-fragment LetterOrDigit
-    : Letter
-    | [0-9]
-    ;
-
-fragment Letter
-    : [a-zA-Z$_] // these are the "java letters" below 0x7F
-    | ~[\u0000-\u007F\uD800-\uDBFF] // covers all characters above 0x7F which are not a surrogate
-    | [\uD800-\uDBFF] [\uDC00-\uDFFF] // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
-    ;
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaLexer.java b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaLexer.java
deleted file mode 100644
index a2ca087..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaLexer.java
+++ /dev/null
@@ -1,878 +0,0 @@
-// Generated from C:/Users/weg20/StudioProjects/apkide/openapi/src/main/java/com/apkide/openapi/language/java\JavaLexer.g4
-package com.apkide.openapi.language.java.ast;
-
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.LexerATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
-import org.antlr.v4.runtime.dfa.DFA;
-
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
-public class JavaLexer extends Lexer {
-
-    protected static final DFA[] _decisionToDFA;
-    protected static final PredictionContextCache _sharedContextCache =
-            new PredictionContextCache();
-    public static final int
-            ABSTRACT = 1, ASSERT = 2, BOOLEAN = 3, BREAK = 4, BYTE = 5, CASE = 6, CATCH = 7, CHAR = 8,
-            CLASS = 9, CONST = 10, CONTINUE = 11, DEFAULT = 12, DO = 13, DOUBLE = 14, ELSE = 15,
-            ENUM = 16, EXTENDS = 17, FINAL = 18, FINALLY = 19, FLOAT = 20, FOR = 21, IF = 22, GOTO = 23,
-            IMPLEMENTS = 24, IMPORT = 25, INSTANCEOF = 26, INT = 27, INTERFACE = 28, LONG = 29,
-            NATIVE = 30, NEW = 31, PACKAGE = 32, PRIVATE = 33, PROTECTED = 34, PUBLIC = 35, RETURN = 36,
-            SHORT = 37, STATIC = 38, STRICTFP = 39, SUPER = 40, SWITCH = 41, SYNCHRONIZED = 42,
-            THIS = 43, THROW = 44, THROWS = 45, TRANSIENT = 46, TRY = 47, VOID = 48, VOLATILE = 49,
-            WHILE = 50, MODULE = 51, OPEN = 52, REQUIRES = 53, EXPORTS = 54, OPENS = 55, TO = 56,
-            USES = 57, PROVIDES = 58, WITH = 59, TRANSITIVE = 60, VAR = 61, YIELD = 62, RECORD = 63,
-            SEALED = 64, PERMITS = 65, NON_SEALED = 66, DECIMAL_LITERAL = 67, HEX_LITERAL = 68,
-            OCT_LITERAL = 69, BINARY_LITERAL = 70, FLOAT_LITERAL = 71, HEX_FLOAT_LITERAL = 72,
-            BOOL_LITERAL = 73, CHAR_LITERAL = 74, STRING_LITERAL = 75, TEXT_BLOCK = 76, NULL_LITERAL = 77,
-            LPAREN = 78, RPAREN = 79, LBRACE = 80, RBRACE = 81, LBRACK = 82, RBRACK = 83, SEMI = 84,
-            COMMA = 85, DOT = 86, ASSIGN = 87, GT = 88, LT = 89, BANG = 90, TILDE = 91, QUESTION = 92,
-            COLON = 93, EQUAL = 94, LE = 95, GE = 96, NOTEQUAL = 97, AND = 98, OR = 99, INC = 100,
-            DEC = 101, ADD = 102, SUB = 103, MUL = 104, DIV = 105, BITAND = 106, BITOR = 107, CARET = 108,
-            MOD = 109, ADD_ASSIGN = 110, SUB_ASSIGN = 111, MUL_ASSIGN = 112, DIV_ASSIGN = 113,
-            AND_ASSIGN = 114, OR_ASSIGN = 115, XOR_ASSIGN = 116, MOD_ASSIGN = 117, LSHIFT_ASSIGN = 118,
-            RSHIFT_ASSIGN = 119, URSHIFT_ASSIGN = 120, ARROW = 121, COLONCOLON = 122, AT = 123,
-            ELLIPSIS = 124, WS = 125, COMMENT = 126, LINE_COMMENT = 127, IDENTIFIER = 128;
-    public static String[] channelNames = {
-            "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
-    };
-
-    public static String[] modeNames = {
-            "DEFAULT_MODE"
-    };
-
-    private static String[] makeRuleNames() {
-        return new String[]{
-                "ABSTRACT", "ASSERT", "BOOLEAN", "BREAK", "BYTE", "CASE", "CATCH", "CHAR",
-                "CLASS", "CONST", "CONTINUE", "DEFAULT", "DO", "DOUBLE", "ELSE", "ENUM",
-                "EXTENDS", "FINAL", "FINALLY", "FLOAT", "FOR", "IF", "GOTO", "IMPLEMENTS",
-                "IMPORT", "INSTANCEOF", "INT", "INTERFACE", "LONG", "NATIVE", "NEW",
-                "PACKAGE", "PRIVATE", "PROTECTED", "PUBLIC", "RETURN", "SHORT", "STATIC",
-                "STRICTFP", "SUPER", "SWITCH", "SYNCHRONIZED", "THIS", "THROW", "THROWS",
-                "TRANSIENT", "TRY", "VOID", "VOLATILE", "WHILE", "MODULE", "OPEN", "REQUIRES",
-                "EXPORTS", "OPENS", "TO", "USES", "PROVIDES", "WITH", "TRANSITIVE", "VAR",
-                "YIELD", "RECORD", "SEALED", "PERMITS", "NON_SEALED", "DECIMAL_LITERAL",
-                "HEX_LITERAL", "OCT_LITERAL", "BINARY_LITERAL", "FLOAT_LITERAL", "HEX_FLOAT_LITERAL",
-                "BOOL_LITERAL", "CHAR_LITERAL", "STRING_LITERAL", "TEXT_BLOCK", "NULL_LITERAL",
-                "LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACK", "RBRACK", "SEMI", "COMMA",
-                "DOT", "ASSIGN", "GT", "LT", "BANG", "TILDE", "QUESTION", "COLON", "EQUAL",
-                "LE", "GE", "NOTEQUAL", "AND", "OR", "INC", "DEC", "ADD", "SUB", "MUL",
-                "DIV", "BITAND", "BITOR", "CARET", "MOD", "ADD_ASSIGN", "SUB_ASSIGN",
-                "MUL_ASSIGN", "DIV_ASSIGN", "AND_ASSIGN", "OR_ASSIGN", "XOR_ASSIGN",
-                "MOD_ASSIGN", "LSHIFT_ASSIGN", "RSHIFT_ASSIGN", "URSHIFT_ASSIGN", "ARROW",
-                "COLONCOLON", "AT", "ELLIPSIS", "WS", "COMMENT", "LINE_COMMENT", "IDENTIFIER",
-                "ExponentPart", "EscapeSequence", "HexDigits", "HexDigit", "Digits",
-                "LetterOrDigit", "Letter"
-        };
-    }
-
-    public static final String[] ruleNames = makeRuleNames();
-
-    private static String[] makeLiteralNames() {
-        return new String[]{
-                null, "'abstract'", "'assert'", "'boolean'", "'break'", "'byte'", "'case'",
-                "'catch'", "'char'", "'class'", "'const'", "'continue'", "'default'",
-                "'do'", "'double'", "'else'", "'enum'", "'extends'", "'final'", "'finally'",
-                "'float'", "'for'", "'if'", "'goto'", "'implements'", "'import'", "'instanceof'",
-                "'int'", "'interface'", "'long'", "'native'", "'new'", "'package'", "'private'",
-                "'protected'", "'public'", "'return'", "'short'", "'static'", "'strictfp'",
-                "'super'", "'switch'", "'synchronized'", "'this'", "'throw'", "'throws'",
-                "'transient'", "'try'", "'void'", "'volatile'", "'while'", "'module'",
-                "'open'", "'requires'", "'exports'", "'opens'", "'to'", "'uses'", "'provides'",
-                "'with'", "'transitive'", "'var'", "'yield'", "'record'", "'sealed'",
-                "'permits'", "'non-sealed'", null, null, null, null, null, null, null,
-                null, null, null, "'null'", "'('", "')'", "'{'", "'}'", "'['", "']'",
-                "';'", "','", "'.'", "'='", "'>'", "'<'", "'!'", "'~'", "'?'", "':'",
-                "'=='", "'<='", "'>='", "'!='", "'&&'", "'||'", "'++'", "'--'", "'+'",
-                "'-'", "'*'", "'/'", "'&'", "'|'", "'^'", "'%'", "'+='", "'-='", "'*='",
-                "'/='", "'&='", "'|='", "'^='", "'%='", "'<<='", "'>>='", "'>>>='", "'->'",
-                "'::'", "'@'", "'...'"
-        };
-    }
-
-    private static final String[] _LITERAL_NAMES = makeLiteralNames();
-
-    private static String[] makeSymbolicNames() {
-        return new String[]{
-                null, "ABSTRACT", "ASSERT", "BOOLEAN", "BREAK", "BYTE", "CASE", "CATCH",
-                "CHAR", "CLASS", "CONST", "CONTINUE", "DEFAULT", "DO", "DOUBLE", "ELSE",
-                "ENUM", "EXTENDS", "FINAL", "FINALLY", "FLOAT", "FOR", "IF", "GOTO",
-                "IMPLEMENTS", "IMPORT", "INSTANCEOF", "INT", "INTERFACE", "LONG", "NATIVE",
-                "NEW", "PACKAGE", "PRIVATE", "PROTECTED", "PUBLIC", "RETURN", "SHORT",
-                "STATIC", "STRICTFP", "SUPER", "SWITCH", "SYNCHRONIZED", "THIS", "THROW",
-                "THROWS", "TRANSIENT", "TRY", "VOID", "VOLATILE", "WHILE", "MODULE",
-                "OPEN", "REQUIRES", "EXPORTS", "OPENS", "TO", "USES", "PROVIDES", "WITH",
-                "TRANSITIVE", "VAR", "YIELD", "RECORD", "SEALED", "PERMITS", "NON_SEALED",
-                "DECIMAL_LITERAL", "HEX_LITERAL", "OCT_LITERAL", "BINARY_LITERAL", "FLOAT_LITERAL",
-                "HEX_FLOAT_LITERAL", "BOOL_LITERAL", "CHAR_LITERAL", "STRING_LITERAL",
-                "TEXT_BLOCK", "NULL_LITERAL", "LPAREN", "RPAREN", "LBRACE", "RBRACE",
-                "LBRACK", "RBRACK", "SEMI", "COMMA", "DOT", "ASSIGN", "GT", "LT", "BANG",
-                "TILDE", "QUESTION", "COLON", "EQUAL", "LE", "GE", "NOTEQUAL", "AND",
-                "OR", "INC", "DEC", "ADD", "SUB", "MUL", "DIV", "BITAND", "BITOR", "CARET",
-                "MOD", "ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "DIV_ASSIGN", "AND_ASSIGN",
-                "OR_ASSIGN", "XOR_ASSIGN", "MOD_ASSIGN", "LSHIFT_ASSIGN", "RSHIFT_ASSIGN",
-                "URSHIFT_ASSIGN", "ARROW", "COLONCOLON", "AT", "ELLIPSIS", "WS", "COMMENT",
-                "LINE_COMMENT", "IDENTIFIER"
-        };
-    }
-
-    private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
-    public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-
-    @Override
-    public Vocabulary getVocabulary() {
-        return VOCABULARY;
-    }
-
-
-    public JavaLexer(CharStream input) {
-        super(input);
-        _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
-    }
-
-    @Override
-    public String[] getRuleNames() {
-        return ruleNames;
-    }
-
-    @Override
-    public String getSerializedATN() {
-        return _serializedATN;
-    }
-
-    @Override
-    public String getGrammarFileName() {
-        return "JavaLexer";
-    }
-
-    @Override
-    public String[] getChannelNames() {
-        return channelNames;
-    }
-
-    @Override
-    public String[] getModeNames() {
-        return modeNames;
-    }
-
-    @Override
-    public ATN getATN() {
-        return _ATN;
-    }
-
-    public static final String _serializedATN =
-            "\u0004\u0000\u0080\u0466\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002" +
-                    "\u0001\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002" +
-                    "\u0004\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002" +
-                    "\u0007\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002" +
-                    "\u000b\u0007\u000b\u0002\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e" +
-                    "\u0002\u000f\u0007\u000f\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011" +
-                    "\u0002\u0012\u0007\u0012\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014" +
-                    "\u0002\u0015\u0007\u0015\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017" +
-                    "\u0002\u0018\u0007\u0018\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a" +
-                    "\u0002\u001b\u0007\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d" +
-                    "\u0002\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!" +
-                    "\u0007!\u0002\"\u0007\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002" +
-                    "&\u0007&\u0002\'\u0007\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002" +
-                    "+\u0007+\u0002,\u0007,\u0002-\u0007-\u0002.\u0007.\u0002/\u0007/\u0002" +
-                    "0\u00070\u00021\u00071\u00022\u00072\u00023\u00073\u00024\u00074\u0002" +
-                    "5\u00075\u00026\u00076\u00027\u00077\u00028\u00078\u00029\u00079\u0002" +
-                    ":\u0007:\u0002;\u0007;\u0002<\u0007<\u0002=\u0007=\u0002>\u0007>\u0002" +
-                    "?\u0007?\u0002@\u0007@\u0002A\u0007A\u0002B\u0007B\u0002C\u0007C\u0002" +
-                    "D\u0007D\u0002E\u0007E\u0002F\u0007F\u0002G\u0007G\u0002H\u0007H\u0002" +
-                    "I\u0007I\u0002J\u0007J\u0002K\u0007K\u0002L\u0007L\u0002M\u0007M\u0002" +
-                    "N\u0007N\u0002O\u0007O\u0002P\u0007P\u0002Q\u0007Q\u0002R\u0007R\u0002" +
-                    "S\u0007S\u0002T\u0007T\u0002U\u0007U\u0002V\u0007V\u0002W\u0007W\u0002" +
-                    "X\u0007X\u0002Y\u0007Y\u0002Z\u0007Z\u0002[\u0007[\u0002\\\u0007\\\u0002" +
-                    "]\u0007]\u0002^\u0007^\u0002_\u0007_\u0002`\u0007`\u0002a\u0007a\u0002" +
-                    "b\u0007b\u0002c\u0007c\u0002d\u0007d\u0002e\u0007e\u0002f\u0007f\u0002" +
-                    "g\u0007g\u0002h\u0007h\u0002i\u0007i\u0002j\u0007j\u0002k\u0007k\u0002" +
-                    "l\u0007l\u0002m\u0007m\u0002n\u0007n\u0002o\u0007o\u0002p\u0007p\u0002" +
-                    "q\u0007q\u0002r\u0007r\u0002s\u0007s\u0002t\u0007t\u0002u\u0007u\u0002" +
-                    "v\u0007v\u0002w\u0007w\u0002x\u0007x\u0002y\u0007y\u0002z\u0007z\u0002" +
-                    "{\u0007{\u0002|\u0007|\u0002}\u0007}\u0002~\u0007~\u0002\u007f\u0007\u007f" +
-                    "\u0002\u0080\u0007\u0080\u0002\u0081\u0007\u0081\u0002\u0082\u0007\u0082" +
-                    "\u0002\u0083\u0007\u0083\u0002\u0084\u0007\u0084\u0002\u0085\u0007\u0085" +
-                    "\u0002\u0086\u0007\u0086\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000" +
-                    "\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001" +
-                    "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" +
-                    "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002" +
-                    "\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003" +
-                    "\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004" +
-                    "\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005" +
-                    "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006" +
-                    "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\b\u0001" +
-                    "\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001" +
-                    "\t\u0001\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001" +
-                    "\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b" +
-                    "\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0001\r\u0001" +
-                    "\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001" +
-                    "\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001" +
-                    "\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001" +
-                    "\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001" +
-                    "\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001" +
-                    "\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001" +
-                    "\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001" +
-                    "\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001" +
-                    "\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001" +
-                    "\u0017\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0017\u0001" +
-                    "\u0017\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0001" +
-                    "\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001" +
-                    "\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001" +
-                    "\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u001a\u0001" +
-                    "\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001b\u0001" +
-                    "\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001" +
-                    "\u001b\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001" +
-                    "\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001" +
-                    "\u001d\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001f\u0001" +
-                    "\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001" +
-                    "\u001f\u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001!" +
-                    "\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001" +
-                    "\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001#\u0001#\u0001" +
-                    "#\u0001#\u0001#\u0001#\u0001#\u0001$\u0001$\u0001$\u0001$\u0001$\u0001" +
-                    "$\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001&\u0001&\u0001" +
-                    "&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001\'\u0001\'\u0001\'\u0001" +
-                    "\'\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001(\u0001(\u0001(\u0001(\u0001" +
-                    ")\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001" +
-                    ")\u0001)\u0001)\u0001*\u0001*\u0001*\u0001*\u0001*\u0001+\u0001+\u0001" +
-                    "+\u0001+\u0001+\u0001+\u0001,\u0001,\u0001,\u0001,\u0001,\u0001,\u0001" +
-                    ",\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001" +
-                    "-\u0001.\u0001.\u0001.\u0001.\u0001/\u0001/\u0001/\u0001/\u0001/\u0001" +
-                    "0\u00010\u00010\u00010\u00010\u00010\u00010\u00010\u00010\u00011\u0001" +
-                    "1\u00011\u00011\u00011\u00011\u00012\u00012\u00012\u00012\u00012\u0001" +
-                    "2\u00012\u00013\u00013\u00013\u00013\u00013\u00014\u00014\u00014\u0001" +
-                    "4\u00014\u00014\u00014\u00014\u00014\u00015\u00015\u00015\u00015\u0001" +
-                    "5\u00015\u00015\u00015\u00016\u00016\u00016\u00016\u00016\u00016\u0001" +
-                    "7\u00017\u00017\u00018\u00018\u00018\u00018\u00018\u00019\u00019\u0001" +
-                    "9\u00019\u00019\u00019\u00019\u00019\u00019\u0001:\u0001:\u0001:\u0001" +
-                    ":\u0001:\u0001;\u0001;\u0001;\u0001;\u0001;\u0001;\u0001;\u0001;\u0001" +
-                    ";\u0001;\u0001;\u0001<\u0001<\u0001<\u0001<\u0001=\u0001=\u0001=\u0001" +
-                    "=\u0001=\u0001=\u0001>\u0001>\u0001>\u0001>\u0001>\u0001>\u0001>\u0001" +
-                    "?\u0001?\u0001?\u0001?\u0001?\u0001?\u0001?\u0001@\u0001@\u0001@\u0001" +
-                    "@\u0001@\u0001@\u0001@\u0001@\u0001A\u0001A\u0001A\u0001A\u0001A\u0001" +
-                    "A\u0001A\u0001A\u0001A\u0001A\u0001A\u0001B\u0001B\u0001B\u0003B\u02d5" +
-                    "\bB\u0001B\u0004B\u02d8\bB\u000bB\fB\u02d9\u0001B\u0003B\u02dd\bB\u0003" +
-                    "B\u02df\bB\u0001B\u0003B\u02e2\bB\u0001C\u0001C\u0001C\u0001C\u0005C\u02e8" +
-                    "\bC\nC\fC\u02eb\tC\u0001C\u0003C\u02ee\bC\u0001C\u0003C\u02f1\bC\u0001" +
-                    "D\u0001D\u0005D\u02f5\bD\nD\fD\u02f8\tD\u0001D\u0001D\u0005D\u02fc\bD" +
-                    "\nD\fD\u02ff\tD\u0001D\u0003D\u0302\bD\u0001D\u0003D\u0305\bD\u0001E\u0001" +
-                    "E\u0001E\u0001E\u0005E\u030b\bE\nE\fE\u030e\tE\u0001E\u0003E\u0311\bE" +
-                    "\u0001E\u0003E\u0314\bE\u0001F\u0001F\u0001F\u0003F\u0319\bF\u0001F\u0001" +
-                    "F\u0003F\u031d\bF\u0001F\u0003F\u0320\bF\u0001F\u0003F\u0323\bF\u0001" +
-                    "F\u0001F\u0001F\u0003F\u0328\bF\u0001F\u0003F\u032b\bF\u0003F\u032d\b" +
-                    "F\u0001G\u0001G\u0001G\u0001G\u0003G\u0333\bG\u0001G\u0003G\u0336\bG\u0001" +
-                    "G\u0001G\u0003G\u033a\bG\u0001G\u0001G\u0003G\u033e\bG\u0001G\u0001G\u0003" +
-                    "G\u0342\bG\u0001H\u0001H\u0001H\u0001H\u0001H\u0001H\u0001H\u0001H\u0001" +
-                    "H\u0003H\u034d\bH\u0001I\u0001I\u0001I\u0003I\u0352\bI\u0001I\u0001I\u0001" +
-                    "J\u0001J\u0001J\u0005J\u0359\bJ\nJ\fJ\u035c\tJ\u0001J\u0001J\u0001K\u0001" +
-                    "K\u0001K\u0001K\u0001K\u0005K\u0365\bK\nK\fK\u0368\tK\u0001K\u0001K\u0001" +
-                    "K\u0005K\u036d\bK\nK\fK\u0370\tK\u0001K\u0001K\u0001K\u0001K\u0001L\u0001" +
-                    "L\u0001L\u0001L\u0001L\u0001M\u0001M\u0001N\u0001N\u0001O\u0001O\u0001" +
-                    "P\u0001P\u0001Q\u0001Q\u0001R\u0001R\u0001S\u0001S\u0001T\u0001T\u0001" +
-                    "U\u0001U\u0001V\u0001V\u0001W\u0001W\u0001X\u0001X\u0001Y\u0001Y\u0001" +
-                    "Z\u0001Z\u0001[\u0001[\u0001\\\u0001\\\u0001]\u0001]\u0001]\u0001^\u0001" +
-                    "^\u0001^\u0001_\u0001_\u0001_\u0001`\u0001`\u0001`\u0001a\u0001a\u0001" +
-                    "a\u0001b\u0001b\u0001b\u0001c\u0001c\u0001c\u0001d\u0001d\u0001d\u0001" +
-                    "e\u0001e\u0001f\u0001f\u0001g\u0001g\u0001h\u0001h\u0001i\u0001i\u0001" +
-                    "j\u0001j\u0001k\u0001k\u0001l\u0001l\u0001m\u0001m\u0001m\u0001n\u0001" +
-                    "n\u0001n\u0001o\u0001o\u0001o\u0001p\u0001p\u0001p\u0001q\u0001q\u0001" +
-                    "q\u0001r\u0001r\u0001r\u0001s\u0001s\u0001s\u0001t\u0001t\u0001t\u0001" +
-                    "u\u0001u\u0001u\u0001u\u0001v\u0001v\u0001v\u0001v\u0001w\u0001w\u0001" +
-                    "w\u0001w\u0001w\u0001x\u0001x\u0001x\u0001y\u0001y\u0001y\u0001z\u0001" +
-                    "z\u0001{\u0001{\u0001{\u0001{\u0001|\u0004|\u03f5\b|\u000b|\f|\u03f6\u0001" +
-                    "|\u0001|\u0001}\u0001}\u0001}\u0001}\u0005}\u03ff\b}\n}\f}\u0402\t}\u0001" +
-                    "}\u0001}\u0001}\u0001}\u0001}\u0001~\u0001~\u0001~\u0001~\u0005~\u040d" +
-                    "\b~\n~\f~\u0410\t~\u0001~\u0001~\u0001\u007f\u0001\u007f\u0005\u007f\u0416" +
-                    "\b\u007f\n\u007f\f\u007f\u0419\t\u007f\u0001\u0080\u0001\u0080\u0003\u0080" +
-                    "\u041d\b\u0080\u0001\u0080\u0001\u0080\u0001\u0081\u0001\u0081\u0001\u0081" +
-                    "\u0001\u0081\u0001\u0081\u0001\u0081\u0003\u0081\u0427\b\u0081\u0001\u0081" +
-                    "\u0001\u0081\u0001\u0081\u0001\u0081\u0001\u0081\u0001\u0081\u0001\u0081" +
-                    "\u0003\u0081\u0430\b\u0081\u0001\u0081\u0003\u0081\u0433\b\u0081\u0001" +
-                    "\u0081\u0003\u0081\u0436\b\u0081\u0001\u0081\u0001\u0081\u0001\u0081\u0004" +
-                    "\u0081\u043b\b\u0081\u000b\u0081\f\u0081\u043c\u0001\u0081\u0001\u0081" +
-                    "\u0001\u0081\u0001\u0081\u0001\u0081\u0003\u0081\u0444\b\u0081\u0001\u0082" +
-                    "\u0001\u0082\u0001\u0082\u0005\u0082\u0449\b\u0082\n\u0082\f\u0082\u044c" +
-                    "\t\u0082\u0001\u0082\u0003\u0082\u044f\b\u0082\u0001\u0083\u0001\u0083" +
-                    "\u0001\u0084\u0001\u0084\u0005\u0084\u0455\b\u0084\n\u0084\f\u0084\u0458" +
-                    "\t\u0084\u0001\u0084\u0003\u0084\u045b\b\u0084\u0001\u0085\u0001\u0085" +
-                    "\u0003\u0085\u045f\b\u0085\u0001\u0086\u0001\u0086\u0001\u0086\u0001\u0086" +
-                    "\u0003\u0086\u0465\b\u0086\u0002\u036e\u0400\u0000\u0087\u0001\u0001\u0003" +
-                    "\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f\b\u0011" +
-                    "\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e\u001d\u000f\u001f\u0010" +
-                    "!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016-\u0017/\u00181\u00193\u001a" +
-                    "5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K&M\'O(Q)S*U+W,Y-[.]/" +
-                    "_0a1c2e3g4i5k6m7o8q9s:u;w<y={>}?\u007f@\u0081A\u0083B\u0085C\u0087D\u0089" +
-                    "E\u008bF\u008dG\u008fH\u0091I\u0093J\u0095K\u0097L\u0099M\u009bN\u009d" +
-                    "O\u009fP\u00a1Q\u00a3R\u00a5S\u00a7T\u00a9U\u00abV\u00adW\u00afX\u00b1" +
-                    "Y\u00b3Z\u00b5[\u00b7\\\u00b9]\u00bb^\u00bd_\u00bf`\u00c1a\u00c3b\u00c5" +
-                    "c\u00c7d\u00c9e\u00cbf\u00cdg\u00cfh\u00d1i\u00d3j\u00d5k\u00d7l\u00d9" +
-                    "m\u00dbn\u00ddo\u00dfp\u00e1q\u00e3r\u00e5s\u00e7t\u00e9u\u00ebv\u00ed" +
-                    "w\u00efx\u00f1y\u00f3z\u00f5{\u00f7|\u00f9}\u00fb~\u00fd\u007f\u00ff\u0080" +
-                    "\u0101\u0000\u0103\u0000\u0105\u0000\u0107\u0000\u0109\u0000\u010b\u0000" +
-                    "\u010d\u0000\u0001\u0000\u001b\u0001\u000019\u0002\u0000LLll\u0002\u0000" +
-                    "XXxx\u0003\u000009AFaf\u0004\u000009AF__af\u0001\u000007\u0002\u00000" +
-                    "7__\u0002\u0000BBbb\u0001\u000001\u0002\u000001__\u0004\u0000DDFFddff" +
-                    "\u0002\u0000PPpp\u0002\u0000++--\u0004\u0000\n\n\r\r\'\'\\\\\u0004\u0000" +
-                    "\n\n\r\r\"\"\\\\\u0002\u0000\t\t  \u0002\u0000\n\n\r\r\u0003\u0000\t\n" +
-                    "\f\r  \u0002\u0000EEee\b\u0000\"\"\'\'\\\\bbffnnrrtt\u0001\u000003\u0001" +
-                    "\u000009\u0002\u000009__\u0004\u0000$$AZ__az\u0002\u0000\u0000\u007f\u8000" +
-                    "\ud800\u8000\udbff\u0001\u0000\u8000\ud800\u8000\udbff\u0001\u0000\u8000" +
-                    "\udc00\u8000\udfff\u0494\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0003" +
-                    "\u0001\u0000\u0000\u0000\u0000\u0005\u0001\u0000\u0000\u0000\u0000\u0007" +
-                    "\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000\u0000\u000b\u0001" +
-                    "\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000\u000f\u0001\u0000" +
-                    "\u0000\u0000\u0000\u0011\u0001\u0000\u0000\u0000\u0000\u0013\u0001\u0000" +
-                    "\u0000\u0000\u0000\u0015\u0001\u0000\u0000\u0000\u0000\u0017\u0001\u0000" +
-                    "\u0000\u0000\u0000\u0019\u0001\u0000\u0000\u0000\u0000\u001b\u0001\u0000" +
-                    "\u0000\u0000\u0000\u001d\u0001\u0000\u0000\u0000\u0000\u001f\u0001\u0000" +
-                    "\u0000\u0000\u0000!\u0001\u0000\u0000\u0000\u0000#\u0001\u0000\u0000\u0000" +
-                    "\u0000%\u0001\u0000\u0000\u0000\u0000\'\u0001\u0000\u0000\u0000\u0000" +
-                    ")\u0001\u0000\u0000\u0000\u0000+\u0001\u0000\u0000\u0000\u0000-\u0001" +
-                    "\u0000\u0000\u0000\u0000/\u0001\u0000\u0000\u0000\u00001\u0001\u0000\u0000" +
-                    "\u0000\u00003\u0001\u0000\u0000\u0000\u00005\u0001\u0000\u0000\u0000\u0000" +
-                    "7\u0001\u0000\u0000\u0000\u00009\u0001\u0000\u0000\u0000\u0000;\u0001" +
-                    "\u0000\u0000\u0000\u0000=\u0001\u0000\u0000\u0000\u0000?\u0001\u0000\u0000" +
-                    "\u0000\u0000A\u0001\u0000\u0000\u0000\u0000C\u0001\u0000\u0000\u0000\u0000" +
-                    "E\u0001\u0000\u0000\u0000\u0000G\u0001\u0000\u0000\u0000\u0000I\u0001" +
-                    "\u0000\u0000\u0000\u0000K\u0001\u0000\u0000\u0000\u0000M\u0001\u0000\u0000" +
-                    "\u0000\u0000O\u0001\u0000\u0000\u0000\u0000Q\u0001\u0000\u0000\u0000\u0000" +
-                    "S\u0001\u0000\u0000\u0000\u0000U\u0001\u0000\u0000\u0000\u0000W\u0001" +
-                    "\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000\u0000\u0000[\u0001\u0000\u0000" +
-                    "\u0000\u0000]\u0001\u0000\u0000\u0000\u0000_\u0001\u0000\u0000\u0000\u0000" +
-                    "a\u0001\u0000\u0000\u0000\u0000c\u0001\u0000\u0000\u0000\u0000e\u0001" +
-                    "\u0000\u0000\u0000\u0000g\u0001\u0000\u0000\u0000\u0000i\u0001\u0000\u0000" +
-                    "\u0000\u0000k\u0001\u0000\u0000\u0000\u0000m\u0001\u0000\u0000\u0000\u0000" +
-                    "o\u0001\u0000\u0000\u0000\u0000q\u0001\u0000\u0000\u0000\u0000s\u0001" +
-                    "\u0000\u0000\u0000\u0000u\u0001\u0000\u0000\u0000\u0000w\u0001\u0000\u0000" +
-                    "\u0000\u0000y\u0001\u0000\u0000\u0000\u0000{\u0001\u0000\u0000\u0000\u0000" +
-                    "}\u0001\u0000\u0000\u0000\u0000\u007f\u0001\u0000\u0000\u0000\u0000\u0081" +
-                    "\u0001\u0000\u0000\u0000\u0000\u0083\u0001\u0000\u0000\u0000\u0000\u0085" +
-                    "\u0001\u0000\u0000\u0000\u0000\u0087\u0001\u0000\u0000\u0000\u0000\u0089" +
-                    "\u0001\u0000\u0000\u0000\u0000\u008b\u0001\u0000\u0000\u0000\u0000\u008d" +
-                    "\u0001\u0000\u0000\u0000\u0000\u008f\u0001\u0000\u0000\u0000\u0000\u0091" +
-                    "\u0001\u0000\u0000\u0000\u0000\u0093\u0001\u0000\u0000\u0000\u0000\u0095" +
-                    "\u0001\u0000\u0000\u0000\u0000\u0097\u0001\u0000\u0000\u0000\u0000\u0099" +
-                    "\u0001\u0000\u0000\u0000\u0000\u009b\u0001\u0000\u0000\u0000\u0000\u009d" +
-                    "\u0001\u0000\u0000\u0000\u0000\u009f\u0001\u0000\u0000\u0000\u0000\u00a1" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00a3\u0001\u0000\u0000\u0000\u0000\u00a5" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00a7\u0001\u0000\u0000\u0000\u0000\u00a9" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00ab\u0001\u0000\u0000\u0000\u0000\u00ad" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00af\u0001\u0000\u0000\u0000\u0000\u00b1" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00b3\u0001\u0000\u0000\u0000\u0000\u00b5" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00b7\u0001\u0000\u0000\u0000\u0000\u00b9" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00bb\u0001\u0000\u0000\u0000\u0000\u00bd" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00bf\u0001\u0000\u0000\u0000\u0000\u00c1" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00c3\u0001\u0000\u0000\u0000\u0000\u00c5" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00c7\u0001\u0000\u0000\u0000\u0000\u00c9" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00cb\u0001\u0000\u0000\u0000\u0000\u00cd" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00cf\u0001\u0000\u0000\u0000\u0000\u00d1" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00d3\u0001\u0000\u0000\u0000\u0000\u00d5" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00d7\u0001\u0000\u0000\u0000\u0000\u00d9" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00db\u0001\u0000\u0000\u0000\u0000\u00dd" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00df\u0001\u0000\u0000\u0000\u0000\u00e1" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00e3\u0001\u0000\u0000\u0000\u0000\u00e5" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00e7\u0001\u0000\u0000\u0000\u0000\u00e9" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00eb\u0001\u0000\u0000\u0000\u0000\u00ed" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00ef\u0001\u0000\u0000\u0000\u0000\u00f1" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00f3\u0001\u0000\u0000\u0000\u0000\u00f5" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00f7\u0001\u0000\u0000\u0000\u0000\u00f9" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00fb\u0001\u0000\u0000\u0000\u0000\u00fd" +
-                    "\u0001\u0000\u0000\u0000\u0000\u00ff\u0001\u0000\u0000\u0000\u0001\u010f" +
-                    "\u0001\u0000\u0000\u0000\u0003\u0118\u0001\u0000\u0000\u0000\u0005\u011f" +
-                    "\u0001\u0000\u0000\u0000\u0007\u0127\u0001\u0000\u0000\u0000\t\u012d\u0001" +
-                    "\u0000\u0000\u0000\u000b\u0132\u0001\u0000\u0000\u0000\r\u0137\u0001\u0000" +
-                    "\u0000\u0000\u000f\u013d\u0001\u0000\u0000\u0000\u0011\u0142\u0001\u0000" +
-                    "\u0000\u0000\u0013\u0148\u0001\u0000\u0000\u0000\u0015\u014e\u0001\u0000" +
-                    "\u0000\u0000\u0017\u0157\u0001\u0000\u0000\u0000\u0019\u015f\u0001\u0000" +
-                    "\u0000\u0000\u001b\u0162\u0001\u0000\u0000\u0000\u001d\u0169\u0001\u0000" +
-                    "\u0000\u0000\u001f\u016e\u0001\u0000\u0000\u0000!\u0173\u0001\u0000\u0000" +
-                    "\u0000#\u017b\u0001\u0000\u0000\u0000%\u0181\u0001\u0000\u0000\u0000\'" +
-                    "\u0189\u0001\u0000\u0000\u0000)\u018f\u0001\u0000\u0000\u0000+\u0193\u0001" +
-                    "\u0000\u0000\u0000-\u0196\u0001\u0000\u0000\u0000/\u019b\u0001\u0000\u0000" +
-                    "\u00001\u01a6\u0001\u0000\u0000\u00003\u01ad\u0001\u0000\u0000\u00005" +
-                    "\u01b8\u0001\u0000\u0000\u00007\u01bc\u0001\u0000\u0000\u00009\u01c6\u0001" +
-                    "\u0000\u0000\u0000;\u01cb\u0001\u0000\u0000\u0000=\u01d2\u0001\u0000\u0000" +
-                    "\u0000?\u01d6\u0001\u0000\u0000\u0000A\u01de\u0001\u0000\u0000\u0000C" +
-                    "\u01e6\u0001\u0000\u0000\u0000E\u01f0\u0001\u0000\u0000\u0000G\u01f7\u0001" +
-                    "\u0000\u0000\u0000I\u01fe\u0001\u0000\u0000\u0000K\u0204\u0001\u0000\u0000" +
-                    "\u0000M\u020b\u0001\u0000\u0000\u0000O\u0214\u0001\u0000\u0000\u0000Q" +
-                    "\u021a\u0001\u0000\u0000\u0000S\u0221\u0001\u0000\u0000\u0000U\u022e\u0001" +
-                    "\u0000\u0000\u0000W\u0233\u0001\u0000\u0000\u0000Y\u0239\u0001\u0000\u0000" +
-                    "\u0000[\u0240\u0001\u0000\u0000\u0000]\u024a\u0001\u0000\u0000\u0000_" +
-                    "\u024e\u0001\u0000\u0000\u0000a\u0253\u0001\u0000\u0000\u0000c\u025c\u0001" +
-                    "\u0000\u0000\u0000e\u0262\u0001\u0000\u0000\u0000g\u0269\u0001\u0000\u0000" +
-                    "\u0000i\u026e\u0001\u0000\u0000\u0000k\u0277\u0001\u0000\u0000\u0000m" +
-                    "\u027f\u0001\u0000\u0000\u0000o\u0285\u0001\u0000\u0000\u0000q\u0288\u0001" +
-                    "\u0000\u0000\u0000s\u028d\u0001\u0000\u0000\u0000u\u0296\u0001\u0000\u0000" +
-                    "\u0000w\u029b\u0001\u0000\u0000\u0000y\u02a6\u0001\u0000\u0000\u0000{" +
-                    "\u02aa\u0001\u0000\u0000\u0000}\u02b0\u0001\u0000\u0000\u0000\u007f\u02b7" +
-                    "\u0001\u0000\u0000\u0000\u0081\u02be\u0001\u0000\u0000\u0000\u0083\u02c6" +
-                    "\u0001\u0000\u0000\u0000\u0085\u02de\u0001\u0000\u0000\u0000\u0087\u02e3" +
-                    "\u0001\u0000\u0000\u0000\u0089\u02f2\u0001\u0000\u0000\u0000\u008b\u0306" +
-                    "\u0001\u0000\u0000\u0000\u008d\u032c\u0001\u0000\u0000\u0000\u008f\u032e" +
-                    "\u0001\u0000\u0000\u0000\u0091\u034c\u0001\u0000\u0000\u0000\u0093\u034e" +
-                    "\u0001\u0000\u0000\u0000\u0095\u0355\u0001\u0000\u0000\u0000\u0097\u035f" +
-                    "\u0001\u0000\u0000\u0000\u0099\u0375\u0001\u0000\u0000\u0000\u009b\u037a" +
-                    "\u0001\u0000\u0000\u0000\u009d\u037c\u0001\u0000\u0000\u0000\u009f\u037e" +
-                    "\u0001\u0000\u0000\u0000\u00a1\u0380\u0001\u0000\u0000\u0000\u00a3\u0382" +
-                    "\u0001\u0000\u0000\u0000\u00a5\u0384\u0001\u0000\u0000\u0000\u00a7\u0386" +
-                    "\u0001\u0000\u0000\u0000\u00a9\u0388\u0001\u0000\u0000\u0000\u00ab\u038a" +
-                    "\u0001\u0000\u0000\u0000\u00ad\u038c\u0001\u0000\u0000\u0000\u00af\u038e" +
-                    "\u0001\u0000\u0000\u0000\u00b1\u0390\u0001\u0000\u0000\u0000\u00b3\u0392" +
-                    "\u0001\u0000\u0000\u0000\u00b5\u0394\u0001\u0000\u0000\u0000\u00b7\u0396" +
-                    "\u0001\u0000\u0000\u0000\u00b9\u0398\u0001\u0000\u0000\u0000\u00bb\u039a" +
-                    "\u0001\u0000\u0000\u0000\u00bd\u039d\u0001\u0000\u0000\u0000\u00bf\u03a0" +
-                    "\u0001\u0000\u0000\u0000\u00c1\u03a3\u0001\u0000\u0000\u0000\u00c3\u03a6" +
-                    "\u0001\u0000\u0000\u0000\u00c5\u03a9\u0001\u0000\u0000\u0000\u00c7\u03ac" +
-                    "\u0001\u0000\u0000\u0000\u00c9\u03af\u0001\u0000\u0000\u0000\u00cb\u03b2" +
-                    "\u0001\u0000\u0000\u0000\u00cd\u03b4\u0001\u0000\u0000\u0000\u00cf\u03b6" +
-                    "\u0001\u0000\u0000\u0000\u00d1\u03b8\u0001\u0000\u0000\u0000\u00d3\u03ba" +
-                    "\u0001\u0000\u0000\u0000\u00d5\u03bc\u0001\u0000\u0000\u0000\u00d7\u03be" +
-                    "\u0001\u0000\u0000\u0000\u00d9\u03c0\u0001\u0000\u0000\u0000\u00db\u03c2" +
-                    "\u0001\u0000\u0000\u0000\u00dd\u03c5\u0001\u0000\u0000\u0000\u00df\u03c8" +
-                    "\u0001\u0000\u0000\u0000\u00e1\u03cb\u0001\u0000\u0000\u0000\u00e3\u03ce" +
-                    "\u0001\u0000\u0000\u0000\u00e5\u03d1\u0001\u0000\u0000\u0000\u00e7\u03d4" +
-                    "\u0001\u0000\u0000\u0000\u00e9\u03d7\u0001\u0000\u0000\u0000\u00eb\u03da" +
-                    "\u0001\u0000\u0000\u0000\u00ed\u03de\u0001\u0000\u0000\u0000\u00ef\u03e2" +
-                    "\u0001\u0000\u0000\u0000\u00f1\u03e7\u0001\u0000\u0000\u0000\u00f3\u03ea" +
-                    "\u0001\u0000\u0000\u0000\u00f5\u03ed\u0001\u0000\u0000\u0000\u00f7\u03ef" +
-                    "\u0001\u0000\u0000\u0000\u00f9\u03f4\u0001\u0000\u0000\u0000\u00fb\u03fa" +
-                    "\u0001\u0000\u0000\u0000\u00fd\u0408\u0001\u0000\u0000\u0000\u00ff\u0413" +
-                    "\u0001\u0000\u0000\u0000\u0101\u041a\u0001\u0000\u0000\u0000\u0103\u0443" +
-                    "\u0001\u0000\u0000\u0000\u0105\u0445\u0001\u0000\u0000\u0000\u0107\u0450" +
-                    "\u0001\u0000\u0000\u0000\u0109\u0452\u0001\u0000\u0000\u0000\u010b\u045e" +
-                    "\u0001\u0000\u0000\u0000\u010d\u0464\u0001\u0000\u0000\u0000\u010f\u0110" +
-                    "\u0005a\u0000\u0000\u0110\u0111\u0005b\u0000\u0000\u0111\u0112\u0005s" +
-                    "\u0000\u0000\u0112\u0113\u0005t\u0000\u0000\u0113\u0114\u0005r\u0000\u0000" +
-                    "\u0114\u0115\u0005a\u0000\u0000\u0115\u0116\u0005c\u0000\u0000\u0116\u0117" +
-                    "\u0005t\u0000\u0000\u0117\u0002\u0001\u0000\u0000\u0000\u0118\u0119\u0005" +
-                    "a\u0000\u0000\u0119\u011a\u0005s\u0000\u0000\u011a\u011b\u0005s\u0000" +
-                    "\u0000\u011b\u011c\u0005e\u0000\u0000\u011c\u011d\u0005r\u0000\u0000\u011d" +
-                    "\u011e\u0005t\u0000\u0000\u011e\u0004\u0001\u0000\u0000\u0000\u011f\u0120" +
-                    "\u0005b\u0000\u0000\u0120\u0121\u0005o\u0000\u0000\u0121\u0122\u0005o" +
-                    "\u0000\u0000\u0122\u0123\u0005l\u0000\u0000\u0123\u0124\u0005e\u0000\u0000" +
-                    "\u0124\u0125\u0005a\u0000\u0000\u0125\u0126\u0005n\u0000\u0000\u0126\u0006" +
-                    "\u0001\u0000\u0000\u0000\u0127\u0128\u0005b\u0000\u0000\u0128\u0129\u0005" +
-                    "r\u0000\u0000\u0129\u012a\u0005e\u0000\u0000\u012a\u012b\u0005a\u0000" +
-                    "\u0000\u012b\u012c\u0005k\u0000\u0000\u012c\b\u0001\u0000\u0000\u0000" +
-                    "\u012d\u012e\u0005b\u0000\u0000\u012e\u012f\u0005y\u0000\u0000\u012f\u0130" +
-                    "\u0005t\u0000\u0000\u0130\u0131\u0005e\u0000\u0000\u0131\n\u0001\u0000" +
-                    "\u0000\u0000\u0132\u0133\u0005c\u0000\u0000\u0133\u0134\u0005a\u0000\u0000" +
-                    "\u0134\u0135\u0005s\u0000\u0000\u0135\u0136\u0005e\u0000\u0000\u0136\f" +
-                    "\u0001\u0000\u0000\u0000\u0137\u0138\u0005c\u0000\u0000\u0138\u0139\u0005" +
-                    "a\u0000\u0000\u0139\u013a\u0005t\u0000\u0000\u013a\u013b\u0005c\u0000" +
-                    "\u0000\u013b\u013c\u0005h\u0000\u0000\u013c\u000e\u0001\u0000\u0000\u0000" +
-                    "\u013d\u013e\u0005c\u0000\u0000\u013e\u013f\u0005h\u0000\u0000\u013f\u0140" +
-                    "\u0005a\u0000\u0000\u0140\u0141\u0005r\u0000\u0000\u0141\u0010\u0001\u0000" +
-                    "\u0000\u0000\u0142\u0143\u0005c\u0000\u0000\u0143\u0144\u0005l\u0000\u0000" +
-                    "\u0144\u0145\u0005a\u0000\u0000\u0145\u0146\u0005s\u0000\u0000\u0146\u0147" +
-                    "\u0005s\u0000\u0000\u0147\u0012\u0001\u0000\u0000\u0000\u0148\u0149\u0005" +
-                    "c\u0000\u0000\u0149\u014a\u0005o\u0000\u0000\u014a\u014b\u0005n\u0000" +
-                    "\u0000\u014b\u014c\u0005s\u0000\u0000\u014c\u014d\u0005t\u0000\u0000\u014d" +
-                    "\u0014\u0001\u0000\u0000\u0000\u014e\u014f\u0005c\u0000\u0000\u014f\u0150" +
-                    "\u0005o\u0000\u0000\u0150\u0151\u0005n\u0000\u0000\u0151\u0152\u0005t" +
-                    "\u0000\u0000\u0152\u0153\u0005i\u0000\u0000\u0153\u0154\u0005n\u0000\u0000" +
-                    "\u0154\u0155\u0005u\u0000\u0000\u0155\u0156\u0005e\u0000\u0000\u0156\u0016" +
-                    "\u0001\u0000\u0000\u0000\u0157\u0158\u0005d\u0000\u0000\u0158\u0159\u0005" +
-                    "e\u0000\u0000\u0159\u015a\u0005f\u0000\u0000\u015a\u015b\u0005a\u0000" +
-                    "\u0000\u015b\u015c\u0005u\u0000\u0000\u015c\u015d\u0005l\u0000\u0000\u015d" +
-                    "\u015e\u0005t\u0000\u0000\u015e\u0018\u0001\u0000\u0000\u0000\u015f\u0160" +
-                    "\u0005d\u0000\u0000\u0160\u0161\u0005o\u0000\u0000\u0161\u001a\u0001\u0000" +
-                    "\u0000\u0000\u0162\u0163\u0005d\u0000\u0000\u0163\u0164\u0005o\u0000\u0000" +
-                    "\u0164\u0165\u0005u\u0000\u0000\u0165\u0166\u0005b\u0000\u0000\u0166\u0167" +
-                    "\u0005l\u0000\u0000\u0167\u0168\u0005e\u0000\u0000\u0168\u001c\u0001\u0000" +
-                    "\u0000\u0000\u0169\u016a\u0005e\u0000\u0000\u016a\u016b\u0005l\u0000\u0000" +
-                    "\u016b\u016c\u0005s\u0000\u0000\u016c\u016d\u0005e\u0000\u0000\u016d\u001e" +
-                    "\u0001\u0000\u0000\u0000\u016e\u016f\u0005e\u0000\u0000\u016f\u0170\u0005" +
-                    "n\u0000\u0000\u0170\u0171\u0005u\u0000\u0000\u0171\u0172\u0005m\u0000" +
-                    "\u0000\u0172 \u0001\u0000\u0000\u0000\u0173\u0174\u0005e\u0000\u0000\u0174" +
-                    "\u0175\u0005x\u0000\u0000\u0175\u0176\u0005t\u0000\u0000\u0176\u0177\u0005" +
-                    "e\u0000\u0000\u0177\u0178\u0005n\u0000\u0000\u0178\u0179\u0005d\u0000" +
-                    "\u0000\u0179\u017a\u0005s\u0000\u0000\u017a\"\u0001\u0000\u0000\u0000" +
-                    "\u017b\u017c\u0005f\u0000\u0000\u017c\u017d\u0005i\u0000\u0000\u017d\u017e" +
-                    "\u0005n\u0000\u0000\u017e\u017f\u0005a\u0000\u0000\u017f\u0180\u0005l" +
-                    "\u0000\u0000\u0180$\u0001\u0000\u0000\u0000\u0181\u0182\u0005f\u0000\u0000" +
-                    "\u0182\u0183\u0005i\u0000\u0000\u0183\u0184\u0005n\u0000\u0000\u0184\u0185" +
-                    "\u0005a\u0000\u0000\u0185\u0186\u0005l\u0000\u0000\u0186\u0187\u0005l" +
-                    "\u0000\u0000\u0187\u0188\u0005y\u0000\u0000\u0188&\u0001\u0000\u0000\u0000" +
-                    "\u0189\u018a\u0005f\u0000\u0000\u018a\u018b\u0005l\u0000\u0000\u018b\u018c" +
-                    "\u0005o\u0000\u0000\u018c\u018d\u0005a\u0000\u0000\u018d\u018e\u0005t" +
-                    "\u0000\u0000\u018e(\u0001\u0000\u0000\u0000\u018f\u0190\u0005f\u0000\u0000" +
-                    "\u0190\u0191\u0005o\u0000\u0000\u0191\u0192\u0005r\u0000\u0000\u0192*" +
-                    "\u0001\u0000\u0000\u0000\u0193\u0194\u0005i\u0000\u0000\u0194\u0195\u0005" +
-                    "f\u0000\u0000\u0195,\u0001\u0000\u0000\u0000\u0196\u0197\u0005g\u0000" +
-                    "\u0000\u0197\u0198\u0005o\u0000\u0000\u0198\u0199\u0005t\u0000\u0000\u0199" +
-                    "\u019a\u0005o\u0000\u0000\u019a.\u0001\u0000\u0000\u0000\u019b\u019c\u0005" +
-                    "i\u0000\u0000\u019c\u019d\u0005m\u0000\u0000\u019d\u019e\u0005p\u0000" +
-                    "\u0000\u019e\u019f\u0005l\u0000\u0000\u019f\u01a0\u0005e\u0000\u0000\u01a0" +
-                    "\u01a1\u0005m\u0000\u0000\u01a1\u01a2\u0005e\u0000\u0000\u01a2\u01a3\u0005" +
-                    "n\u0000\u0000\u01a3\u01a4\u0005t\u0000\u0000\u01a4\u01a5\u0005s\u0000" +
-                    "\u0000\u01a50\u0001\u0000\u0000\u0000\u01a6\u01a7\u0005i\u0000\u0000\u01a7" +
-                    "\u01a8\u0005m\u0000\u0000\u01a8\u01a9\u0005p\u0000\u0000\u01a9\u01aa\u0005" +
-                    "o\u0000\u0000\u01aa\u01ab\u0005r\u0000\u0000\u01ab\u01ac\u0005t\u0000" +
-                    "\u0000\u01ac2\u0001\u0000\u0000\u0000\u01ad\u01ae\u0005i\u0000\u0000\u01ae" +
-                    "\u01af\u0005n\u0000\u0000\u01af\u01b0\u0005s\u0000\u0000\u01b0\u01b1\u0005" +
-                    "t\u0000\u0000\u01b1\u01b2\u0005a\u0000\u0000\u01b2\u01b3\u0005n\u0000" +
-                    "\u0000\u01b3\u01b4\u0005c\u0000\u0000\u01b4\u01b5\u0005e\u0000\u0000\u01b5" +
-                    "\u01b6\u0005o\u0000\u0000\u01b6\u01b7\u0005f\u0000\u0000\u01b74\u0001" +
-                    "\u0000\u0000\u0000\u01b8\u01b9\u0005i\u0000\u0000\u01b9\u01ba\u0005n\u0000" +
-                    "\u0000\u01ba\u01bb\u0005t\u0000\u0000\u01bb6\u0001\u0000\u0000\u0000\u01bc" +
-                    "\u01bd\u0005i\u0000\u0000\u01bd\u01be\u0005n\u0000\u0000\u01be\u01bf\u0005" +
-                    "t\u0000\u0000\u01bf\u01c0\u0005e\u0000\u0000\u01c0\u01c1\u0005r\u0000" +
-                    "\u0000\u01c1\u01c2\u0005f\u0000\u0000\u01c2\u01c3\u0005a\u0000\u0000\u01c3" +
-                    "\u01c4\u0005c\u0000\u0000\u01c4\u01c5\u0005e\u0000\u0000\u01c58\u0001" +
-                    "\u0000\u0000\u0000\u01c6\u01c7\u0005l\u0000\u0000\u01c7\u01c8\u0005o\u0000" +
-                    "\u0000\u01c8\u01c9\u0005n\u0000\u0000\u01c9\u01ca\u0005g\u0000\u0000\u01ca" +
-                    ":\u0001\u0000\u0000\u0000\u01cb\u01cc\u0005n\u0000\u0000\u01cc\u01cd\u0005" +
-                    "a\u0000\u0000\u01cd\u01ce\u0005t\u0000\u0000\u01ce\u01cf\u0005i\u0000" +
-                    "\u0000\u01cf\u01d0\u0005v\u0000\u0000\u01d0\u01d1\u0005e\u0000\u0000\u01d1" +
-                    "<\u0001\u0000\u0000\u0000\u01d2\u01d3\u0005n\u0000\u0000\u01d3\u01d4\u0005" +
-                    "e\u0000\u0000\u01d4\u01d5\u0005w\u0000\u0000\u01d5>\u0001\u0000\u0000" +
-                    "\u0000\u01d6\u01d7\u0005p\u0000\u0000\u01d7\u01d8\u0005a\u0000\u0000\u01d8" +
-                    "\u01d9\u0005c\u0000\u0000\u01d9\u01da\u0005k\u0000\u0000\u01da\u01db\u0005" +
-                    "a\u0000\u0000\u01db\u01dc\u0005g\u0000\u0000\u01dc\u01dd\u0005e\u0000" +
-                    "\u0000\u01dd@\u0001\u0000\u0000\u0000\u01de\u01df\u0005p\u0000\u0000\u01df" +
-                    "\u01e0\u0005r\u0000\u0000\u01e0\u01e1\u0005i\u0000\u0000\u01e1\u01e2\u0005" +
-                    "v\u0000\u0000\u01e2\u01e3\u0005a\u0000\u0000\u01e3\u01e4\u0005t\u0000" +
-                    "\u0000\u01e4\u01e5\u0005e\u0000\u0000\u01e5B\u0001\u0000\u0000\u0000\u01e6" +
-                    "\u01e7\u0005p\u0000\u0000\u01e7\u01e8\u0005r\u0000\u0000\u01e8\u01e9\u0005" +
-                    "o\u0000\u0000\u01e9\u01ea\u0005t\u0000\u0000\u01ea\u01eb\u0005e\u0000" +
-                    "\u0000\u01eb\u01ec\u0005c\u0000\u0000\u01ec\u01ed\u0005t\u0000\u0000\u01ed" +
-                    "\u01ee\u0005e\u0000\u0000\u01ee\u01ef\u0005d\u0000\u0000\u01efD\u0001" +
-                    "\u0000\u0000\u0000\u01f0\u01f1\u0005p\u0000\u0000\u01f1\u01f2\u0005u\u0000" +
-                    "\u0000\u01f2\u01f3\u0005b\u0000\u0000\u01f3\u01f4\u0005l\u0000\u0000\u01f4" +
-                    "\u01f5\u0005i\u0000\u0000\u01f5\u01f6\u0005c\u0000\u0000\u01f6F\u0001" +
-                    "\u0000\u0000\u0000\u01f7\u01f8\u0005r\u0000\u0000\u01f8\u01f9\u0005e\u0000" +
-                    "\u0000\u01f9\u01fa\u0005t\u0000\u0000\u01fa\u01fb\u0005u\u0000\u0000\u01fb" +
-                    "\u01fc\u0005r\u0000\u0000\u01fc\u01fd\u0005n\u0000\u0000\u01fdH\u0001" +
-                    "\u0000\u0000\u0000\u01fe\u01ff\u0005s\u0000\u0000\u01ff\u0200\u0005h\u0000" +
-                    "\u0000\u0200\u0201\u0005o\u0000\u0000\u0201\u0202\u0005r\u0000\u0000\u0202" +
-                    "\u0203\u0005t\u0000\u0000\u0203J\u0001\u0000\u0000\u0000\u0204\u0205\u0005" +
-                    "s\u0000\u0000\u0205\u0206\u0005t\u0000\u0000\u0206\u0207\u0005a\u0000" +
-                    "\u0000\u0207\u0208\u0005t\u0000\u0000\u0208\u0209\u0005i\u0000\u0000\u0209" +
-                    "\u020a\u0005c\u0000\u0000\u020aL\u0001\u0000\u0000\u0000\u020b\u020c\u0005" +
-                    "s\u0000\u0000\u020c\u020d\u0005t\u0000\u0000\u020d\u020e\u0005r\u0000" +
-                    "\u0000\u020e\u020f\u0005i\u0000\u0000\u020f\u0210\u0005c\u0000\u0000\u0210" +
-                    "\u0211\u0005t\u0000\u0000\u0211\u0212\u0005f\u0000\u0000\u0212\u0213\u0005" +
-                    "p\u0000\u0000\u0213N\u0001\u0000\u0000\u0000\u0214\u0215\u0005s\u0000" +
-                    "\u0000\u0215\u0216\u0005u\u0000\u0000\u0216\u0217\u0005p\u0000\u0000\u0217" +
-                    "\u0218\u0005e\u0000\u0000\u0218\u0219\u0005r\u0000\u0000\u0219P\u0001" +
-                    "\u0000\u0000\u0000\u021a\u021b\u0005s\u0000\u0000\u021b\u021c\u0005w\u0000" +
-                    "\u0000\u021c\u021d\u0005i\u0000\u0000\u021d\u021e\u0005t\u0000\u0000\u021e" +
-                    "\u021f\u0005c\u0000\u0000\u021f\u0220\u0005h\u0000\u0000\u0220R\u0001" +
-                    "\u0000\u0000\u0000\u0221\u0222\u0005s\u0000\u0000\u0222\u0223\u0005y\u0000" +
-                    "\u0000\u0223\u0224\u0005n\u0000\u0000\u0224\u0225\u0005c\u0000\u0000\u0225" +
-                    "\u0226\u0005h\u0000\u0000\u0226\u0227\u0005r\u0000\u0000\u0227\u0228\u0005" +
-                    "o\u0000\u0000\u0228\u0229\u0005n\u0000\u0000\u0229\u022a\u0005i\u0000" +
-                    "\u0000\u022a\u022b\u0005z\u0000\u0000\u022b\u022c\u0005e\u0000\u0000\u022c" +
-                    "\u022d\u0005d\u0000\u0000\u022dT\u0001\u0000\u0000\u0000\u022e\u022f\u0005" +
-                    "t\u0000\u0000\u022f\u0230\u0005h\u0000\u0000\u0230\u0231\u0005i\u0000" +
-                    "\u0000\u0231\u0232\u0005s\u0000\u0000\u0232V\u0001\u0000\u0000\u0000\u0233" +
-                    "\u0234\u0005t\u0000\u0000\u0234\u0235\u0005h\u0000\u0000\u0235\u0236\u0005" +
-                    "r\u0000\u0000\u0236\u0237\u0005o\u0000\u0000\u0237\u0238\u0005w\u0000" +
-                    "\u0000\u0238X\u0001\u0000\u0000\u0000\u0239\u023a\u0005t\u0000\u0000\u023a" +
-                    "\u023b\u0005h\u0000\u0000\u023b\u023c\u0005r\u0000\u0000\u023c\u023d\u0005" +
-                    "o\u0000\u0000\u023d\u023e\u0005w\u0000\u0000\u023e\u023f\u0005s\u0000" +
-                    "\u0000\u023fZ\u0001\u0000\u0000\u0000\u0240\u0241\u0005t\u0000\u0000\u0241" +
-                    "\u0242\u0005r\u0000\u0000\u0242\u0243\u0005a\u0000\u0000\u0243\u0244\u0005" +
-                    "n\u0000\u0000\u0244\u0245\u0005s\u0000\u0000\u0245\u0246\u0005i\u0000" +
-                    "\u0000\u0246\u0247\u0005e\u0000\u0000\u0247\u0248\u0005n\u0000\u0000\u0248" +
-                    "\u0249\u0005t\u0000\u0000\u0249\\\u0001\u0000\u0000\u0000\u024a\u024b" +
-                    "\u0005t\u0000\u0000\u024b\u024c\u0005r\u0000\u0000\u024c\u024d\u0005y" +
-                    "\u0000\u0000\u024d^\u0001\u0000\u0000\u0000\u024e\u024f\u0005v\u0000\u0000" +
-                    "\u024f\u0250\u0005o\u0000\u0000\u0250\u0251\u0005i\u0000\u0000\u0251\u0252" +
-                    "\u0005d\u0000\u0000\u0252`\u0001\u0000\u0000\u0000\u0253\u0254\u0005v" +
-                    "\u0000\u0000\u0254\u0255\u0005o\u0000\u0000\u0255\u0256\u0005l\u0000\u0000" +
-                    "\u0256\u0257\u0005a\u0000\u0000\u0257\u0258\u0005t\u0000\u0000\u0258\u0259" +
-                    "\u0005i\u0000\u0000\u0259\u025a\u0005l\u0000\u0000\u025a\u025b\u0005e" +
-                    "\u0000\u0000\u025bb\u0001\u0000\u0000\u0000\u025c\u025d\u0005w\u0000\u0000" +
-                    "\u025d\u025e\u0005h\u0000\u0000\u025e\u025f\u0005i\u0000\u0000\u025f\u0260" +
-                    "\u0005l\u0000\u0000\u0260\u0261\u0005e\u0000\u0000\u0261d\u0001\u0000" +
-                    "\u0000\u0000\u0262\u0263\u0005m\u0000\u0000\u0263\u0264\u0005o\u0000\u0000" +
-                    "\u0264\u0265\u0005d\u0000\u0000\u0265\u0266\u0005u\u0000\u0000\u0266\u0267" +
-                    "\u0005l\u0000\u0000\u0267\u0268\u0005e\u0000\u0000\u0268f\u0001\u0000" +
-                    "\u0000\u0000\u0269\u026a\u0005o\u0000\u0000\u026a\u026b\u0005p\u0000\u0000" +
-                    "\u026b\u026c\u0005e\u0000\u0000\u026c\u026d\u0005n\u0000\u0000\u026dh" +
-                    "\u0001\u0000\u0000\u0000\u026e\u026f\u0005r\u0000\u0000\u026f\u0270\u0005" +
-                    "e\u0000\u0000\u0270\u0271\u0005q\u0000\u0000\u0271\u0272\u0005u\u0000" +
-                    "\u0000\u0272\u0273\u0005i\u0000\u0000\u0273\u0274\u0005r\u0000\u0000\u0274" +
-                    "\u0275\u0005e\u0000\u0000\u0275\u0276\u0005s\u0000\u0000\u0276j\u0001" +
-                    "\u0000\u0000\u0000\u0277\u0278\u0005e\u0000\u0000\u0278\u0279\u0005x\u0000" +
-                    "\u0000\u0279\u027a\u0005p\u0000\u0000\u027a\u027b\u0005o\u0000\u0000\u027b" +
-                    "\u027c\u0005r\u0000\u0000\u027c\u027d\u0005t\u0000\u0000\u027d\u027e\u0005" +
-                    "s\u0000\u0000\u027el\u0001\u0000\u0000\u0000\u027f\u0280\u0005o\u0000" +
-                    "\u0000\u0280\u0281\u0005p\u0000\u0000\u0281\u0282\u0005e\u0000\u0000\u0282" +
-                    "\u0283\u0005n\u0000\u0000\u0283\u0284\u0005s\u0000\u0000\u0284n\u0001" +
-                    "\u0000\u0000\u0000\u0285\u0286\u0005t\u0000\u0000\u0286\u0287\u0005o\u0000" +
-                    "\u0000\u0287p\u0001\u0000\u0000\u0000\u0288\u0289\u0005u\u0000\u0000\u0289" +
-                    "\u028a\u0005s\u0000\u0000\u028a\u028b\u0005e\u0000\u0000\u028b\u028c\u0005" +
-                    "s\u0000\u0000\u028cr\u0001\u0000\u0000\u0000\u028d\u028e\u0005p\u0000" +
-                    "\u0000\u028e\u028f\u0005r\u0000\u0000\u028f\u0290\u0005o\u0000\u0000\u0290" +
-                    "\u0291\u0005v\u0000\u0000\u0291\u0292\u0005i\u0000\u0000\u0292\u0293\u0005" +
-                    "d\u0000\u0000\u0293\u0294\u0005e\u0000\u0000\u0294\u0295\u0005s\u0000" +
-                    "\u0000\u0295t\u0001\u0000\u0000\u0000\u0296\u0297\u0005w\u0000\u0000\u0297" +
-                    "\u0298\u0005i\u0000\u0000\u0298\u0299\u0005t\u0000\u0000\u0299\u029a\u0005" +
-                    "h\u0000\u0000\u029av\u0001\u0000\u0000\u0000\u029b\u029c\u0005t\u0000" +
-                    "\u0000\u029c\u029d\u0005r\u0000\u0000\u029d\u029e\u0005a\u0000\u0000\u029e" +
-                    "\u029f\u0005n\u0000\u0000\u029f\u02a0\u0005s\u0000\u0000\u02a0\u02a1\u0005" +
-                    "i\u0000\u0000\u02a1\u02a2\u0005t\u0000\u0000\u02a2\u02a3\u0005i\u0000" +
-                    "\u0000\u02a3\u02a4\u0005v\u0000\u0000\u02a4\u02a5\u0005e\u0000\u0000\u02a5" +
-                    "x\u0001\u0000\u0000\u0000\u02a6\u02a7\u0005v\u0000\u0000\u02a7\u02a8\u0005" +
-                    "a\u0000\u0000\u02a8\u02a9\u0005r\u0000\u0000\u02a9z\u0001\u0000\u0000" +
-                    "\u0000\u02aa\u02ab\u0005y\u0000\u0000\u02ab\u02ac\u0005i\u0000\u0000\u02ac" +
-                    "\u02ad\u0005e\u0000\u0000\u02ad\u02ae\u0005l\u0000\u0000\u02ae\u02af\u0005" +
-                    "d\u0000\u0000\u02af|\u0001\u0000\u0000\u0000\u02b0\u02b1\u0005r\u0000" +
-                    "\u0000\u02b1\u02b2\u0005e\u0000\u0000\u02b2\u02b3\u0005c\u0000\u0000\u02b3" +
-                    "\u02b4\u0005o\u0000\u0000\u02b4\u02b5\u0005r\u0000\u0000\u02b5\u02b6\u0005" +
-                    "d\u0000\u0000\u02b6~\u0001\u0000\u0000\u0000\u02b7\u02b8\u0005s\u0000" +
-                    "\u0000\u02b8\u02b9\u0005e\u0000\u0000\u02b9\u02ba\u0005a\u0000\u0000\u02ba" +
-                    "\u02bb\u0005l\u0000\u0000\u02bb\u02bc\u0005e\u0000\u0000\u02bc\u02bd\u0005" +
-                    "d\u0000\u0000\u02bd\u0080\u0001\u0000\u0000\u0000\u02be\u02bf\u0005p\u0000" +
-                    "\u0000\u02bf\u02c0\u0005e\u0000\u0000\u02c0\u02c1\u0005r\u0000\u0000\u02c1" +
-                    "\u02c2\u0005m\u0000\u0000\u02c2\u02c3\u0005i\u0000\u0000\u02c3\u02c4\u0005" +
-                    "t\u0000\u0000\u02c4\u02c5\u0005s\u0000\u0000\u02c5\u0082\u0001\u0000\u0000" +
-                    "\u0000\u02c6\u02c7\u0005n\u0000\u0000\u02c7\u02c8\u0005o\u0000\u0000\u02c8" +
-                    "\u02c9\u0005n\u0000\u0000\u02c9\u02ca\u0005-\u0000\u0000\u02ca\u02cb\u0005" +
-                    "s\u0000\u0000\u02cb\u02cc\u0005e\u0000\u0000\u02cc\u02cd\u0005a\u0000" +
-                    "\u0000\u02cd\u02ce\u0005l\u0000\u0000\u02ce\u02cf\u0005e\u0000\u0000\u02cf" +
-                    "\u02d0\u0005d\u0000\u0000\u02d0\u0084\u0001\u0000\u0000\u0000\u02d1\u02df" +
-                    "\u00050\u0000\u0000\u02d2\u02dc\u0007\u0000\u0000\u0000\u02d3\u02d5\u0003" +
-                    "\u0109\u0084\u0000\u02d4\u02d3\u0001\u0000\u0000\u0000\u02d4\u02d5\u0001" +
-                    "\u0000\u0000\u0000\u02d5\u02dd\u0001\u0000\u0000\u0000\u02d6\u02d8\u0005" +
-                    "_\u0000\u0000\u02d7\u02d6\u0001\u0000\u0000\u0000\u02d8\u02d9\u0001\u0000" +
-                    "\u0000\u0000\u02d9\u02d7\u0001\u0000\u0000\u0000\u02d9\u02da\u0001\u0000" +
-                    "\u0000\u0000\u02da\u02db\u0001\u0000\u0000\u0000\u02db\u02dd\u0003\u0109" +
-                    "\u0084\u0000\u02dc\u02d4\u0001\u0000\u0000\u0000\u02dc\u02d7\u0001\u0000" +
-                    "\u0000\u0000\u02dd\u02df\u0001\u0000\u0000\u0000\u02de\u02d1\u0001\u0000" +
-                    "\u0000\u0000\u02de\u02d2\u0001\u0000\u0000\u0000\u02df\u02e1\u0001\u0000" +
-                    "\u0000\u0000\u02e0\u02e2\u0007\u0001\u0000\u0000\u02e1\u02e0\u0001\u0000" +
-                    "\u0000\u0000\u02e1\u02e2\u0001\u0000\u0000\u0000\u02e2\u0086\u0001\u0000" +
-                    "\u0000\u0000\u02e3\u02e4\u00050\u0000\u0000\u02e4\u02e5\u0007\u0002\u0000" +
-                    "\u0000\u02e5\u02ed\u0007\u0003\u0000\u0000\u02e6\u02e8\u0007\u0004\u0000" +
-                    "\u0000\u02e7\u02e6\u0001\u0000\u0000\u0000\u02e8\u02eb\u0001\u0000\u0000" +
-                    "\u0000\u02e9\u02e7\u0001\u0000\u0000\u0000\u02e9\u02ea\u0001\u0000\u0000" +
-                    "\u0000\u02ea\u02ec\u0001\u0000\u0000\u0000\u02eb\u02e9\u0001\u0000\u0000" +
-                    "\u0000\u02ec\u02ee\u0007\u0003\u0000\u0000\u02ed\u02e9\u0001\u0000\u0000" +
-                    "\u0000\u02ed\u02ee\u0001\u0000\u0000\u0000\u02ee\u02f0\u0001\u0000\u0000" +
-                    "\u0000\u02ef\u02f1\u0007\u0001\u0000\u0000\u02f0\u02ef\u0001\u0000\u0000" +
-                    "\u0000\u02f0\u02f1\u0001\u0000\u0000\u0000\u02f1\u0088\u0001\u0000\u0000" +
-                    "\u0000\u02f2\u02f6\u00050\u0000\u0000\u02f3\u02f5\u0005_\u0000\u0000\u02f4" +
-                    "\u02f3\u0001\u0000\u0000\u0000\u02f5\u02f8\u0001\u0000\u0000\u0000\u02f6" +
-                    "\u02f4\u0001\u0000\u0000\u0000\u02f6\u02f7\u0001\u0000\u0000\u0000\u02f7" +
-                    "\u02f9\u0001\u0000\u0000\u0000\u02f8\u02f6\u0001\u0000\u0000\u0000\u02f9" +
-                    "\u0301\u0007\u0005\u0000\u0000\u02fa\u02fc\u0007\u0006\u0000\u0000\u02fb" +
-                    "\u02fa\u0001\u0000\u0000\u0000\u02fc\u02ff\u0001\u0000\u0000\u0000\u02fd" +
-                    "\u02fb\u0001\u0000\u0000\u0000\u02fd\u02fe\u0001\u0000\u0000\u0000\u02fe" +
-                    "\u0300\u0001\u0000\u0000\u0000\u02ff\u02fd\u0001\u0000\u0000\u0000\u0300" +
-                    "\u0302\u0007\u0005\u0000\u0000\u0301\u02fd\u0001\u0000\u0000\u0000\u0301" +
-                    "\u0302\u0001\u0000\u0000\u0000\u0302\u0304\u0001\u0000\u0000\u0000\u0303" +
-                    "\u0305\u0007\u0001\u0000\u0000\u0304\u0303\u0001\u0000\u0000\u0000\u0304" +
-                    "\u0305\u0001\u0000\u0000\u0000\u0305\u008a\u0001\u0000\u0000\u0000\u0306" +
-                    "\u0307\u00050\u0000\u0000\u0307\u0308\u0007\u0007\u0000\u0000\u0308\u0310" +
-                    "\u0007\b\u0000\u0000\u0309\u030b\u0007\t\u0000\u0000\u030a\u0309\u0001" +
-                    "\u0000\u0000\u0000\u030b\u030e\u0001\u0000\u0000\u0000\u030c\u030a\u0001" +
-                    "\u0000\u0000\u0000\u030c\u030d\u0001\u0000\u0000\u0000\u030d\u030f\u0001" +
-                    "\u0000\u0000\u0000\u030e\u030c\u0001\u0000\u0000\u0000\u030f\u0311\u0007" +
-                    "\b\u0000\u0000\u0310\u030c\u0001\u0000\u0000\u0000\u0310\u0311\u0001\u0000" +
-                    "\u0000\u0000\u0311\u0313\u0001\u0000\u0000\u0000\u0312\u0314\u0007\u0001" +
-                    "\u0000\u0000\u0313\u0312\u0001\u0000\u0000\u0000\u0313\u0314\u0001\u0000" +
-                    "\u0000\u0000\u0314\u008c\u0001\u0000\u0000\u0000\u0315\u0316\u0003\u0109" +
-                    "\u0084\u0000\u0316\u0318\u0005.\u0000\u0000\u0317\u0319\u0003\u0109\u0084" +
-                    "\u0000\u0318\u0317\u0001\u0000\u0000\u0000\u0318\u0319\u0001\u0000\u0000" +
-                    "\u0000\u0319\u031d\u0001\u0000\u0000\u0000\u031a\u031b\u0005.\u0000\u0000" +
-                    "\u031b\u031d\u0003\u0109\u0084\u0000\u031c\u0315\u0001\u0000\u0000\u0000" +
-                    "\u031c\u031a\u0001\u0000\u0000\u0000\u031d\u031f\u0001\u0000\u0000\u0000" +
-                    "\u031e\u0320\u0003\u0101\u0080\u0000\u031f\u031e\u0001\u0000\u0000\u0000" +
-                    "\u031f\u0320\u0001\u0000\u0000\u0000\u0320\u0322\u0001\u0000\u0000\u0000" +
-                    "\u0321\u0323\u0007\n\u0000\u0000\u0322\u0321\u0001\u0000\u0000\u0000\u0322" +
-                    "\u0323\u0001\u0000\u0000\u0000\u0323\u032d\u0001\u0000\u0000\u0000\u0324" +
-                    "\u032a\u0003\u0109\u0084\u0000\u0325\u0327\u0003\u0101\u0080\u0000\u0326" +
-                    "\u0328\u0007\n\u0000\u0000\u0327\u0326\u0001\u0000\u0000\u0000\u0327\u0328" +
-                    "\u0001\u0000\u0000\u0000\u0328\u032b\u0001\u0000\u0000\u0000\u0329\u032b" +
-                    "\u0007\n\u0000\u0000\u032a\u0325\u0001\u0000\u0000\u0000\u032a\u0329\u0001" +
-                    "\u0000\u0000\u0000\u032b\u032d\u0001\u0000\u0000\u0000\u032c\u031c\u0001" +
-                    "\u0000\u0000\u0000\u032c\u0324\u0001\u0000\u0000\u0000\u032d\u008e\u0001" +
-                    "\u0000\u0000\u0000\u032e\u032f\u00050\u0000\u0000\u032f\u0339\u0007\u0002" +
-                    "\u0000\u0000\u0330\u0332\u0003\u0105\u0082\u0000\u0331\u0333\u0005.\u0000" +
-                    "\u0000\u0332\u0331\u0001\u0000\u0000\u0000\u0332\u0333\u0001\u0000\u0000" +
-                    "\u0000\u0333\u033a\u0001\u0000\u0000\u0000\u0334\u0336\u0003\u0105\u0082" +
-                    "\u0000\u0335\u0334\u0001\u0000\u0000\u0000\u0335\u0336\u0001\u0000\u0000" +
-                    "\u0000\u0336\u0337\u0001\u0000\u0000\u0000\u0337\u0338\u0005.\u0000\u0000" +
-                    "\u0338\u033a\u0003\u0105\u0082\u0000\u0339\u0330\u0001\u0000\u0000\u0000" +
-                    "\u0339\u0335\u0001\u0000\u0000\u0000\u033a\u033b\u0001\u0000\u0000\u0000" +
-                    "\u033b\u033d\u0007\u000b\u0000\u0000\u033c\u033e\u0007\f\u0000\u0000\u033d" +
-                    "\u033c\u0001\u0000\u0000\u0000\u033d\u033e\u0001\u0000\u0000\u0000\u033e" +
-                    "\u033f\u0001\u0000\u0000\u0000\u033f\u0341\u0003\u0109\u0084\u0000\u0340" +
-                    "\u0342\u0007\n\u0000\u0000\u0341\u0340\u0001\u0000\u0000\u0000\u0341\u0342" +
-                    "\u0001\u0000\u0000\u0000\u0342\u0090\u0001\u0000\u0000\u0000\u0343\u0344" +
-                    "\u0005t\u0000\u0000\u0344\u0345\u0005r\u0000\u0000\u0345\u0346\u0005u" +
-                    "\u0000\u0000\u0346\u034d\u0005e\u0000\u0000\u0347\u0348\u0005f\u0000\u0000" +
-                    "\u0348\u0349\u0005a\u0000\u0000\u0349\u034a\u0005l\u0000\u0000\u034a\u034b" +
-                    "\u0005s\u0000\u0000\u034b\u034d\u0005e\u0000\u0000\u034c\u0343\u0001\u0000" +
-                    "\u0000\u0000\u034c\u0347\u0001\u0000\u0000\u0000\u034d\u0092\u0001\u0000" +
-                    "\u0000\u0000\u034e\u0351\u0005\'\u0000\u0000\u034f\u0352\b\r\u0000\u0000" +
-                    "\u0350\u0352\u0003\u0103\u0081\u0000\u0351\u034f\u0001\u0000\u0000\u0000" +
-                    "\u0351\u0350\u0001\u0000\u0000\u0000\u0352\u0353\u0001\u0000\u0000\u0000" +
-                    "\u0353\u0354\u0005\'\u0000\u0000\u0354\u0094\u0001\u0000\u0000\u0000\u0355" +
-                    "\u035a\u0005\"\u0000\u0000\u0356\u0359\b\u000e\u0000\u0000\u0357\u0359" +
-                    "\u0003\u0103\u0081\u0000\u0358\u0356\u0001\u0000\u0000\u0000\u0358\u0357" +
-                    "\u0001\u0000\u0000\u0000\u0359\u035c\u0001\u0000\u0000\u0000\u035a\u0358" +
-                    "\u0001\u0000\u0000\u0000\u035a\u035b\u0001\u0000\u0000\u0000\u035b\u035d" +
-                    "\u0001\u0000\u0000\u0000\u035c\u035a\u0001\u0000\u0000\u0000\u035d\u035e" +
-                    "\u0005\"\u0000\u0000\u035e\u0096\u0001\u0000\u0000\u0000\u035f\u0360\u0005" +
-                    "\"\u0000\u0000\u0360\u0361\u0005\"\u0000\u0000\u0361\u0362\u0005\"\u0000" +
-                    "\u0000\u0362\u0366\u0001\u0000\u0000\u0000\u0363\u0365\u0007\u000f\u0000" +
-                    "\u0000\u0364\u0363\u0001\u0000\u0000\u0000\u0365\u0368\u0001\u0000\u0000" +
-                    "\u0000\u0366\u0364\u0001\u0000\u0000\u0000\u0366\u0367\u0001\u0000\u0000" +
-                    "\u0000\u0367\u0369\u0001\u0000\u0000\u0000\u0368\u0366\u0001\u0000\u0000" +
-                    "\u0000\u0369\u036e\u0007\u0010\u0000\u0000\u036a\u036d\t\u0000\u0000\u0000" +
-                    "\u036b\u036d\u0003\u0103\u0081\u0000\u036c\u036a\u0001\u0000\u0000\u0000" +
-                    "\u036c\u036b\u0001\u0000\u0000\u0000\u036d\u0370\u0001\u0000\u0000\u0000" +
-                    "\u036e\u036f\u0001\u0000\u0000\u0000\u036e\u036c\u0001\u0000\u0000\u0000" +
-                    "\u036f\u0371\u0001\u0000\u0000\u0000\u0370\u036e\u0001\u0000\u0000\u0000" +
-                    "\u0371\u0372\u0005\"\u0000\u0000\u0372\u0373\u0005\"\u0000\u0000\u0373" +
-                    "\u0374\u0005\"\u0000\u0000\u0374\u0098\u0001\u0000\u0000\u0000\u0375\u0376" +
-                    "\u0005n\u0000\u0000\u0376\u0377\u0005u\u0000\u0000\u0377\u0378\u0005l" +
-                    "\u0000\u0000\u0378\u0379\u0005l\u0000\u0000\u0379\u009a\u0001\u0000\u0000" +
-                    "\u0000\u037a\u037b\u0005(\u0000\u0000\u037b\u009c\u0001\u0000\u0000\u0000" +
-                    "\u037c\u037d\u0005)\u0000\u0000\u037d\u009e\u0001\u0000\u0000\u0000\u037e" +
-                    "\u037f\u0005{\u0000\u0000\u037f\u00a0\u0001\u0000\u0000\u0000\u0380\u0381" +
-                    "\u0005}\u0000\u0000\u0381\u00a2\u0001\u0000\u0000\u0000\u0382\u0383\u0005" +
-                    "[\u0000\u0000\u0383\u00a4\u0001\u0000\u0000\u0000\u0384\u0385\u0005]\u0000" +
-                    "\u0000\u0385\u00a6\u0001\u0000\u0000\u0000\u0386\u0387\u0005;\u0000\u0000" +
-                    "\u0387\u00a8\u0001\u0000\u0000\u0000\u0388\u0389\u0005,\u0000\u0000\u0389" +
-                    "\u00aa\u0001\u0000\u0000\u0000\u038a\u038b\u0005.\u0000\u0000\u038b\u00ac" +
-                    "\u0001\u0000\u0000\u0000\u038c\u038d\u0005=\u0000\u0000\u038d\u00ae\u0001" +
-                    "\u0000\u0000\u0000\u038e\u038f\u0005>\u0000\u0000\u038f\u00b0\u0001\u0000" +
-                    "\u0000\u0000\u0390\u0391\u0005<\u0000\u0000\u0391\u00b2\u0001\u0000\u0000" +
-                    "\u0000\u0392\u0393\u0005!\u0000\u0000\u0393\u00b4\u0001\u0000\u0000\u0000" +
-                    "\u0394\u0395\u0005~\u0000\u0000\u0395\u00b6\u0001\u0000\u0000\u0000\u0396" +
-                    "\u0397\u0005?\u0000\u0000\u0397\u00b8\u0001\u0000\u0000\u0000\u0398\u0399" +
-                    "\u0005:\u0000\u0000\u0399\u00ba\u0001\u0000\u0000\u0000\u039a\u039b\u0005" +
-                    "=\u0000\u0000\u039b\u039c\u0005=\u0000\u0000\u039c\u00bc\u0001\u0000\u0000" +
-                    "\u0000\u039d\u039e\u0005<\u0000\u0000\u039e\u039f\u0005=\u0000\u0000\u039f" +
-                    "\u00be\u0001\u0000\u0000\u0000\u03a0\u03a1\u0005>\u0000\u0000\u03a1\u03a2" +
-                    "\u0005=\u0000\u0000\u03a2\u00c0\u0001\u0000\u0000\u0000\u03a3\u03a4\u0005" +
-                    "!\u0000\u0000\u03a4\u03a5\u0005=\u0000\u0000\u03a5\u00c2\u0001\u0000\u0000" +
-                    "\u0000\u03a6\u03a7\u0005&\u0000\u0000\u03a7\u03a8\u0005&\u0000\u0000\u03a8" +
-                    "\u00c4\u0001\u0000\u0000\u0000\u03a9\u03aa\u0005|\u0000\u0000\u03aa\u03ab" +
-                    "\u0005|\u0000\u0000\u03ab\u00c6\u0001\u0000\u0000\u0000\u03ac\u03ad\u0005" +
-                    "+\u0000\u0000\u03ad\u03ae\u0005+\u0000\u0000\u03ae\u00c8\u0001\u0000\u0000" +
-                    "\u0000\u03af\u03b0\u0005-\u0000\u0000\u03b0\u03b1\u0005-\u0000\u0000\u03b1" +
-                    "\u00ca\u0001\u0000\u0000\u0000\u03b2\u03b3\u0005+\u0000\u0000\u03b3\u00cc" +
-                    "\u0001\u0000\u0000\u0000\u03b4\u03b5\u0005-\u0000\u0000\u03b5\u00ce\u0001" +
-                    "\u0000\u0000\u0000\u03b6\u03b7\u0005*\u0000\u0000\u03b7\u00d0\u0001\u0000" +
-                    "\u0000\u0000\u03b8\u03b9\u0005/\u0000\u0000\u03b9\u00d2\u0001\u0000\u0000" +
-                    "\u0000\u03ba\u03bb\u0005&\u0000\u0000\u03bb\u00d4\u0001\u0000\u0000\u0000" +
-                    "\u03bc\u03bd\u0005|\u0000\u0000\u03bd\u00d6\u0001\u0000\u0000\u0000\u03be" +
-                    "\u03bf\u0005^\u0000\u0000\u03bf\u00d8\u0001\u0000\u0000\u0000\u03c0\u03c1" +
-                    "\u0005%\u0000\u0000\u03c1\u00da\u0001\u0000\u0000\u0000\u03c2\u03c3\u0005" +
-                    "+\u0000\u0000\u03c3\u03c4\u0005=\u0000\u0000\u03c4\u00dc\u0001\u0000\u0000" +
-                    "\u0000\u03c5\u03c6\u0005-\u0000\u0000\u03c6\u03c7\u0005=\u0000\u0000\u03c7" +
-                    "\u00de\u0001\u0000\u0000\u0000\u03c8\u03c9\u0005*\u0000\u0000\u03c9\u03ca" +
-                    "\u0005=\u0000\u0000\u03ca\u00e0\u0001\u0000\u0000\u0000\u03cb\u03cc\u0005" +
-                    "/\u0000\u0000\u03cc\u03cd\u0005=\u0000\u0000\u03cd\u00e2\u0001\u0000\u0000" +
-                    "\u0000\u03ce\u03cf\u0005&\u0000\u0000\u03cf\u03d0\u0005=\u0000\u0000\u03d0" +
-                    "\u00e4\u0001\u0000\u0000\u0000\u03d1\u03d2\u0005|\u0000\u0000\u03d2\u03d3" +
-                    "\u0005=\u0000\u0000\u03d3\u00e6\u0001\u0000\u0000\u0000\u03d4\u03d5\u0005" +
-                    "^\u0000\u0000\u03d5\u03d6\u0005=\u0000\u0000\u03d6\u00e8\u0001\u0000\u0000" +
-                    "\u0000\u03d7\u03d8\u0005%\u0000\u0000\u03d8\u03d9\u0005=\u0000\u0000\u03d9" +
-                    "\u00ea\u0001\u0000\u0000\u0000\u03da\u03db\u0005<\u0000\u0000\u03db\u03dc" +
-                    "\u0005<\u0000\u0000\u03dc\u03dd\u0005=\u0000\u0000\u03dd\u00ec\u0001\u0000" +
-                    "\u0000\u0000\u03de\u03df\u0005>\u0000\u0000\u03df\u03e0\u0005>\u0000\u0000" +
-                    "\u03e0\u03e1\u0005=\u0000\u0000\u03e1\u00ee\u0001\u0000\u0000\u0000\u03e2" +
-                    "\u03e3\u0005>\u0000\u0000\u03e3\u03e4\u0005>\u0000\u0000\u03e4\u03e5\u0005" +
-                    ">\u0000\u0000\u03e5\u03e6\u0005=\u0000\u0000\u03e6\u00f0\u0001\u0000\u0000" +
-                    "\u0000\u03e7\u03e8\u0005-\u0000\u0000\u03e8\u03e9\u0005>\u0000\u0000\u03e9" +
-                    "\u00f2\u0001\u0000\u0000\u0000\u03ea\u03eb\u0005:\u0000\u0000\u03eb\u03ec" +
-                    "\u0005:\u0000\u0000\u03ec\u00f4\u0001\u0000\u0000\u0000\u03ed\u03ee\u0005" +
-                    "@\u0000\u0000\u03ee\u00f6\u0001\u0000\u0000\u0000\u03ef\u03f0\u0005.\u0000" +
-                    "\u0000\u03f0\u03f1\u0005.\u0000\u0000\u03f1\u03f2\u0005.\u0000\u0000\u03f2" +
-                    "\u00f8\u0001\u0000\u0000\u0000\u03f3\u03f5\u0007\u0011\u0000\u0000\u03f4" +
-                    "\u03f3\u0001\u0000\u0000\u0000\u03f5\u03f6\u0001\u0000\u0000\u0000\u03f6" +
-                    "\u03f4\u0001\u0000\u0000\u0000\u03f6\u03f7\u0001\u0000\u0000\u0000\u03f7" +
-                    "\u03f8\u0001\u0000\u0000\u0000\u03f8\u03f9\u0006|\u0000\u0000\u03f9\u00fa" +
-                    "\u0001\u0000\u0000\u0000\u03fa\u03fb\u0005/\u0000\u0000\u03fb\u03fc\u0005" +
-                    "*\u0000\u0000\u03fc\u0400\u0001\u0000\u0000\u0000\u03fd\u03ff\t\u0000" +
-                    "\u0000\u0000\u03fe\u03fd\u0001\u0000\u0000\u0000\u03ff\u0402\u0001\u0000" +
-                    "\u0000\u0000\u0400\u0401\u0001\u0000\u0000\u0000\u0400\u03fe\u0001\u0000" +
-                    "\u0000\u0000\u0401\u0403\u0001\u0000\u0000\u0000\u0402\u0400\u0001\u0000" +
-                    "\u0000\u0000\u0403\u0404\u0005*\u0000\u0000\u0404\u0405\u0005/\u0000\u0000" +
-                    "\u0405\u0406\u0001\u0000\u0000\u0000\u0406\u0407\u0006}\u0000\u0000\u0407" +
-                    "\u00fc\u0001\u0000\u0000\u0000\u0408\u0409\u0005/\u0000\u0000\u0409\u040a" +
-                    "\u0005/\u0000\u0000\u040a\u040e\u0001\u0000\u0000\u0000\u040b\u040d\b" +
-                    "\u0010\u0000\u0000\u040c\u040b\u0001\u0000\u0000\u0000\u040d\u0410\u0001" +
-                    "\u0000\u0000\u0000\u040e\u040c\u0001\u0000\u0000\u0000\u040e\u040f\u0001" +
-                    "\u0000\u0000\u0000\u040f\u0411\u0001\u0000\u0000\u0000\u0410\u040e\u0001" +
-                    "\u0000\u0000\u0000\u0411\u0412\u0006~\u0000\u0000\u0412\u00fe\u0001\u0000" +
-                    "\u0000\u0000\u0413\u0417\u0003\u010d\u0086\u0000\u0414\u0416\u0003\u010b" +
-                    "\u0085\u0000\u0415\u0414\u0001\u0000\u0000\u0000\u0416\u0419\u0001\u0000" +
-                    "\u0000\u0000\u0417\u0415\u0001\u0000\u0000\u0000\u0417\u0418\u0001\u0000" +
-                    "\u0000\u0000\u0418\u0100\u0001\u0000\u0000\u0000\u0419\u0417\u0001\u0000" +
-                    "\u0000\u0000\u041a\u041c\u0007\u0012\u0000\u0000\u041b\u041d\u0007\f\u0000" +
-                    "\u0000\u041c\u041b\u0001\u0000\u0000\u0000\u041c\u041d\u0001\u0000\u0000" +
-                    "\u0000\u041d\u041e\u0001\u0000\u0000\u0000\u041e\u041f\u0003\u0109\u0084" +
-                    "\u0000\u041f\u0102\u0001\u0000\u0000\u0000\u0420\u0426\u0005\\\u0000\u0000" +
-                    "\u0421\u0422\u0005u\u0000\u0000\u0422\u0423\u00050\u0000\u0000\u0423\u0424" +
-                    "\u00050\u0000\u0000\u0424\u0425\u00055\u0000\u0000\u0425\u0427\u0005c" +
-                    "\u0000\u0000\u0426\u0421\u0001\u0000\u0000\u0000\u0426\u0427\u0001\u0000" +
-                    "\u0000\u0000\u0427\u0428\u0001\u0000\u0000\u0000\u0428\u0444\u0007\u0013" +
-                    "\u0000\u0000\u0429\u042f\u0005\\\u0000\u0000\u042a\u042b\u0005u\u0000" +
-                    "\u0000\u042b\u042c\u00050\u0000\u0000\u042c\u042d\u00050\u0000\u0000\u042d" +
-                    "\u042e\u00055\u0000\u0000\u042e\u0430\u0005c\u0000\u0000\u042f\u042a\u0001" +
-                    "\u0000\u0000\u0000\u042f\u0430\u0001\u0000\u0000\u0000\u0430\u0435\u0001" +
-                    "\u0000\u0000\u0000\u0431\u0433\u0007\u0014\u0000\u0000\u0432\u0431\u0001" +
-                    "\u0000\u0000\u0000\u0432\u0433\u0001\u0000\u0000\u0000\u0433\u0434\u0001" +
-                    "\u0000\u0000\u0000\u0434\u0436\u0007\u0005\u0000\u0000\u0435\u0432\u0001" +
-                    "\u0000\u0000\u0000\u0435\u0436\u0001\u0000\u0000\u0000\u0436\u0437\u0001" +
-                    "\u0000\u0000\u0000\u0437\u0444\u0007\u0005\u0000\u0000\u0438\u043a\u0005" +
-                    "\\\u0000\u0000\u0439\u043b\u0005u\u0000\u0000\u043a\u0439\u0001\u0000" +
-                    "\u0000\u0000\u043b\u043c\u0001\u0000\u0000\u0000\u043c\u043a\u0001\u0000" +
-                    "\u0000\u0000\u043c\u043d\u0001\u0000\u0000\u0000\u043d\u043e\u0001\u0000" +
-                    "\u0000\u0000\u043e\u043f\u0003\u0107\u0083\u0000\u043f\u0440\u0003\u0107" +
-                    "\u0083\u0000\u0440\u0441\u0003\u0107\u0083\u0000\u0441\u0442\u0003\u0107" +
-                    "\u0083\u0000\u0442\u0444\u0001\u0000\u0000\u0000\u0443\u0420\u0001\u0000" +
-                    "\u0000\u0000\u0443\u0429\u0001\u0000\u0000\u0000\u0443\u0438\u0001\u0000" +
-                    "\u0000\u0000\u0444\u0104\u0001\u0000\u0000\u0000\u0445\u044e\u0003\u0107" +
-                    "\u0083\u0000\u0446\u0449\u0003\u0107\u0083\u0000\u0447\u0449\u0005_\u0000" +
-                    "\u0000\u0448\u0446\u0001\u0000\u0000\u0000\u0448\u0447\u0001\u0000\u0000" +
-                    "\u0000\u0449\u044c\u0001\u0000\u0000\u0000\u044a\u0448\u0001\u0000\u0000" +
-                    "\u0000\u044a\u044b\u0001\u0000\u0000\u0000\u044b\u044d\u0001\u0000\u0000" +
-                    "\u0000\u044c\u044a\u0001\u0000\u0000\u0000\u044d\u044f\u0003\u0107\u0083" +
-                    "\u0000\u044e\u044a\u0001\u0000\u0000\u0000\u044e\u044f\u0001\u0000\u0000" +
-                    "\u0000\u044f\u0106\u0001\u0000\u0000\u0000\u0450\u0451\u0007\u0003\u0000" +
-                    "\u0000\u0451\u0108\u0001\u0000\u0000\u0000\u0452\u045a\u0007\u0015\u0000" +
-                    "\u0000\u0453\u0455\u0007\u0016\u0000\u0000\u0454\u0453\u0001\u0000\u0000" +
-                    "\u0000\u0455\u0458\u0001\u0000\u0000\u0000\u0456\u0454\u0001\u0000\u0000" +
-                    "\u0000\u0456\u0457\u0001\u0000\u0000\u0000\u0457\u0459\u0001\u0000\u0000" +
-                    "\u0000\u0458\u0456\u0001\u0000\u0000\u0000\u0459\u045b\u0007\u0015\u0000" +
-                    "\u0000\u045a\u0456\u0001\u0000\u0000\u0000\u045a\u045b\u0001\u0000\u0000" +
-                    "\u0000\u045b\u010a\u0001\u0000\u0000\u0000\u045c\u045f\u0003\u010d\u0086" +
-                    "\u0000\u045d\u045f\u0007\u0015\u0000\u0000\u045e\u045c\u0001\u0000\u0000" +
-                    "\u0000\u045e\u045d\u0001\u0000\u0000\u0000\u045f\u010c\u0001\u0000\u0000" +
-                    "\u0000\u0460\u0465\u0007\u0017\u0000\u0000\u0461\u0465\b\u0018\u0000\u0000" +
-                    "\u0462\u0463\u0007\u0019\u0000\u0000\u0463\u0465\u0007\u001a\u0000\u0000" +
-                    "\u0464\u0460\u0001\u0000\u0000\u0000\u0464\u0461\u0001\u0000\u0000\u0000" +
-                    "\u0464\u0462\u0001\u0000\u0000\u0000\u0465\u010e\u0001\u0000\u0000\u0000" +
-                    "5\u0000\u02d4\u02d9\u02dc\u02de\u02e1\u02e9\u02ed\u02f0\u02f6\u02fd\u0301" +
-                    "\u0304\u030c\u0310\u0313\u0318\u031c\u031f\u0322\u0327\u032a\u032c\u0332" +
-                    "\u0335\u0339\u033d\u0341\u034c\u0351\u0358\u035a\u0366\u036c\u036e\u03f6" +
-                    "\u0400\u040e\u0417\u041c\u0426\u042f\u0432\u0435\u043c\u0443\u0448\u044a" +
-                    "\u044e\u0456\u045a\u045e\u0464\u0001\u0000\u0001\u0000";
-    public static final ATN _ATN =
-            new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-
-    static {
-        _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-        for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-            _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-        }
-    }
-}
\ No newline at end of file
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParser.g4 b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParser.g4
deleted file mode 100644
index bc249c8..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParser.g4
+++ /dev/null
@@ -1,780 +0,0 @@
-/*
- [The "BSD licence"]
- Copyright (c) 2013 Terence Parr, Sam Harwell
- Copyright (c) 2017 Ivan Kochurkin (upgrade to Java 8)
- Copyright (c) 2021 Michał Lorek (upgrade to Java 11)
- Copyright (c) 2022 Michał Lorek (upgrade to Java 17)
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-parser grammar JavaParser;
-
-options { tokenVocab=JavaLexer; }
-
-compilationUnit
-    : packageDeclaration? (importDeclaration | ';')* (typeDeclaration | ';')*
-    | moduleDeclaration EOF
-    ;
-
-packageDeclaration
-    : annotation* PACKAGE qualifiedName ';'
-    ;
-
-importDeclaration
-    : IMPORT STATIC? qualifiedName ('.' '*')? ';'
-    ;
-
-typeDeclaration
-    : classOrInterfaceModifier*
-      (classDeclaration | enumDeclaration | interfaceDeclaration | annotationTypeDeclaration | recordDeclaration)
-    ;
-
-modifier
-    : classOrInterfaceModifier
-    | NATIVE
-    | SYNCHRONIZED
-    | TRANSIENT
-    | VOLATILE
-    ;
-
-classOrInterfaceModifier
-    : annotation
-    | PUBLIC
-    | PROTECTED
-    | PRIVATE
-    | STATIC
-    | ABSTRACT
-    | FINAL    // FINAL for class only -- does not apply to interfaces
-    | STRICTFP
-    | SEALED // Java17
-    | NON_SEALED // Java17
-    ;
-
-variableModifier
-    : FINAL
-    | annotation
-    ;
-
-classDeclaration
-    : CLASS identifier typeParameters?
-      (EXTENDS typeType)?
-      (IMPLEMENTS typeList)?
-      (PERMITS typeList)? // Java17
-      classBody
-    ;
-
-typeParameters
-    : '<' typeParameter (',' typeParameter)* '>'
-    ;
-
-typeParameter
-    : annotation* identifier (EXTENDS annotation* typeBound)?
-    ;
-
-typeBound
-    : typeType ('&' typeType)*
-    ;
-
-enumDeclaration
-    : ENUM identifier (IMPLEMENTS typeList)? '{' enumConstants? ','? enumBodyDeclarations? '}'
-    ;
-
-enumConstants
-    : enumConstant (',' enumConstant)*
-    ;
-
-enumConstant
-    : annotation* identifier arguments? classBody?
-    ;
-
-enumBodyDeclarations
-    : ';' classBodyDeclaration*
-    ;
-
-interfaceDeclaration
-    : INTERFACE identifier typeParameters? (EXTENDS typeList)? (PERMITS typeList)? interfaceBody
-    ;
-
-classBody
-    : '{' classBodyDeclaration* '}'
-    ;
-
-interfaceBody
-    : '{' interfaceBodyDeclaration* '}'
-    ;
-
-classBodyDeclaration
-    : ';'
-    | STATIC? block
-    | modifier* memberDeclaration
-    ;
-
-memberDeclaration
-    : recordDeclaration //Java17
-    | methodDeclaration
-    | genericMethodDeclaration
-    | fieldDeclaration
-    | constructorDeclaration
-    | genericConstructorDeclaration
-    | interfaceDeclaration
-    | annotationTypeDeclaration
-    | classDeclaration
-    | enumDeclaration
-    ;
-
-/* We use rule this even for void methods which cannot have [] after parameters.
-   This simplifies grammar and we can consider void to be a type, which
-   renders the [] matching as a context-sensitive issue or a semantic check
-   for invalid return type after parsing.
- */
-methodDeclaration
-    : typeTypeOrVoid identifier formalParameters ('[' ']')*
-      (THROWS qualifiedNameList)?
-      methodBody
-    ;
-
-methodBody
-    : block
-    | ';'
-    ;
-
-typeTypeOrVoid
-    : typeType
-    | VOID
-    ;
-
-genericMethodDeclaration
-    : typeParameters methodDeclaration
-    ;
-
-genericConstructorDeclaration
-    : typeParameters constructorDeclaration
-    ;
-
-constructorDeclaration
-    : identifier formalParameters (THROWS qualifiedNameList)? constructorBody=block
-    ;
-
-compactConstructorDeclaration
-    : modifier* identifier constructorBody=block
-    ;
-
-fieldDeclaration
-    : typeType variableDeclarators ';'
-    ;
-
-interfaceBodyDeclaration
-    : modifier* interfaceMemberDeclaration
-    | ';'
-    ;
-
-interfaceMemberDeclaration
-    : recordDeclaration // Java17
-    | constDeclaration
-    | interfaceMethodDeclaration
-    | genericInterfaceMethodDeclaration
-    | interfaceDeclaration
-    | annotationTypeDeclaration
-    | classDeclaration
-    | enumDeclaration
-    ;
-
-constDeclaration
-    : typeType constantDeclarator (',' constantDeclarator)* ';'
-    ;
-
-constantDeclarator
-    : identifier ('[' ']')* '=' variableInitializer
-    ;
-
-// Early versions of Java allows brackets after the method name, eg.
-// public int[] return2DArray() [] { ... }
-// is the same as
-// public int[][] return2DArray() { ... }
-interfaceMethodDeclaration
-    : interfaceMethodModifier* interfaceCommonBodyDeclaration
-    ;
-
-// Java8
-interfaceMethodModifier
-    : annotation
-    | PUBLIC
-    | ABSTRACT
-    | DEFAULT
-    | STATIC
-    | STRICTFP
-    ;
-
-genericInterfaceMethodDeclaration
-    : interfaceMethodModifier* typeParameters interfaceCommonBodyDeclaration
-    ;
-
-interfaceCommonBodyDeclaration
-    : annotation* typeTypeOrVoid identifier formalParameters ('[' ']')* (THROWS qualifiedNameList)? methodBody
-    ;
-
-variableDeclarators
-    : variableDeclarator (',' variableDeclarator)*
-    ;
-
-variableDeclarator
-    : variableDeclaratorId ('=' variableInitializer)?
-    ;
-
-variableDeclaratorId
-    : identifier ('[' ']')*
-    ;
-
-variableInitializer
-    : arrayInitializer
-    | expression
-    ;
-
-arrayInitializer
-    : '{' (variableInitializer (',' variableInitializer)* ','? )? '}'
-    ;
-
-classOrInterfaceType
-    : (identifier typeArguments? '.')* typeIdentifier typeArguments?
-    ;
-
-typeArgument
-    : typeType
-    | annotation* '?' ((EXTENDS | SUPER) typeType)?
-    ;
-
-qualifiedNameList
-    : qualifiedName (',' qualifiedName)*
-    ;
-
-formalParameters
-    : '(' ( receiverParameter?
-          | receiverParameter (',' formalParameterList)?
-          | formalParameterList?
-          ) ')'
-    ;
-
-receiverParameter
-    : typeType (identifier '.')* THIS
-    ;
-
-formalParameterList
-    : formalParameter (',' formalParameter)* (',' lastFormalParameter)?
-    | lastFormalParameter
-    ;
-
-formalParameter
-    : variableModifier* typeType variableDeclaratorId
-    ;
-
-lastFormalParameter
-    : variableModifier* typeType annotation* '...' variableDeclaratorId
-    ;
-
-// local variable type inference
-lambdaLVTIList
-    : lambdaLVTIParameter (',' lambdaLVTIParameter)*
-    ;
-
-lambdaLVTIParameter
-    : variableModifier* VAR identifier
-    ;
-
-qualifiedName
-    : identifier ('.' identifier)*
-    ;
-
-literal
-    : integerLiteral
-    | floatLiteral
-    | CHAR_LITERAL
-    | STRING_LITERAL
-    | BOOL_LITERAL
-    | NULL_LITERAL
-    | TEXT_BLOCK // Java17
-    ;
-
-integerLiteral
-    : DECIMAL_LITERAL
-    | HEX_LITERAL
-    | OCT_LITERAL
-    | BINARY_LITERAL
-    ;
-
-floatLiteral
-    : FLOAT_LITERAL
-    | HEX_FLOAT_LITERAL
-    ;
-
-// ANNOTATIONS
-altAnnotationQualifiedName
-    : (identifier DOT)* '@' identifier
-    ;
-
-annotation
-    : ('@' qualifiedName | altAnnotationQualifiedName) ('(' ( elementValuePairs | elementValue )? ')')?
-    ;
-
-elementValuePairs
-    : elementValuePair (',' elementValuePair)*
-    ;
-
-elementValuePair
-    : identifier '=' elementValue
-    ;
-
-elementValue
-    : expression
-    | annotation
-    | elementValueArrayInitializer
-    ;
-
-elementValueArrayInitializer
-    : '{' (elementValue (',' elementValue)*)? ','? '}'
-    ;
-
-annotationTypeDeclaration
-    : '@' INTERFACE identifier annotationTypeBody
-    ;
-
-annotationTypeBody
-    : '{' annotationTypeElementDeclaration* '}'
-    ;
-
-annotationTypeElementDeclaration
-    : modifier* annotationTypeElementRest
-    | ';' // this is not allowed by the grammar, but apparently allowed by the actual compiler
-    ;
-
-annotationTypeElementRest
-    : typeType annotationMethodOrConstantRest ';'
-    | classDeclaration ';'?
-    | interfaceDeclaration ';'?
-    | enumDeclaration ';'?
-    | annotationTypeDeclaration ';'?
-    | recordDeclaration ';'? // Java17
-    ;
-
-annotationMethodOrConstantRest
-    : annotationMethodRest
-    | annotationConstantRest
-    ;
-
-annotationMethodRest
-    : identifier '(' ')' defaultValue?
-    ;
-
-annotationConstantRest
-    : variableDeclarators
-    ;
-
-defaultValue
-    : DEFAULT elementValue
-    ;
-
-// MODULES - Java9
-
-moduleDeclaration
-    : OPEN? MODULE qualifiedName moduleBody
-    ;
-
-moduleBody
-    : '{' moduleDirective* '}'
-    ;
-
-moduleDirective
-	: REQUIRES requiresModifier* qualifiedName ';'
-	| EXPORTS qualifiedName (TO qualifiedName)? ';'
-	| OPENS qualifiedName (TO qualifiedName)? ';'
-	| USES qualifiedName ';'
-	| PROVIDES qualifiedName WITH qualifiedName ';'
-	;
-
-requiresModifier
-	: TRANSITIVE
-	| STATIC
-	;
-
-// RECORDS - Java 17
-
-recordDeclaration
-    : RECORD identifier typeParameters? recordHeader
-      (IMPLEMENTS typeList)?
-      recordBody
-    ;
-
-recordHeader
-    : '(' recordComponentList? ')'
-    ;
-
-recordComponentList
-    : recordComponent (',' recordComponent)*
-    ;
-
-recordComponent
-    : typeType identifier
-    ;
-
-recordBody
-    : '{' (classBodyDeclaration | compactConstructorDeclaration)*  '}'
-    ;
-
-// STATEMENTS / BLOCKS
-
-block
-    : '{' blockStatement* '}'
-    ;
-
-blockStatement
-    : localVariableDeclaration ';'
-    | localTypeDeclaration
-    | statement
-    ;
-
-localVariableDeclaration
-    : variableModifier* (VAR identifier '=' expression | typeType variableDeclarators)
-    ;
-
-identifier
-    : IDENTIFIER
-    | MODULE
-    | OPEN
-    | REQUIRES
-    | EXPORTS
-    | OPENS
-    | TO
-    | USES
-    | PROVIDES
-    | WITH
-    | TRANSITIVE
-    | YIELD
-    | SEALED
-    | PERMITS
-    | RECORD
-    | VAR
-    ;
-
-typeIdentifier  // Identifiers that are not restricted for type declarations
-    : IDENTIFIER
-    | MODULE
-    | OPEN
-    | REQUIRES
-    | EXPORTS
-    | OPENS
-    | TO
-    | USES
-    | PROVIDES
-    | WITH
-    | TRANSITIVE
-    | SEALED
-    | PERMITS
-    | RECORD
-    ;
-
-localTypeDeclaration
-    : classOrInterfaceModifier*
-      (classDeclaration | interfaceDeclaration | recordDeclaration)
-    ;
-
-statement
-    : blockLabel=block
-    | ASSERT expression (':' expression)? ';'
-    | IF parExpression statement (ELSE statement)?
-    | FOR '(' forControl ')' statement
-    | WHILE parExpression statement
-    | DO statement WHILE parExpression ';'
-    | TRY block (catchClause+ finallyBlock? | finallyBlock)
-    | TRY resourceSpecification block catchClause* finallyBlock?
-    | SWITCH parExpression '{' switchBlockStatementGroup* switchLabel* '}'
-    | SYNCHRONIZED parExpression block
-    | RETURN expression? ';'
-    | THROW expression ';'
-    | BREAK identifier? ';'
-    | CONTINUE identifier? ';'
-    | YIELD expression ';' // Java17
-    | SEMI
-    | statementExpression=expression ';'
-    | switchExpression ';'? // Java17
-    | identifierLabel=identifier ':' statement
-    ;
-
-catchClause
-    : CATCH '(' variableModifier* catchType identifier ')' block
-    ;
-
-catchType
-    : qualifiedName ('|' qualifiedName)*
-    ;
-
-finallyBlock
-    : FINALLY block
-    ;
-
-resourceSpecification
-    : '(' resources ';'? ')'
-    ;
-
-resources
-    : resource (';' resource)*
-    ;
-
-resource
-    : variableModifier* ( classOrInterfaceType variableDeclaratorId | VAR identifier ) '=' expression
-    | qualifiedName
-    ;
-
-/** Matches cases then statements, both of which are mandatory.
- *  To handle empty cases at the end, we add switchLabel* to statement.
- */
-switchBlockStatementGroup
-    : switchLabel+ blockStatement+
-    ;
-
-switchLabel
-    : CASE (constantExpression=expression | enumConstantName=IDENTIFIER | typeType varName=identifier) ':'
-    | DEFAULT ':'
-    ;
-
-forControl
-    : enhancedForControl
-    | forInit? ';' expression? ';' forUpdate=expressionList?
-    ;
-
-forInit
-    : localVariableDeclaration
-    | expressionList
-    ;
-
-enhancedForControl
-    : variableModifier* (typeType | VAR) variableDeclaratorId ':' expression
-    ;
-
-// EXPRESSIONS
-
-parExpression
-    : '(' expression ')'
-    ;
-
-expressionList
-    : expression (',' expression)*
-    ;
-
-methodCall
-    : (identifier | THIS | SUPER) arguments
-    ;
-
-expression
-    // Expression order in accordance with https://introcs.cs.princeton.edu/java/11precedence/
-    // Level 16, Primary, array and member access
-    : primary
-    | expression '[' expression ']'
-    | expression bop='.'
-      (
-         identifier
-       | methodCall
-       | THIS
-       | NEW nonWildcardTypeArguments? innerCreator
-       | SUPER superSuffix
-       | explicitGenericInvocation
-      )
-    // Method calls and method references are part of primary, and hence level 16 precedence
-    | methodCall
-    | expression '::' typeArguments? identifier
-    | typeType '::' (typeArguments? identifier | NEW)
-    | classType '::' typeArguments? NEW
-
-    | switchExpression // Java17
-
-    // Level 15 Post-increment/decrement operators
-    | expression postfix=('++' | '--')
-
-    // Level 14, Unary operators
-    | prefix=('+'|'-'|'++'|'--'|'~'|'!') expression
-
-    // Level 13 Cast and object creation
-    | '(' annotation* typeType ('&' typeType)* ')' expression
-    | NEW creator
-
-    // Level 12 to 1, Remaining operators
-    | expression bop=('*'|'/'|'%') expression  // Level 12, Multiplicative operators
-    | expression bop=('+'|'-') expression  // Level 11, Additive operators
-    | expression ('<' '<' | '>' '>' '>' | '>' '>') expression  // Level 10, Shift operators
-    | expression bop=('<=' | '>=' | '>' | '<') expression  // Level 9, Relational operators
-    | expression bop=INSTANCEOF (typeType | pattern)
-    | expression bop=('==' | '!=') expression  // Level 8, Equality Operators
-    | expression bop='&' expression  // Level 7, Bitwise AND
-    | expression bop='^' expression  // Level 6, Bitwise XOR
-    | expression bop='|' expression  // Level 5, Bitwise OR
-    | expression bop='&&' expression  // Level 4, Logic AND
-    | expression bop='||' expression  // Level 3, Logic OR
-    | <assoc=right> expression bop='?' expression ':' expression  // Level 2, Ternary
-    // Level 1, Assignment
-    | <assoc=right> expression
-      bop=('=' | '+=' | '-=' | '*=' | '/=' | '&=' | '|=' | '^=' | '>>=' | '>>>=' | '<<=' | '%=')
-      expression
-
-    // Level 0, Lambda Expression
-    | lambdaExpression // Java8
-    ;
-
-// Java17
-pattern
-    : variableModifier* typeType annotation* identifier
-    ;
-
-// Java8
-lambdaExpression
-    : lambdaParameters '->' lambdaBody
-    ;
-
-// Java8
-lambdaParameters
-    : identifier
-    | '(' formalParameterList? ')'
-    | '(' identifier (',' identifier)* ')'
-    | '(' lambdaLVTIList? ')'
-    ;
-
-// Java8
-lambdaBody
-    : expression
-    | block
-    ;
-
-primary
-    : '(' expression ')'
-    | THIS
-    | SUPER
-    | literal
-    | identifier
-    | typeTypeOrVoid '.' CLASS
-    | nonWildcardTypeArguments (explicitGenericInvocationSuffix | THIS arguments)
-    ;
-
-// Java17
-switchExpression
-    : SWITCH parExpression '{' switchLabeledRule* '}'
-    ;
-
-// Java17
-switchLabeledRule
-    : CASE (expressionList | NULL_LITERAL | guardedPattern) (ARROW | COLON) switchRuleOutcome
-    | DEFAULT (ARROW | COLON) switchRuleOutcome
-    ;
-
-// Java17
-guardedPattern
-    : '(' guardedPattern ')'
-    | variableModifier* typeType annotation* identifier ('&&' expression)*
-    | guardedPattern '&&' expression
-    ;
-
-// Java17
-switchRuleOutcome
-    : block
-    | blockStatement*
-    ;
-
-classType
-    : (classOrInterfaceType '.')? annotation* identifier typeArguments?
-    ;
-
-creator
-    : nonWildcardTypeArguments? createdName classCreatorRest
-    | createdName arrayCreatorRest
-    ;
-
-createdName
-    : identifier typeArgumentsOrDiamond? ('.' identifier typeArgumentsOrDiamond?)*
-    | primitiveType
-    ;
-
-innerCreator
-    : identifier nonWildcardTypeArgumentsOrDiamond? classCreatorRest
-    ;
-
-arrayCreatorRest
-    : ('[' ']')+ arrayInitializer
-    | ('[' expression ']')+ ('[' ']')*
-    ;
-
-classCreatorRest
-    : arguments classBody?
-    ;
-
-explicitGenericInvocation
-    : nonWildcardTypeArguments explicitGenericInvocationSuffix
-    ;
-
-typeArgumentsOrDiamond
-    : '<' '>'
-    | typeArguments
-    ;
-
-nonWildcardTypeArgumentsOrDiamond
-    : '<' '>'
-    | nonWildcardTypeArguments
-    ;
-
-nonWildcardTypeArguments
-    : '<' typeList '>'
-    ;
-
-typeList
-    : typeType (',' typeType)*
-    ;
-
-typeType
-    : annotation* (classOrInterfaceType | primitiveType) (annotation* '[' ']')*
-    ;
-
-primitiveType
-    : BOOLEAN
-    | CHAR
-    | BYTE
-    | SHORT
-    | INT
-    | LONG
-    | FLOAT
-    | DOUBLE
-    ;
-
-typeArguments
-    : '<' typeArgument (',' typeArgument)* '>'
-    ;
-
-superSuffix
-    : arguments
-    | '.' typeArguments? identifier arguments?
-    ;
-
-explicitGenericInvocationSuffix
-    : SUPER superSuffix
-    | identifier arguments
-    ;
-
-arguments
-    : '(' expressionList? ')'
-    ;
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParser.java b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParser.java
deleted file mode 100644
index 3557f0a..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParser.java
+++ /dev/null
@@ -1,13182 +0,0 @@
-// Generated from C:/Users/weg20/StudioProjects/apkide/openapi/src/main/java/com/apkide/openapi/language/java\JavaParser.g4
-package com.apkide.openapi.language.java.ast;
-
-
-import org.antlr.v4.runtime.FailedPredicateException;
-import org.antlr.v4.runtime.NoViableAltException;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.RuleContext;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.ParserATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
-import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-import java.util.List;
-
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
-public class JavaParser extends Parser {
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	public static final int
-		ABSTRACT=1, ASSERT=2, BOOLEAN=3, BREAK=4, BYTE=5, CASE=6, CATCH=7, CHAR=8, 
-		CLASS=9, CONST=10, CONTINUE=11, DEFAULT=12, DO=13, DOUBLE=14, ELSE=15, 
-		ENUM=16, EXTENDS=17, FINAL=18, FINALLY=19, FLOAT=20, FOR=21, IF=22, GOTO=23, 
-		IMPLEMENTS=24, IMPORT=25, INSTANCEOF=26, INT=27, INTERFACE=28, LONG=29, 
-		NATIVE=30, NEW=31, PACKAGE=32, PRIVATE=33, PROTECTED=34, PUBLIC=35, RETURN=36, 
-		SHORT=37, STATIC=38, STRICTFP=39, SUPER=40, SWITCH=41, SYNCHRONIZED=42, 
-		THIS=43, THROW=44, THROWS=45, TRANSIENT=46, TRY=47, VOID=48, VOLATILE=49, 
-		WHILE=50, MODULE=51, OPEN=52, REQUIRES=53, EXPORTS=54, OPENS=55, TO=56, 
-		USES=57, PROVIDES=58, WITH=59, TRANSITIVE=60, VAR=61, YIELD=62, RECORD=63, 
-		SEALED=64, PERMITS=65, NON_SEALED=66, DECIMAL_LITERAL=67, HEX_LITERAL=68, 
-		OCT_LITERAL=69, BINARY_LITERAL=70, FLOAT_LITERAL=71, HEX_FLOAT_LITERAL=72, 
-		BOOL_LITERAL=73, CHAR_LITERAL=74, STRING_LITERAL=75, TEXT_BLOCK=76, NULL_LITERAL=77, 
-		LPAREN=78, RPAREN=79, LBRACE=80, RBRACE=81, LBRACK=82, RBRACK=83, SEMI=84, 
-		COMMA=85, DOT=86, ASSIGN=87, GT=88, LT=89, BANG=90, TILDE=91, QUESTION=92, 
-		COLON=93, EQUAL=94, LE=95, GE=96, NOTEQUAL=97, AND=98, OR=99, INC=100, 
-		DEC=101, ADD=102, SUB=103, MUL=104, DIV=105, BITAND=106, BITOR=107, CARET=108, 
-		MOD=109, ADD_ASSIGN=110, SUB_ASSIGN=111, MUL_ASSIGN=112, DIV_ASSIGN=113, 
-		AND_ASSIGN=114, OR_ASSIGN=115, XOR_ASSIGN=116, MOD_ASSIGN=117, LSHIFT_ASSIGN=118, 
-		RSHIFT_ASSIGN=119, URSHIFT_ASSIGN=120, ARROW=121, COLONCOLON=122, AT=123, 
-		ELLIPSIS=124, WS=125, COMMENT=126, LINE_COMMENT=127, IDENTIFIER=128;
-	public static final int
-		RULE_compilationUnit = 0, RULE_packageDeclaration = 1, RULE_importDeclaration = 2, 
-		RULE_typeDeclaration = 3, RULE_modifier = 4, RULE_classOrInterfaceModifier = 5, 
-		RULE_variableModifier = 6, RULE_classDeclaration = 7, RULE_typeParameters = 8, 
-		RULE_typeParameter = 9, RULE_typeBound = 10, RULE_enumDeclaration = 11, 
-		RULE_enumConstants = 12, RULE_enumConstant = 13, RULE_enumBodyDeclarations = 14, 
-		RULE_interfaceDeclaration = 15, RULE_classBody = 16, RULE_interfaceBody = 17, 
-		RULE_classBodyDeclaration = 18, RULE_memberDeclaration = 19, RULE_methodDeclaration = 20, 
-		RULE_methodBody = 21, RULE_typeTypeOrVoid = 22, RULE_genericMethodDeclaration = 23, 
-		RULE_genericConstructorDeclaration = 24, RULE_constructorDeclaration = 25, 
-		RULE_compactConstructorDeclaration = 26, RULE_fieldDeclaration = 27, RULE_interfaceBodyDeclaration = 28, 
-		RULE_interfaceMemberDeclaration = 29, RULE_constDeclaration = 30, RULE_constantDeclarator = 31, 
-		RULE_interfaceMethodDeclaration = 32, RULE_interfaceMethodModifier = 33, 
-		RULE_genericInterfaceMethodDeclaration = 34, RULE_interfaceCommonBodyDeclaration = 35, 
-		RULE_variableDeclarators = 36, RULE_variableDeclarator = 37, RULE_variableDeclaratorId = 38, 
-		RULE_variableInitializer = 39, RULE_arrayInitializer = 40, RULE_classOrInterfaceType = 41, 
-		RULE_typeArgument = 42, RULE_qualifiedNameList = 43, RULE_formalParameters = 44, 
-		RULE_receiverParameter = 45, RULE_formalParameterList = 46, RULE_formalParameter = 47, 
-		RULE_lastFormalParameter = 48, RULE_lambdaLVTIList = 49, RULE_lambdaLVTIParameter = 50, 
-		RULE_qualifiedName = 51, RULE_literal = 52, RULE_integerLiteral = 53, 
-		RULE_floatLiteral = 54, RULE_altAnnotationQualifiedName = 55, RULE_annotation = 56, 
-		RULE_elementValuePairs = 57, RULE_elementValuePair = 58, RULE_elementValue = 59, 
-		RULE_elementValueArrayInitializer = 60, RULE_annotationTypeDeclaration = 61, 
-		RULE_annotationTypeBody = 62, RULE_annotationTypeElementDeclaration = 63, 
-		RULE_annotationTypeElementRest = 64, RULE_annotationMethodOrConstantRest = 65, 
-		RULE_annotationMethodRest = 66, RULE_annotationConstantRest = 67, RULE_defaultValue = 68, 
-		RULE_moduleDeclaration = 69, RULE_moduleBody = 70, RULE_moduleDirective = 71, 
-		RULE_requiresModifier = 72, RULE_recordDeclaration = 73, RULE_recordHeader = 74, 
-		RULE_recordComponentList = 75, RULE_recordComponent = 76, RULE_recordBody = 77, 
-		RULE_block = 78, RULE_blockStatement = 79, RULE_localVariableDeclaration = 80, 
-		RULE_identifier = 81, RULE_typeIdentifier = 82, RULE_localTypeDeclaration = 83, 
-		RULE_statement = 84, RULE_catchClause = 85, RULE_catchType = 86, RULE_finallyBlock = 87, 
-		RULE_resourceSpecification = 88, RULE_resources = 89, RULE_resource = 90, 
-		RULE_switchBlockStatementGroup = 91, RULE_switchLabel = 92, RULE_forControl = 93, 
-		RULE_forInit = 94, RULE_enhancedForControl = 95, RULE_parExpression = 96, 
-		RULE_expressionList = 97, RULE_methodCall = 98, RULE_expression = 99, 
-		RULE_pattern = 100, RULE_lambdaExpression = 101, RULE_lambdaParameters = 102, 
-		RULE_lambdaBody = 103, RULE_primary = 104, RULE_switchExpression = 105, 
-		RULE_switchLabeledRule = 106, RULE_guardedPattern = 107, RULE_switchRuleOutcome = 108, 
-		RULE_classType = 109, RULE_creator = 110, RULE_createdName = 111, RULE_innerCreator = 112, 
-		RULE_arrayCreatorRest = 113, RULE_classCreatorRest = 114, RULE_explicitGenericInvocation = 115, 
-		RULE_typeArgumentsOrDiamond = 116, RULE_nonWildcardTypeArgumentsOrDiamond = 117, 
-		RULE_nonWildcardTypeArguments = 118, RULE_typeList = 119, RULE_typeType = 120, 
-		RULE_primitiveType = 121, RULE_typeArguments = 122, RULE_superSuffix = 123, 
-		RULE_explicitGenericInvocationSuffix = 124, RULE_arguments = 125;
-	private static String[] makeRuleNames() {
-		return new String[] {
-			"compilationUnit", "packageDeclaration", "importDeclaration", "typeDeclaration", 
-			"modifier", "classOrInterfaceModifier", "variableModifier", "classDeclaration", 
-			"typeParameters", "typeParameter", "typeBound", "enumDeclaration", "enumConstants", 
-			"enumConstant", "enumBodyDeclarations", "interfaceDeclaration", "classBody", 
-			"interfaceBody", "classBodyDeclaration", "memberDeclaration", "methodDeclaration", 
-			"methodBody", "typeTypeOrVoid", "genericMethodDeclaration", "genericConstructorDeclaration", 
-			"constructorDeclaration", "compactConstructorDeclaration", "fieldDeclaration", 
-			"interfaceBodyDeclaration", "interfaceMemberDeclaration", "constDeclaration", 
-			"constantDeclarator", "interfaceMethodDeclaration", "interfaceMethodModifier", 
-			"genericInterfaceMethodDeclaration", "interfaceCommonBodyDeclaration", 
-			"variableDeclarators", "variableDeclarator", "variableDeclaratorId", 
-			"variableInitializer", "arrayInitializer", "classOrInterfaceType", "typeArgument", 
-			"qualifiedNameList", "formalParameters", "receiverParameter", "formalParameterList", 
-			"formalParameter", "lastFormalParameter", "lambdaLVTIList", "lambdaLVTIParameter", 
-			"qualifiedName", "literal", "integerLiteral", "floatLiteral", "altAnnotationQualifiedName", 
-			"annotation", "elementValuePairs", "elementValuePair", "elementValue", 
-			"elementValueArrayInitializer", "annotationTypeDeclaration", "annotationTypeBody", 
-			"annotationTypeElementDeclaration", "annotationTypeElementRest", "annotationMethodOrConstantRest", 
-			"annotationMethodRest", "annotationConstantRest", "defaultValue", "moduleDeclaration", 
-			"moduleBody", "moduleDirective", "requiresModifier", "recordDeclaration", 
-			"recordHeader", "recordComponentList", "recordComponent", "recordBody", 
-			"block", "blockStatement", "localVariableDeclaration", "identifier", 
-			"typeIdentifier", "localTypeDeclaration", "statement", "catchClause", 
-			"catchType", "finallyBlock", "resourceSpecification", "resources", "resource", 
-			"switchBlockStatementGroup", "switchLabel", "forControl", "forInit", 
-			"enhancedForControl", "parExpression", "expressionList", "methodCall", 
-			"expression", "pattern", "lambdaExpression", "lambdaParameters", "lambdaBody", 
-			"primary", "switchExpression", "switchLabeledRule", "guardedPattern", 
-			"switchRuleOutcome", "classType", "creator", "createdName", "innerCreator", 
-			"arrayCreatorRest", "classCreatorRest", "explicitGenericInvocation", 
-			"typeArgumentsOrDiamond", "nonWildcardTypeArgumentsOrDiamond", "nonWildcardTypeArguments", 
-			"typeList", "typeType", "primitiveType", "typeArguments", "superSuffix", 
-			"explicitGenericInvocationSuffix", "arguments"
-		};
-	}
-	public static final String[] ruleNames = makeRuleNames();
-
-	private static String[] makeLiteralNames() {
-		return new String[] {
-			null, "'abstract'", "'assert'", "'boolean'", "'break'", "'byte'", "'case'", 
-			"'catch'", "'char'", "'class'", "'const'", "'continue'", "'default'", 
-			"'do'", "'double'", "'else'", "'enum'", "'extends'", "'final'", "'finally'", 
-			"'float'", "'for'", "'if'", "'goto'", "'implements'", "'import'", "'instanceof'", 
-			"'int'", "'interface'", "'long'", "'native'", "'new'", "'package'", "'private'", 
-			"'protected'", "'public'", "'return'", "'short'", "'static'", "'strictfp'", 
-			"'super'", "'switch'", "'synchronized'", "'this'", "'throw'", "'throws'", 
-			"'transient'", "'try'", "'void'", "'volatile'", "'while'", "'module'", 
-			"'open'", "'requires'", "'exports'", "'opens'", "'to'", "'uses'", "'provides'", 
-			"'with'", "'transitive'", "'var'", "'yield'", "'record'", "'sealed'", 
-			"'permits'", "'non-sealed'", null, null, null, null, null, null, null, 
-			null, null, null, "'null'", "'('", "')'", "'{'", "'}'", "'['", "']'", 
-			"';'", "','", "'.'", "'='", "'>'", "'<'", "'!'", "'~'", "'?'", "':'", 
-			"'=='", "'<='", "'>='", "'!='", "'&&'", "'||'", "'++'", "'--'", "'+'", 
-			"'-'", "'*'", "'/'", "'&'", "'|'", "'^'", "'%'", "'+='", "'-='", "'*='", 
-			"'/='", "'&='", "'|='", "'^='", "'%='", "'<<='", "'>>='", "'>>>='", "'->'", 
-			"'::'", "'@'", "'...'"
-		};
-	}
-	private static final String[] _LITERAL_NAMES = makeLiteralNames();
-	private static String[] makeSymbolicNames() {
-		return new String[] {
-			null, "ABSTRACT", "ASSERT", "BOOLEAN", "BREAK", "BYTE", "CASE", "CATCH", 
-			"CHAR", "CLASS", "CONST", "CONTINUE", "DEFAULT", "DO", "DOUBLE", "ELSE", 
-			"ENUM", "EXTENDS", "FINAL", "FINALLY", "FLOAT", "FOR", "IF", "GOTO", 
-			"IMPLEMENTS", "IMPORT", "INSTANCEOF", "INT", "INTERFACE", "LONG", "NATIVE", 
-			"NEW", "PACKAGE", "PRIVATE", "PROTECTED", "PUBLIC", "RETURN", "SHORT", 
-			"STATIC", "STRICTFP", "SUPER", "SWITCH", "SYNCHRONIZED", "THIS", "THROW", 
-			"THROWS", "TRANSIENT", "TRY", "VOID", "VOLATILE", "WHILE", "MODULE", 
-			"OPEN", "REQUIRES", "EXPORTS", "OPENS", "TO", "USES", "PROVIDES", "WITH", 
-			"TRANSITIVE", "VAR", "YIELD", "RECORD", "SEALED", "PERMITS", "NON_SEALED", 
-			"DECIMAL_LITERAL", "HEX_LITERAL", "OCT_LITERAL", "BINARY_LITERAL", "FLOAT_LITERAL", 
-			"HEX_FLOAT_LITERAL", "BOOL_LITERAL", "CHAR_LITERAL", "STRING_LITERAL", 
-			"TEXT_BLOCK", "NULL_LITERAL", "LPAREN", "RPAREN", "LBRACE", "RBRACE", 
-			"LBRACK", "RBRACK", "SEMI", "COMMA", "DOT", "ASSIGN", "GT", "LT", "BANG", 
-			"TILDE", "QUESTION", "COLON", "EQUAL", "LE", "GE", "NOTEQUAL", "AND", 
-			"OR", "INC", "DEC", "ADD", "SUB", "MUL", "DIV", "BITAND", "BITOR", "CARET", 
-			"MOD", "ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "DIV_ASSIGN", "AND_ASSIGN", 
-			"OR_ASSIGN", "XOR_ASSIGN", "MOD_ASSIGN", "LSHIFT_ASSIGN", "RSHIFT_ASSIGN", 
-			"URSHIFT_ASSIGN", "ARROW", "COLONCOLON", "AT", "ELLIPSIS", "WS", "COMMENT", 
-			"LINE_COMMENT", "IDENTIFIER"
-		};
-	}
-	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
-	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-
-	@Override
-	public Vocabulary getVocabulary() {
-		return VOCABULARY;
-	}
-
-	@Override
-	public String[] getTokenNames() {
-		return new String[0];
-	}
-
-	@Override
-	public String[] getRuleNames() { return ruleNames; }
-
-	@Override
-	public String getSerializedATN() { return _serializedATN; }
-
-	@Override
-	public String getGrammarFileName() {
-		return "JavaParser";
-	}
-
-	@Override
-	public ATN getATN() { return _ATN; }
-
-	public JavaParser(TokenStream input) {
-		super(input);
-		_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class CompilationUnitContext extends ParserRuleContext {
-		public PackageDeclarationContext packageDeclaration() {
-			return getRuleContext(PackageDeclarationContext.class,0);
-		}
-		public List<ImportDeclarationContext> importDeclaration() {
-			return getRuleContexts(ImportDeclarationContext.class);
-		}
-		public ImportDeclarationContext importDeclaration(int i) {
-			return getRuleContext(ImportDeclarationContext.class,i);
-		}
-		public List<TerminalNode> SEMI() { return getTokens(JavaParser.SEMI); }
-		public TerminalNode SEMI(int i) {
-			return getToken(JavaParser.SEMI, i);
-		}
-		public List<TypeDeclarationContext> typeDeclaration() {
-			return getRuleContexts(TypeDeclarationContext.class);
-		}
-		public TypeDeclarationContext typeDeclaration(int i) {
-			return getRuleContext(TypeDeclarationContext.class,i);
-		}
-		public ModuleDeclarationContext moduleDeclaration() {
-			return getRuleContext(ModuleDeclarationContext.class,0);
-		}
-		public TerminalNode EOF() { return getToken(JavaParser.EOF, 0); }
-		public CompilationUnitContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_compilationUnit; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterCompilationUnit(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitCompilationUnit(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitCompilationUnit(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final CompilationUnitContext compilationUnit() throws RecognitionException {
-		CompilationUnitContext _localctx = new CompilationUnitContext(_ctx, getState());
-		enterRule(_localctx, 0, RULE_compilationUnit);
-		int _la;
-		try {
-			int _alt;
-			setState(272);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(253);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
-				case 1:
-					{
-					setState(252);
-					packageDeclaration();
-					}
-					break;
-				}
-				setState(259);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,2,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						setState(257);
-						_errHandler.sync(this);
-						switch (_input.LA(1)) {
-						case IMPORT:
-							{
-							setState(255);
-							importDeclaration();
-							}
-							break;
-						case SEMI:
-							{
-							setState(256);
-							match(SEMI);
-							}
-							break;
-						default:
-							throw new NoViableAltException(this);
-						}
-						} 
-					}
-					setState(261);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,2,_ctx);
-				}
-				setState(266);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -1125457390829311L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660702539773L) != 0)) {
-					{
-					setState(264);
-					_errHandler.sync(this);
-					switch (_input.LA(1)) {
-					case ABSTRACT:
-					case CLASS:
-					case ENUM:
-					case FINAL:
-					case INTERFACE:
-					case PRIVATE:
-					case PROTECTED:
-					case PUBLIC:
-					case STATIC:
-					case STRICTFP:
-					case MODULE:
-					case OPEN:
-					case REQUIRES:
-					case EXPORTS:
-					case OPENS:
-					case TO:
-					case USES:
-					case PROVIDES:
-					case WITH:
-					case TRANSITIVE:
-					case VAR:
-					case YIELD:
-					case RECORD:
-					case SEALED:
-					case PERMITS:
-					case NON_SEALED:
-					case AT:
-					case IDENTIFIER:
-						{
-						setState(262);
-						typeDeclaration();
-						}
-						break;
-					case SEMI:
-						{
-						setState(263);
-						match(SEMI);
-						}
-						break;
-					default:
-						throw new NoViableAltException(this);
-					}
-					}
-					setState(268);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(269);
-				moduleDeclaration();
-				setState(270);
-				match(EOF);
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class PackageDeclarationContext extends ParserRuleContext {
-		public TerminalNode PACKAGE() { return getToken(JavaParser.PACKAGE, 0); }
-		public QualifiedNameContext qualifiedName() {
-			return getRuleContext(QualifiedNameContext.class,0);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public PackageDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_packageDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterPackageDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitPackageDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitPackageDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final PackageDeclarationContext packageDeclaration() throws RecognitionException {
-		PackageDeclarationContext _localctx = new PackageDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 2, RULE_packageDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(277);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==AT || _la==IDENTIFIER) {
-				{
-				{
-				setState(274);
-				annotation();
-				}
-				}
-				setState(279);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(280);
-			match(PACKAGE);
-			setState(281);
-			qualifiedName();
-			setState(282);
-			match(SEMI);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ImportDeclarationContext extends ParserRuleContext {
-		public TerminalNode IMPORT() { return getToken(JavaParser.IMPORT, 0); }
-		public QualifiedNameContext qualifiedName() {
-			return getRuleContext(QualifiedNameContext.class,0);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public TerminalNode STATIC() { return getToken(JavaParser.STATIC, 0); }
-		public TerminalNode DOT() { return getToken(JavaParser.DOT, 0); }
-		public TerminalNode MUL() { return getToken(JavaParser.MUL, 0); }
-		public ImportDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_importDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterImportDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitImportDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitImportDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ImportDeclarationContext importDeclaration() throws RecognitionException {
-		ImportDeclarationContext _localctx = new ImportDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_importDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(284);
-			match(IMPORT);
-			setState(286);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==STATIC) {
-				{
-				setState(285);
-				match(STATIC);
-				}
-			}
-
-			setState(288);
-			qualifiedName();
-			setState(291);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==DOT) {
-				{
-				setState(289);
-				match(DOT);
-				setState(290);
-				match(MUL);
-				}
-			}
-
-			setState(293);
-			match(SEMI);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeDeclarationContext extends ParserRuleContext {
-		public ClassDeclarationContext classDeclaration() {
-			return getRuleContext(ClassDeclarationContext.class,0);
-		}
-		public EnumDeclarationContext enumDeclaration() {
-			return getRuleContext(EnumDeclarationContext.class,0);
-		}
-		public InterfaceDeclarationContext interfaceDeclaration() {
-			return getRuleContext(InterfaceDeclarationContext.class,0);
-		}
-		public AnnotationTypeDeclarationContext annotationTypeDeclaration() {
-			return getRuleContext(AnnotationTypeDeclarationContext.class,0);
-		}
-		public RecordDeclarationContext recordDeclaration() {
-			return getRuleContext(RecordDeclarationContext.class,0);
-		}
-		public List<ClassOrInterfaceModifierContext> classOrInterfaceModifier() {
-			return getRuleContexts(ClassOrInterfaceModifierContext.class);
-		}
-		public ClassOrInterfaceModifierContext classOrInterfaceModifier(int i) {
-			return getRuleContext(ClassOrInterfaceModifierContext.class,i);
-		}
-		public TypeDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeDeclarationContext typeDeclaration() throws RecognitionException {
-		TypeDeclarationContext _localctx = new TypeDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_typeDeclaration);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(298);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,9,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(295);
-					classOrInterfaceModifier();
-					}
-					} 
-				}
-				setState(300);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,9,_ctx);
-			}
-			setState(306);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case CLASS:
-				{
-				setState(301);
-				classDeclaration();
-				}
-				break;
-			case ENUM:
-				{
-				setState(302);
-				enumDeclaration();
-				}
-				break;
-			case INTERFACE:
-				{
-				setState(303);
-				interfaceDeclaration();
-				}
-				break;
-			case AT:
-				{
-				setState(304);
-				annotationTypeDeclaration();
-				}
-				break;
-			case RECORD:
-				{
-				setState(305);
-				recordDeclaration();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ModifierContext extends ParserRuleContext {
-		public ClassOrInterfaceModifierContext classOrInterfaceModifier() {
-			return getRuleContext(ClassOrInterfaceModifierContext.class,0);
-		}
-		public TerminalNode NATIVE() { return getToken(JavaParser.NATIVE, 0); }
-		public TerminalNode SYNCHRONIZED() { return getToken(JavaParser.SYNCHRONIZED, 0); }
-		public TerminalNode TRANSIENT() { return getToken(JavaParser.TRANSIENT, 0); }
-		public TerminalNode VOLATILE() { return getToken(JavaParser.VOLATILE, 0); }
-		public ModifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_modifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterModifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitModifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitModifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ModifierContext modifier() throws RecognitionException {
-		ModifierContext _localctx = new ModifierContext(_ctx, getState());
-		enterRule(_localctx, 8, RULE_modifier);
-		try {
-			setState(313);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case ABSTRACT:
-			case FINAL:
-			case PRIVATE:
-			case PROTECTED:
-			case PUBLIC:
-			case STATIC:
-			case STRICTFP:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case NON_SEALED:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(308);
-				classOrInterfaceModifier();
-				}
-				break;
-			case NATIVE:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(309);
-				match(NATIVE);
-				}
-				break;
-			case SYNCHRONIZED:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(310);
-				match(SYNCHRONIZED);
-				}
-				break;
-			case TRANSIENT:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(311);
-				match(TRANSIENT);
-				}
-				break;
-			case VOLATILE:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(312);
-				match(VOLATILE);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassOrInterfaceModifierContext extends ParserRuleContext {
-		public AnnotationContext annotation() {
-			return getRuleContext(AnnotationContext.class,0);
-		}
-		public TerminalNode PUBLIC() { return getToken(JavaParser.PUBLIC, 0); }
-		public TerminalNode PROTECTED() { return getToken(JavaParser.PROTECTED, 0); }
-		public TerminalNode PRIVATE() { return getToken(JavaParser.PRIVATE, 0); }
-		public TerminalNode STATIC() { return getToken(JavaParser.STATIC, 0); }
-		public TerminalNode ABSTRACT() { return getToken(JavaParser.ABSTRACT, 0); }
-		public TerminalNode FINAL() { return getToken(JavaParser.FINAL, 0); }
-		public TerminalNode STRICTFP() { return getToken(JavaParser.STRICTFP, 0); }
-		public TerminalNode SEALED() { return getToken(JavaParser.SEALED, 0); }
-		public TerminalNode NON_SEALED() { return getToken(JavaParser.NON_SEALED, 0); }
-		public ClassOrInterfaceModifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classOrInterfaceModifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassOrInterfaceModifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassOrInterfaceModifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassOrInterfaceModifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassOrInterfaceModifierContext classOrInterfaceModifier() throws RecognitionException {
-		ClassOrInterfaceModifierContext _localctx = new ClassOrInterfaceModifierContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_classOrInterfaceModifier);
-		try {
-			setState(325);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(315);
-				annotation();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(316);
-				match(PUBLIC);
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(317);
-				match(PROTECTED);
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(318);
-				match(PRIVATE);
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(319);
-				match(STATIC);
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(320);
-				match(ABSTRACT);
-				}
-				break;
-			case 7:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(321);
-				match(FINAL);
-				}
-				break;
-			case 8:
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(322);
-				match(STRICTFP);
-				}
-				break;
-			case 9:
-				enterOuterAlt(_localctx, 9);
-				{
-				setState(323);
-				match(SEALED);
-				}
-				break;
-			case 10:
-				enterOuterAlt(_localctx, 10);
-				{
-				setState(324);
-				match(NON_SEALED);
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VariableModifierContext extends ParserRuleContext {
-		public TerminalNode FINAL() { return getToken(JavaParser.FINAL, 0); }
-		public AnnotationContext annotation() {
-			return getRuleContext(AnnotationContext.class,0);
-		}
-		public VariableModifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_variableModifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterVariableModifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitVariableModifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitVariableModifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VariableModifierContext variableModifier() throws RecognitionException {
-		VariableModifierContext _localctx = new VariableModifierContext(_ctx, getState());
-		enterRule(_localctx, 12, RULE_variableModifier);
-		try {
-			setState(329);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case FINAL:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(327);
-				match(FINAL);
-				}
-				break;
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(328);
-				annotation();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassDeclarationContext extends ParserRuleContext {
-		public TerminalNode CLASS() { return getToken(JavaParser.CLASS, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public ClassBodyContext classBody() {
-			return getRuleContext(ClassBodyContext.class,0);
-		}
-		public TypeParametersContext typeParameters() {
-			return getRuleContext(TypeParametersContext.class,0);
-		}
-		public TerminalNode EXTENDS() { return getToken(JavaParser.EXTENDS, 0); }
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public TerminalNode IMPLEMENTS() { return getToken(JavaParser.IMPLEMENTS, 0); }
-		public List<TypeListContext> typeList() {
-			return getRuleContexts(TypeListContext.class);
-		}
-		public TypeListContext typeList(int i) {
-			return getRuleContext(TypeListContext.class,i);
-		}
-		public TerminalNode PERMITS() { return getToken(JavaParser.PERMITS, 0); }
-		public ClassDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassDeclarationContext classDeclaration() throws RecognitionException {
-		ClassDeclarationContext _localctx = new ClassDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 14, RULE_classDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(331);
-			match(CLASS);
-			setState(332);
-			identifier();
-			setState(334);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LT) {
-				{
-				setState(333);
-				typeParameters();
-				}
-			}
-
-			setState(338);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==EXTENDS) {
-				{
-				setState(336);
-				match(EXTENDS);
-				setState(337);
-				typeType();
-				}
-			}
-
-			setState(342);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==IMPLEMENTS) {
-				{
-				setState(340);
-				match(IMPLEMENTS);
-				setState(341);
-				typeList();
-				}
-			}
-
-			setState(346);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==PERMITS) {
-				{
-				setState(344);
-				match(PERMITS);
-				setState(345);
-				typeList();
-				}
-			}
-
-			setState(348);
-			classBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeParametersContext extends ParserRuleContext {
-		public TerminalNode LT() { return getToken(JavaParser.LT, 0); }
-		public List<TypeParameterContext> typeParameter() {
-			return getRuleContexts(TypeParameterContext.class);
-		}
-		public TypeParameterContext typeParameter(int i) {
-			return getRuleContext(TypeParameterContext.class,i);
-		}
-		public TerminalNode GT() { return getToken(JavaParser.GT, 0); }
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public TypeParametersContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeParameters; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeParameters(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeParameters(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeParameters(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeParametersContext typeParameters() throws RecognitionException {
-		TypeParametersContext _localctx = new TypeParametersContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_typeParameters);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(350);
-			match(LT);
-			setState(351);
-			typeParameter();
-			setState(356);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(352);
-				match(COMMA);
-				setState(353);
-				typeParameter();
-				}
-				}
-				setState(358);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(359);
-			match(GT);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeParameterContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public TerminalNode EXTENDS() { return getToken(JavaParser.EXTENDS, 0); }
-		public TypeBoundContext typeBound() {
-			return getRuleContext(TypeBoundContext.class,0);
-		}
-		public TypeParameterContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeParameter; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeParameter(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeParameter(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeParameter(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeParameterContext typeParameter() throws RecognitionException {
-		TypeParameterContext _localctx = new TypeParameterContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_typeParameter);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(364);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(361);
-					annotation();
-					}
-					} 
-				}
-				setState(366);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
-			}
-			setState(367);
-			identifier();
-			setState(376);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==EXTENDS) {
-				{
-				setState(368);
-				match(EXTENDS);
-				setState(372);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,20,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(369);
-						annotation();
-						}
-						} 
-					}
-					setState(374);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,20,_ctx);
-				}
-				setState(375);
-				typeBound();
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeBoundContext extends ParserRuleContext {
-		public List<TypeTypeContext> typeType() {
-			return getRuleContexts(TypeTypeContext.class);
-		}
-		public TypeTypeContext typeType(int i) {
-			return getRuleContext(TypeTypeContext.class,i);
-		}
-		public List<TerminalNode> BITAND() { return getTokens(JavaParser.BITAND); }
-		public TerminalNode BITAND(int i) {
-			return getToken(JavaParser.BITAND, i);
-		}
-		public TypeBoundContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeBound; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeBound(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeBound(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeBound(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeBoundContext typeBound() throws RecognitionException {
-		TypeBoundContext _localctx = new TypeBoundContext(_ctx, getState());
-		enterRule(_localctx, 20, RULE_typeBound);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(378);
-			typeType();
-			setState(383);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==BITAND) {
-				{
-				{
-				setState(379);
-				match(BITAND);
-				setState(380);
-				typeType();
-				}
-				}
-				setState(385);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class EnumDeclarationContext extends ParserRuleContext {
-		public TerminalNode ENUM() { return getToken(JavaParser.ENUM, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public TerminalNode IMPLEMENTS() { return getToken(JavaParser.IMPLEMENTS, 0); }
-		public TypeListContext typeList() {
-			return getRuleContext(TypeListContext.class,0);
-		}
-		public EnumConstantsContext enumConstants() {
-			return getRuleContext(EnumConstantsContext.class,0);
-		}
-		public TerminalNode COMMA() { return getToken(JavaParser.COMMA, 0); }
-		public EnumBodyDeclarationsContext enumBodyDeclarations() {
-			return getRuleContext(EnumBodyDeclarationsContext.class,0);
-		}
-		public EnumDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_enumDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterEnumDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitEnumDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitEnumDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final EnumDeclarationContext enumDeclaration() throws RecognitionException {
-		EnumDeclarationContext _localctx = new EnumDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 22, RULE_enumDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(386);
-			match(ENUM);
-			setState(387);
-			identifier();
-			setState(390);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==IMPLEMENTS) {
-				{
-				setState(388);
-				match(IMPLEMENTS);
-				setState(389);
-				typeList();
-				}
-			}
-
-			setState(392);
-			match(LBRACE);
-			setState(394);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==AT || _la==IDENTIFIER) {
-				{
-				setState(393);
-				enumConstants();
-				}
-			}
-
-			setState(397);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==COMMA) {
-				{
-				setState(396);
-				match(COMMA);
-				}
-			}
-
-			setState(400);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==SEMI) {
-				{
-				setState(399);
-				enumBodyDeclarations();
-				}
-			}
-
-			setState(402);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class EnumConstantsContext extends ParserRuleContext {
-		public List<EnumConstantContext> enumConstant() {
-			return getRuleContexts(EnumConstantContext.class);
-		}
-		public EnumConstantContext enumConstant(int i) {
-			return getRuleContext(EnumConstantContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public EnumConstantsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_enumConstants; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterEnumConstants(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitEnumConstants(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitEnumConstants(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final EnumConstantsContext enumConstants() throws RecognitionException {
-		EnumConstantsContext _localctx = new EnumConstantsContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_enumConstants);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(404);
-			enumConstant();
-			setState(409);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,27,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(405);
-					match(COMMA);
-					setState(406);
-					enumConstant();
-					}
-					} 
-				}
-				setState(411);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,27,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class EnumConstantContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public ClassBodyContext classBody() {
-			return getRuleContext(ClassBodyContext.class,0);
-		}
-		public EnumConstantContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_enumConstant; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterEnumConstant(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitEnumConstant(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitEnumConstant(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final EnumConstantContext enumConstant() throws RecognitionException {
-		EnumConstantContext _localctx = new EnumConstantContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_enumConstant);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(415);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,28,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(412);
-					annotation();
-					}
-					} 
-				}
-				setState(417);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,28,_ctx);
-			}
-			setState(418);
-			identifier();
-			setState(420);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LPAREN) {
-				{
-				setState(419);
-				arguments();
-				}
-			}
-
-			setState(423);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LBRACE) {
-				{
-				setState(422);
-				classBody();
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class EnumBodyDeclarationsContext extends ParserRuleContext {
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public List<ClassBodyDeclarationContext> classBodyDeclaration() {
-			return getRuleContexts(ClassBodyDeclarationContext.class);
-		}
-		public ClassBodyDeclarationContext classBodyDeclaration(int i) {
-			return getRuleContext(ClassBodyDeclarationContext.class,i);
-		}
-		public EnumBodyDeclarationsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_enumBodyDeclarations; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterEnumBodyDeclarations(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitEnumBodyDeclarations(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitEnumBodyDeclarations(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final EnumBodyDeclarationsContext enumBodyDeclarations() throws RecognitionException {
-		EnumBodyDeclarationsContext _localctx = new EnumBodyDeclarationsContext(_ctx, getState());
-		enterRule(_localctx, 28, RULE_enumBodyDeclarations);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(425);
-			match(SEMI);
-			setState(429);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -665791937994347L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660685729789L) != 0)) {
-				{
-				{
-				setState(426);
-				classBodyDeclaration();
-				}
-				}
-				setState(431);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceDeclarationContext extends ParserRuleContext {
-		public TerminalNode INTERFACE() { return getToken(JavaParser.INTERFACE, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public InterfaceBodyContext interfaceBody() {
-			return getRuleContext(InterfaceBodyContext.class,0);
-		}
-		public TypeParametersContext typeParameters() {
-			return getRuleContext(TypeParametersContext.class,0);
-		}
-		public TerminalNode EXTENDS() { return getToken(JavaParser.EXTENDS, 0); }
-		public List<TypeListContext> typeList() {
-			return getRuleContexts(TypeListContext.class);
-		}
-		public TypeListContext typeList(int i) {
-			return getRuleContext(TypeListContext.class,i);
-		}
-		public TerminalNode PERMITS() { return getToken(JavaParser.PERMITS, 0); }
-		public InterfaceDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceDeclarationContext interfaceDeclaration() throws RecognitionException {
-		InterfaceDeclarationContext _localctx = new InterfaceDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 30, RULE_interfaceDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(432);
-			match(INTERFACE);
-			setState(433);
-			identifier();
-			setState(435);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LT) {
-				{
-				setState(434);
-				typeParameters();
-				}
-			}
-
-			setState(439);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==EXTENDS) {
-				{
-				setState(437);
-				match(EXTENDS);
-				setState(438);
-				typeList();
-				}
-			}
-
-			setState(443);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==PERMITS) {
-				{
-				setState(441);
-				match(PERMITS);
-				setState(442);
-				typeList();
-				}
-			}
-
-			setState(445);
-			interfaceBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassBodyContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<ClassBodyDeclarationContext> classBodyDeclaration() {
-			return getRuleContexts(ClassBodyDeclarationContext.class);
-		}
-		public ClassBodyDeclarationContext classBodyDeclaration(int i) {
-			return getRuleContext(ClassBodyDeclarationContext.class,i);
-		}
-		public ClassBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassBodyContext classBody() throws RecognitionException {
-		ClassBodyContext _localctx = new ClassBodyContext(_ctx, getState());
-		enterRule(_localctx, 32, RULE_classBody);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(447);
-			match(LBRACE);
-			setState(451);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -665791937994347L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660685729789L) != 0)) {
-				{
-				{
-				setState(448);
-				classBodyDeclaration();
-				}
-				}
-				setState(453);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(454);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceBodyContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<InterfaceBodyDeclarationContext> interfaceBodyDeclaration() {
-			return getRuleContexts(InterfaceBodyDeclarationContext.class);
-		}
-		public InterfaceBodyDeclarationContext interfaceBodyDeclaration(int i) {
-			return getRuleContext(InterfaceBodyDeclarationContext.class,i);
-		}
-		public InterfaceBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceBodyContext interfaceBody() throws RecognitionException {
-		InterfaceBodyContext _localctx = new InterfaceBodyContext(_ctx, getState());
-		enterRule(_localctx, 34, RULE_interfaceBody);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(456);
-			match(LBRACE);
-			setState(460);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -665791937992299L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660685762557L) != 0)) {
-				{
-				{
-				setState(457);
-				interfaceBodyDeclaration();
-				}
-				}
-				setState(462);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(463);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassBodyDeclarationContext extends ParserRuleContext {
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public TerminalNode STATIC() { return getToken(JavaParser.STATIC, 0); }
-		public MemberDeclarationContext memberDeclaration() {
-			return getRuleContext(MemberDeclarationContext.class,0);
-		}
-		public List<ModifierContext> modifier() {
-			return getRuleContexts(ModifierContext.class);
-		}
-		public ModifierContext modifier(int i) {
-			return getRuleContext(ModifierContext.class,i);
-		}
-		public ClassBodyDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classBodyDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassBodyDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassBodyDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassBodyDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassBodyDeclarationContext classBodyDeclaration() throws RecognitionException {
-		ClassBodyDeclarationContext _localctx = new ClassBodyDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 36, RULE_classBodyDeclaration);
-		int _la;
-		try {
-			int _alt;
-			setState(477);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,39,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(465);
-				match(SEMI);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(467);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==STATIC) {
-					{
-					setState(466);
-					match(STATIC);
-					}
-				}
-
-				setState(469);
-				block();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(473);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,38,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(470);
-						modifier();
-						}
-						} 
-					}
-					setState(475);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,38,_ctx);
-				}
-				setState(476);
-				memberDeclaration();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class MemberDeclarationContext extends ParserRuleContext {
-		public RecordDeclarationContext recordDeclaration() {
-			return getRuleContext(RecordDeclarationContext.class,0);
-		}
-		public MethodDeclarationContext methodDeclaration() {
-			return getRuleContext(MethodDeclarationContext.class,0);
-		}
-		public GenericMethodDeclarationContext genericMethodDeclaration() {
-			return getRuleContext(GenericMethodDeclarationContext.class,0);
-		}
-		public FieldDeclarationContext fieldDeclaration() {
-			return getRuleContext(FieldDeclarationContext.class,0);
-		}
-		public ConstructorDeclarationContext constructorDeclaration() {
-			return getRuleContext(ConstructorDeclarationContext.class,0);
-		}
-		public GenericConstructorDeclarationContext genericConstructorDeclaration() {
-			return getRuleContext(GenericConstructorDeclarationContext.class,0);
-		}
-		public InterfaceDeclarationContext interfaceDeclaration() {
-			return getRuleContext(InterfaceDeclarationContext.class,0);
-		}
-		public AnnotationTypeDeclarationContext annotationTypeDeclaration() {
-			return getRuleContext(AnnotationTypeDeclarationContext.class,0);
-		}
-		public ClassDeclarationContext classDeclaration() {
-			return getRuleContext(ClassDeclarationContext.class,0);
-		}
-		public EnumDeclarationContext enumDeclaration() {
-			return getRuleContext(EnumDeclarationContext.class,0);
-		}
-		public MemberDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_memberDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterMemberDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitMemberDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitMemberDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final MemberDeclarationContext memberDeclaration() throws RecognitionException {
-		MemberDeclarationContext _localctx = new MemberDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_memberDeclaration);
-		try {
-			setState(489);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,40,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(479);
-				recordDeclaration();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(480);
-				methodDeclaration();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(481);
-				genericMethodDeclaration();
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(482);
-				fieldDeclaration();
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(483);
-				constructorDeclaration();
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(484);
-				genericConstructorDeclaration();
-				}
-				break;
-			case 7:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(485);
-				interfaceDeclaration();
-				}
-				break;
-			case 8:
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(486);
-				annotationTypeDeclaration();
-				}
-				break;
-			case 9:
-				enterOuterAlt(_localctx, 9);
-				{
-				setState(487);
-				classDeclaration();
-				}
-				break;
-			case 10:
-				enterOuterAlt(_localctx, 10);
-				{
-				setState(488);
-				enumDeclaration();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class MethodDeclarationContext extends ParserRuleContext {
-		public TypeTypeOrVoidContext typeTypeOrVoid() {
-			return getRuleContext(TypeTypeOrVoidContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public FormalParametersContext formalParameters() {
-			return getRuleContext(FormalParametersContext.class,0);
-		}
-		public MethodBodyContext methodBody() {
-			return getRuleContext(MethodBodyContext.class,0);
-		}
-		public List<TerminalNode> LBRACK() { return getTokens(JavaParser.LBRACK); }
-		public TerminalNode LBRACK(int i) {
-			return getToken(JavaParser.LBRACK, i);
-		}
-		public List<TerminalNode> RBRACK() { return getTokens(JavaParser.RBRACK); }
-		public TerminalNode RBRACK(int i) {
-			return getToken(JavaParser.RBRACK, i);
-		}
-		public TerminalNode THROWS() { return getToken(JavaParser.THROWS, 0); }
-		public QualifiedNameListContext qualifiedNameList() {
-			return getRuleContext(QualifiedNameListContext.class,0);
-		}
-		public MethodDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_methodDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterMethodDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitMethodDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitMethodDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final MethodDeclarationContext methodDeclaration() throws RecognitionException {
-		MethodDeclarationContext _localctx = new MethodDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_methodDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(491);
-			typeTypeOrVoid();
-			setState(492);
-			identifier();
-			setState(493);
-			formalParameters();
-			setState(498);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==LBRACK) {
-				{
-				{
-				setState(494);
-				match(LBRACK);
-				setState(495);
-				match(RBRACK);
-				}
-				}
-				setState(500);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(503);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==THROWS) {
-				{
-				setState(501);
-				match(THROWS);
-				setState(502);
-				qualifiedNameList();
-				}
-			}
-
-			setState(505);
-			methodBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class MethodBodyContext extends ParserRuleContext {
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public MethodBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_methodBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterMethodBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitMethodBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitMethodBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final MethodBodyContext methodBody() throws RecognitionException {
-		MethodBodyContext _localctx = new MethodBodyContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_methodBody);
-		try {
-			setState(509);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case LBRACE:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(507);
-				block();
-				}
-				break;
-			case SEMI:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(508);
-				match(SEMI);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeTypeOrVoidContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public TerminalNode VOID() { return getToken(JavaParser.VOID, 0); }
-		public TypeTypeOrVoidContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeTypeOrVoid; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeTypeOrVoid(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeTypeOrVoid(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeTypeOrVoid(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeTypeOrVoidContext typeTypeOrVoid() throws RecognitionException {
-		TypeTypeOrVoidContext _localctx = new TypeTypeOrVoidContext(_ctx, getState());
-		enterRule(_localctx, 44, RULE_typeTypeOrVoid);
-		try {
-			setState(513);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case DOUBLE:
-			case FLOAT:
-			case INT:
-			case LONG:
-			case SHORT:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(511);
-				typeType();
-				}
-				break;
-			case VOID:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(512);
-				match(VOID);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class GenericMethodDeclarationContext extends ParserRuleContext {
-		public TypeParametersContext typeParameters() {
-			return getRuleContext(TypeParametersContext.class,0);
-		}
-		public MethodDeclarationContext methodDeclaration() {
-			return getRuleContext(MethodDeclarationContext.class,0);
-		}
-		public GenericMethodDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_genericMethodDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterGenericMethodDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitGenericMethodDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitGenericMethodDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final GenericMethodDeclarationContext genericMethodDeclaration() throws RecognitionException {
-		GenericMethodDeclarationContext _localctx = new GenericMethodDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 46, RULE_genericMethodDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(515);
-			typeParameters();
-			setState(516);
-			methodDeclaration();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class GenericConstructorDeclarationContext extends ParserRuleContext {
-		public TypeParametersContext typeParameters() {
-			return getRuleContext(TypeParametersContext.class,0);
-		}
-		public ConstructorDeclarationContext constructorDeclaration() {
-			return getRuleContext(ConstructorDeclarationContext.class,0);
-		}
-		public GenericConstructorDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_genericConstructorDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterGenericConstructorDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitGenericConstructorDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitGenericConstructorDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final GenericConstructorDeclarationContext genericConstructorDeclaration() throws RecognitionException {
-		GenericConstructorDeclarationContext _localctx = new GenericConstructorDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 48, RULE_genericConstructorDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(518);
-			typeParameters();
-			setState(519);
-			constructorDeclaration();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ConstructorDeclarationContext extends ParserRuleContext {
-		public BlockContext constructorBody;
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public FormalParametersContext formalParameters() {
-			return getRuleContext(FormalParametersContext.class,0);
-		}
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public TerminalNode THROWS() { return getToken(JavaParser.THROWS, 0); }
-		public QualifiedNameListContext qualifiedNameList() {
-			return getRuleContext(QualifiedNameListContext.class,0);
-		}
-		public ConstructorDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_constructorDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterConstructorDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitConstructorDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitConstructorDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ConstructorDeclarationContext constructorDeclaration() throws RecognitionException {
-		ConstructorDeclarationContext _localctx = new ConstructorDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 50, RULE_constructorDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(521);
-			identifier();
-			setState(522);
-			formalParameters();
-			setState(525);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==THROWS) {
-				{
-				setState(523);
-				match(THROWS);
-				setState(524);
-				qualifiedNameList();
-				}
-			}
-
-			setState(527);
-			((ConstructorDeclarationContext)_localctx).constructorBody = block();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class CompactConstructorDeclarationContext extends ParserRuleContext {
-		public BlockContext constructorBody;
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public List<ModifierContext> modifier() {
-			return getRuleContexts(ModifierContext.class);
-		}
-		public ModifierContext modifier(int i) {
-			return getRuleContext(ModifierContext.class,i);
-		}
-		public CompactConstructorDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_compactConstructorDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterCompactConstructorDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitCompactConstructorDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitCompactConstructorDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final CompactConstructorDeclarationContext compactConstructorDeclaration() throws RecognitionException {
-		CompactConstructorDeclarationContext _localctx = new CompactConstructorDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 52, RULE_compactConstructorDeclaration);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(532);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,46,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(529);
-					modifier();
-					}
-					} 
-				}
-				setState(534);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,46,_ctx);
-			}
-			setState(535);
-			identifier();
-			setState(536);
-			((CompactConstructorDeclarationContext)_localctx).constructorBody = block();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class FieldDeclarationContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public VariableDeclaratorsContext variableDeclarators() {
-			return getRuleContext(VariableDeclaratorsContext.class,0);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public FieldDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_fieldDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterFieldDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitFieldDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitFieldDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FieldDeclarationContext fieldDeclaration() throws RecognitionException {
-		FieldDeclarationContext _localctx = new FieldDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 54, RULE_fieldDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(538);
-			typeType();
-			setState(539);
-			variableDeclarators();
-			setState(540);
-			match(SEMI);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceBodyDeclarationContext extends ParserRuleContext {
-		public InterfaceMemberDeclarationContext interfaceMemberDeclaration() {
-			return getRuleContext(InterfaceMemberDeclarationContext.class,0);
-		}
-		public List<ModifierContext> modifier() {
-			return getRuleContexts(ModifierContext.class);
-		}
-		public ModifierContext modifier(int i) {
-			return getRuleContext(ModifierContext.class,i);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public InterfaceBodyDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceBodyDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceBodyDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceBodyDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceBodyDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceBodyDeclarationContext interfaceBodyDeclaration() throws RecognitionException {
-		InterfaceBodyDeclarationContext _localctx = new InterfaceBodyDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 56, RULE_interfaceBodyDeclaration);
-		try {
-			int _alt;
-			setState(550);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case ABSTRACT:
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case CLASS:
-			case DEFAULT:
-			case DOUBLE:
-			case ENUM:
-			case FINAL:
-			case FLOAT:
-			case INT:
-			case INTERFACE:
-			case LONG:
-			case NATIVE:
-			case PRIVATE:
-			case PROTECTED:
-			case PUBLIC:
-			case SHORT:
-			case STATIC:
-			case STRICTFP:
-			case SYNCHRONIZED:
-			case TRANSIENT:
-			case VOID:
-			case VOLATILE:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case NON_SEALED:
-			case LT:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(545);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,47,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(542);
-						modifier();
-						}
-						} 
-					}
-					setState(547);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,47,_ctx);
-				}
-				setState(548);
-				interfaceMemberDeclaration();
-				}
-				break;
-			case SEMI:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(549);
-				match(SEMI);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceMemberDeclarationContext extends ParserRuleContext {
-		public RecordDeclarationContext recordDeclaration() {
-			return getRuleContext(RecordDeclarationContext.class,0);
-		}
-		public ConstDeclarationContext constDeclaration() {
-			return getRuleContext(ConstDeclarationContext.class,0);
-		}
-		public InterfaceMethodDeclarationContext interfaceMethodDeclaration() {
-			return getRuleContext(InterfaceMethodDeclarationContext.class,0);
-		}
-		public GenericInterfaceMethodDeclarationContext genericInterfaceMethodDeclaration() {
-			return getRuleContext(GenericInterfaceMethodDeclarationContext.class,0);
-		}
-		public InterfaceDeclarationContext interfaceDeclaration() {
-			return getRuleContext(InterfaceDeclarationContext.class,0);
-		}
-		public AnnotationTypeDeclarationContext annotationTypeDeclaration() {
-			return getRuleContext(AnnotationTypeDeclarationContext.class,0);
-		}
-		public ClassDeclarationContext classDeclaration() {
-			return getRuleContext(ClassDeclarationContext.class,0);
-		}
-		public EnumDeclarationContext enumDeclaration() {
-			return getRuleContext(EnumDeclarationContext.class,0);
-		}
-		public InterfaceMemberDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceMemberDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceMemberDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceMemberDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceMemberDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceMemberDeclarationContext interfaceMemberDeclaration() throws RecognitionException {
-		InterfaceMemberDeclarationContext _localctx = new InterfaceMemberDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 58, RULE_interfaceMemberDeclaration);
-		try {
-			setState(560);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,49,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(552);
-				recordDeclaration();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(553);
-				constDeclaration();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(554);
-				interfaceMethodDeclaration();
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(555);
-				genericInterfaceMethodDeclaration();
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(556);
-				interfaceDeclaration();
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(557);
-				annotationTypeDeclaration();
-				}
-				break;
-			case 7:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(558);
-				classDeclaration();
-				}
-				break;
-			case 8:
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(559);
-				enumDeclaration();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ConstDeclarationContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public List<ConstantDeclaratorContext> constantDeclarator() {
-			return getRuleContexts(ConstantDeclaratorContext.class);
-		}
-		public ConstantDeclaratorContext constantDeclarator(int i) {
-			return getRuleContext(ConstantDeclaratorContext.class,i);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public ConstDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_constDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterConstDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitConstDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitConstDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ConstDeclarationContext constDeclaration() throws RecognitionException {
-		ConstDeclarationContext _localctx = new ConstDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 60, RULE_constDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(562);
-			typeType();
-			setState(563);
-			constantDeclarator();
-			setState(568);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(564);
-				match(COMMA);
-				setState(565);
-				constantDeclarator();
-				}
-				}
-				setState(570);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(571);
-			match(SEMI);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ConstantDeclaratorContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode ASSIGN() { return getToken(JavaParser.ASSIGN, 0); }
-		public VariableInitializerContext variableInitializer() {
-			return getRuleContext(VariableInitializerContext.class,0);
-		}
-		public List<TerminalNode> LBRACK() { return getTokens(JavaParser.LBRACK); }
-		public TerminalNode LBRACK(int i) {
-			return getToken(JavaParser.LBRACK, i);
-		}
-		public List<TerminalNode> RBRACK() { return getTokens(JavaParser.RBRACK); }
-		public TerminalNode RBRACK(int i) {
-			return getToken(JavaParser.RBRACK, i);
-		}
-		public ConstantDeclaratorContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_constantDeclarator; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterConstantDeclarator(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitConstantDeclarator(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitConstantDeclarator(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ConstantDeclaratorContext constantDeclarator() throws RecognitionException {
-		ConstantDeclaratorContext _localctx = new ConstantDeclaratorContext(_ctx, getState());
-		enterRule(_localctx, 62, RULE_constantDeclarator);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(573);
-			identifier();
-			setState(578);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==LBRACK) {
-				{
-				{
-				setState(574);
-				match(LBRACK);
-				setState(575);
-				match(RBRACK);
-				}
-				}
-				setState(580);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(581);
-			match(ASSIGN);
-			setState(582);
-			variableInitializer();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceMethodDeclarationContext extends ParserRuleContext {
-		public InterfaceCommonBodyDeclarationContext interfaceCommonBodyDeclaration() {
-			return getRuleContext(InterfaceCommonBodyDeclarationContext.class,0);
-		}
-		public List<InterfaceMethodModifierContext> interfaceMethodModifier() {
-			return getRuleContexts(InterfaceMethodModifierContext.class);
-		}
-		public InterfaceMethodModifierContext interfaceMethodModifier(int i) {
-			return getRuleContext(InterfaceMethodModifierContext.class,i);
-		}
-		public InterfaceMethodDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceMethodDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceMethodDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceMethodDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceMethodDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceMethodDeclarationContext interfaceMethodDeclaration() throws RecognitionException {
-		InterfaceMethodDeclarationContext _localctx = new InterfaceMethodDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 64, RULE_interfaceMethodDeclaration);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(587);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,52,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(584);
-					interfaceMethodModifier();
-					}
-					} 
-				}
-				setState(589);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,52,_ctx);
-			}
-			setState(590);
-			interfaceCommonBodyDeclaration();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceMethodModifierContext extends ParserRuleContext {
-		public AnnotationContext annotation() {
-			return getRuleContext(AnnotationContext.class,0);
-		}
-		public TerminalNode PUBLIC() { return getToken(JavaParser.PUBLIC, 0); }
-		public TerminalNode ABSTRACT() { return getToken(JavaParser.ABSTRACT, 0); }
-		public TerminalNode DEFAULT() { return getToken(JavaParser.DEFAULT, 0); }
-		public TerminalNode STATIC() { return getToken(JavaParser.STATIC, 0); }
-		public TerminalNode STRICTFP() { return getToken(JavaParser.STRICTFP, 0); }
-		public InterfaceMethodModifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceMethodModifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceMethodModifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceMethodModifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceMethodModifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceMethodModifierContext interfaceMethodModifier() throws RecognitionException {
-		InterfaceMethodModifierContext _localctx = new InterfaceMethodModifierContext(_ctx, getState());
-		enterRule(_localctx, 66, RULE_interfaceMethodModifier);
-		try {
-			setState(598);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(592);
-				annotation();
-				}
-				break;
-			case PUBLIC:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(593);
-				match(PUBLIC);
-				}
-				break;
-			case ABSTRACT:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(594);
-				match(ABSTRACT);
-				}
-				break;
-			case DEFAULT:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(595);
-				match(DEFAULT);
-				}
-				break;
-			case STATIC:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(596);
-				match(STATIC);
-				}
-				break;
-			case STRICTFP:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(597);
-				match(STRICTFP);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class GenericInterfaceMethodDeclarationContext extends ParserRuleContext {
-		public TypeParametersContext typeParameters() {
-			return getRuleContext(TypeParametersContext.class,0);
-		}
-		public InterfaceCommonBodyDeclarationContext interfaceCommonBodyDeclaration() {
-			return getRuleContext(InterfaceCommonBodyDeclarationContext.class,0);
-		}
-		public List<InterfaceMethodModifierContext> interfaceMethodModifier() {
-			return getRuleContexts(InterfaceMethodModifierContext.class);
-		}
-		public InterfaceMethodModifierContext interfaceMethodModifier(int i) {
-			return getRuleContext(InterfaceMethodModifierContext.class,i);
-		}
-		public GenericInterfaceMethodDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_genericInterfaceMethodDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterGenericInterfaceMethodDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitGenericInterfaceMethodDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitGenericInterfaceMethodDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final GenericInterfaceMethodDeclarationContext genericInterfaceMethodDeclaration() throws RecognitionException {
-		GenericInterfaceMethodDeclarationContext _localctx = new GenericInterfaceMethodDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 68, RULE_genericInterfaceMethodDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(603);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -1125470410110975L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660703064063L) != 0)) {
-				{
-				{
-				setState(600);
-				interfaceMethodModifier();
-				}
-				}
-				setState(605);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(606);
-			typeParameters();
-			setState(607);
-			interfaceCommonBodyDeclaration();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InterfaceCommonBodyDeclarationContext extends ParserRuleContext {
-		public TypeTypeOrVoidContext typeTypeOrVoid() {
-			return getRuleContext(TypeTypeOrVoidContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public FormalParametersContext formalParameters() {
-			return getRuleContext(FormalParametersContext.class,0);
-		}
-		public MethodBodyContext methodBody() {
-			return getRuleContext(MethodBodyContext.class,0);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public List<TerminalNode> LBRACK() { return getTokens(JavaParser.LBRACK); }
-		public TerminalNode LBRACK(int i) {
-			return getToken(JavaParser.LBRACK, i);
-		}
-		public List<TerminalNode> RBRACK() { return getTokens(JavaParser.RBRACK); }
-		public TerminalNode RBRACK(int i) {
-			return getToken(JavaParser.RBRACK, i);
-		}
-		public TerminalNode THROWS() { return getToken(JavaParser.THROWS, 0); }
-		public QualifiedNameListContext qualifiedNameList() {
-			return getRuleContext(QualifiedNameListContext.class,0);
-		}
-		public InterfaceCommonBodyDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_interfaceCommonBodyDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInterfaceCommonBodyDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInterfaceCommonBodyDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInterfaceCommonBodyDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InterfaceCommonBodyDeclarationContext interfaceCommonBodyDeclaration() throws RecognitionException {
-		InterfaceCommonBodyDeclarationContext _localctx = new InterfaceCommonBodyDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 70, RULE_interfaceCommonBodyDeclaration);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(612);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,55,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(609);
-					annotation();
-					}
-					} 
-				}
-				setState(614);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,55,_ctx);
-			}
-			setState(615);
-			typeTypeOrVoid();
-			setState(616);
-			identifier();
-			setState(617);
-			formalParameters();
-			setState(622);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==LBRACK) {
-				{
-				{
-				setState(618);
-				match(LBRACK);
-				setState(619);
-				match(RBRACK);
-				}
-				}
-				setState(624);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(627);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==THROWS) {
-				{
-				setState(625);
-				match(THROWS);
-				setState(626);
-				qualifiedNameList();
-				}
-			}
-
-			setState(629);
-			methodBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VariableDeclaratorsContext extends ParserRuleContext {
-		public List<VariableDeclaratorContext> variableDeclarator() {
-			return getRuleContexts(VariableDeclaratorContext.class);
-		}
-		public VariableDeclaratorContext variableDeclarator(int i) {
-			return getRuleContext(VariableDeclaratorContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public VariableDeclaratorsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_variableDeclarators; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterVariableDeclarators(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitVariableDeclarators(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitVariableDeclarators(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VariableDeclaratorsContext variableDeclarators() throws RecognitionException {
-		VariableDeclaratorsContext _localctx = new VariableDeclaratorsContext(_ctx, getState());
-		enterRule(_localctx, 72, RULE_variableDeclarators);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(631);
-			variableDeclarator();
-			setState(636);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(632);
-				match(COMMA);
-				setState(633);
-				variableDeclarator();
-				}
-				}
-				setState(638);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VariableDeclaratorContext extends ParserRuleContext {
-		public VariableDeclaratorIdContext variableDeclaratorId() {
-			return getRuleContext(VariableDeclaratorIdContext.class,0);
-		}
-		public TerminalNode ASSIGN() { return getToken(JavaParser.ASSIGN, 0); }
-		public VariableInitializerContext variableInitializer() {
-			return getRuleContext(VariableInitializerContext.class,0);
-		}
-		public VariableDeclaratorContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_variableDeclarator; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterVariableDeclarator(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitVariableDeclarator(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitVariableDeclarator(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VariableDeclaratorContext variableDeclarator() throws RecognitionException {
-		VariableDeclaratorContext _localctx = new VariableDeclaratorContext(_ctx, getState());
-		enterRule(_localctx, 74, RULE_variableDeclarator);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(639);
-			variableDeclaratorId();
-			setState(642);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==ASSIGN) {
-				{
-				setState(640);
-				match(ASSIGN);
-				setState(641);
-				variableInitializer();
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VariableDeclaratorIdContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<TerminalNode> LBRACK() { return getTokens(JavaParser.LBRACK); }
-		public TerminalNode LBRACK(int i) {
-			return getToken(JavaParser.LBRACK, i);
-		}
-		public List<TerminalNode> RBRACK() { return getTokens(JavaParser.RBRACK); }
-		public TerminalNode RBRACK(int i) {
-			return getToken(JavaParser.RBRACK, i);
-		}
-		public VariableDeclaratorIdContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_variableDeclaratorId; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterVariableDeclaratorId(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitVariableDeclaratorId(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitVariableDeclaratorId(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VariableDeclaratorIdContext variableDeclaratorId() throws RecognitionException {
-		VariableDeclaratorIdContext _localctx = new VariableDeclaratorIdContext(_ctx, getState());
-		enterRule(_localctx, 76, RULE_variableDeclaratorId);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(644);
-			identifier();
-			setState(649);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==LBRACK) {
-				{
-				{
-				setState(645);
-				match(LBRACK);
-				setState(646);
-				match(RBRACK);
-				}
-				}
-				setState(651);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VariableInitializerContext extends ParserRuleContext {
-		public ArrayInitializerContext arrayInitializer() {
-			return getRuleContext(ArrayInitializerContext.class,0);
-		}
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public VariableInitializerContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_variableInitializer; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterVariableInitializer(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitVariableInitializer(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitVariableInitializer(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VariableInitializerContext variableInitializer() throws RecognitionException {
-		VariableInitializerContext _localctx = new VariableInitializerContext(_ctx, getState());
-		enterRule(_localctx, 78, RULE_variableInitializer);
-		try {
-			setState(654);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case LBRACE:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(652);
-				arrayInitializer();
-				}
-				break;
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case DOUBLE:
-			case FLOAT:
-			case INT:
-			case LONG:
-			case NEW:
-			case SHORT:
-			case SUPER:
-			case SWITCH:
-			case THIS:
-			case VOID:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case DECIMAL_LITERAL:
-			case HEX_LITERAL:
-			case OCT_LITERAL:
-			case BINARY_LITERAL:
-			case FLOAT_LITERAL:
-			case HEX_FLOAT_LITERAL:
-			case BOOL_LITERAL:
-			case CHAR_LITERAL:
-			case STRING_LITERAL:
-			case TEXT_BLOCK:
-			case NULL_LITERAL:
-			case LPAREN:
-			case LT:
-			case BANG:
-			case TILDE:
-			case INC:
-			case DEC:
-			case ADD:
-			case SUB:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(653);
-				expression(0);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ArrayInitializerContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<VariableInitializerContext> variableInitializer() {
-			return getRuleContexts(VariableInitializerContext.class);
-		}
-		public VariableInitializerContext variableInitializer(int i) {
-			return getRuleContext(VariableInitializerContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public ArrayInitializerContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_arrayInitializer; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterArrayInitializer(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitArrayInitializer(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitArrayInitializer(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ArrayInitializerContext arrayInitializer() throws RecognitionException {
-		ArrayInitializerContext _localctx = new ArrayInitializerContext(_ctx, getState());
-		enterRule(_localctx, 80, RULE_arrayInitializer);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(656);
-			match(LBRACE);
-			setState(668);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610966053L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130013183L) != 0)) {
-				{
-				setState(657);
-				variableInitializer();
-				setState(662);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,62,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(658);
-						match(COMMA);
-						setState(659);
-						variableInitializer();
-						}
-						} 
-					}
-					setState(664);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,62,_ctx);
-				}
-				setState(666);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==COMMA) {
-					{
-					setState(665);
-					match(COMMA);
-					}
-				}
-
-				}
-			}
-
-			setState(670);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassOrInterfaceTypeContext extends ParserRuleContext {
-		public TypeIdentifierContext typeIdentifier() {
-			return getRuleContext(TypeIdentifierContext.class,0);
-		}
-		public List<IdentifierContext> identifier() {
-			return getRuleContexts(IdentifierContext.class);
-		}
-		public IdentifierContext identifier(int i) {
-			return getRuleContext(IdentifierContext.class,i);
-		}
-		public List<TerminalNode> DOT() { return getTokens(JavaParser.DOT); }
-		public TerminalNode DOT(int i) {
-			return getToken(JavaParser.DOT, i);
-		}
-		public List<TypeArgumentsContext> typeArguments() {
-			return getRuleContexts(TypeArgumentsContext.class);
-		}
-		public TypeArgumentsContext typeArguments(int i) {
-			return getRuleContext(TypeArgumentsContext.class,i);
-		}
-		public ClassOrInterfaceTypeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classOrInterfaceType; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassOrInterfaceType(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassOrInterfaceType(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassOrInterfaceType(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassOrInterfaceTypeContext classOrInterfaceType() throws RecognitionException {
-		ClassOrInterfaceTypeContext _localctx = new ClassOrInterfaceTypeContext(_ctx, getState());
-		enterRule(_localctx, 82, RULE_classOrInterfaceType);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(680);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,66,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(672);
-					identifier();
-					setState(674);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					if (_la==LT) {
-						{
-						setState(673);
-						typeArguments();
-						}
-					}
-
-					setState(676);
-					match(DOT);
-					}
-					} 
-				}
-				setState(682);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,66,_ctx);
-			}
-			setState(683);
-			typeIdentifier();
-			setState(685);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,67,_ctx) ) {
-			case 1:
-				{
-				setState(684);
-				typeArguments();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeArgumentContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public TerminalNode QUESTION() { return getToken(JavaParser.QUESTION, 0); }
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public TerminalNode EXTENDS() { return getToken(JavaParser.EXTENDS, 0); }
-		public TerminalNode SUPER() { return getToken(JavaParser.SUPER, 0); }
-		public TypeArgumentContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeArgument; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeArgument(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeArgument(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeArgument(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeArgumentContext typeArgument() throws RecognitionException {
-		TypeArgumentContext _localctx = new TypeArgumentContext(_ctx, getState());
-		enterRule(_localctx, 84, RULE_typeArgument);
-		int _la;
-		try {
-			setState(699);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,70,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(687);
-				typeType();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(691);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==AT || _la==IDENTIFIER) {
-					{
-					{
-					setState(688);
-					annotation();
-					}
-					}
-					setState(693);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				setState(694);
-				match(QUESTION);
-				setState(697);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==EXTENDS || _la==SUPER) {
-					{
-					setState(695);
-					_la = _input.LA(1);
-					if ( !(_la==EXTENDS || _la==SUPER) ) {
-					_errHandler.recoverInline(this);
-					}
-					else {
-						if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-						_errHandler.reportMatch(this);
-						consume();
-					}
-					setState(696);
-					typeType();
-					}
-				}
-
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class QualifiedNameListContext extends ParserRuleContext {
-		public List<QualifiedNameContext> qualifiedName() {
-			return getRuleContexts(QualifiedNameContext.class);
-		}
-		public QualifiedNameContext qualifiedName(int i) {
-			return getRuleContext(QualifiedNameContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public QualifiedNameListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_qualifiedNameList; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterQualifiedNameList(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitQualifiedNameList(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitQualifiedNameList(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final QualifiedNameListContext qualifiedNameList() throws RecognitionException {
-		QualifiedNameListContext _localctx = new QualifiedNameListContext(_ctx, getState());
-		enterRule(_localctx, 86, RULE_qualifiedNameList);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(701);
-			qualifiedName();
-			setState(706);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(702);
-				match(COMMA);
-				setState(703);
-				qualifiedName();
-				}
-				}
-				setState(708);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class FormalParametersContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public ReceiverParameterContext receiverParameter() {
-			return getRuleContext(ReceiverParameterContext.class,0);
-		}
-		public TerminalNode COMMA() { return getToken(JavaParser.COMMA, 0); }
-		public FormalParameterListContext formalParameterList() {
-			return getRuleContext(FormalParameterListContext.class,0);
-		}
-		public FormalParametersContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_formalParameters; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterFormalParameters(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitFormalParameters(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitFormalParameters(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FormalParametersContext formalParameters() throws RecognitionException {
-		FormalParametersContext _localctx = new FormalParametersContext(_ctx, getState());
-		enterRule(_localctx, 88, RULE_formalParameters);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(709);
-			match(LPAREN);
-			setState(721);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,75,_ctx) ) {
-			case 1:
-				{
-				setState(711);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223090579141953573L) != 0) || _la==AT || _la==IDENTIFIER) {
-					{
-					setState(710);
-					receiverParameter();
-					}
-				}
-
-				}
-				break;
-			case 2:
-				{
-				setState(713);
-				receiverParameter();
-				setState(716);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==COMMA) {
-					{
-					setState(714);
-					match(COMMA);
-					setState(715);
-					formalParameterList();
-					}
-				}
-
-				}
-				break;
-			case 3:
-				{
-				setState(719);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223090579141986341L) != 0) || _la==AT || _la==IDENTIFIER) {
-					{
-					setState(718);
-					formalParameterList();
-					}
-				}
-
-				}
-				break;
-			}
-			setState(723);
-			match(RPAREN);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ReceiverParameterContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public TerminalNode THIS() { return getToken(JavaParser.THIS, 0); }
-		public List<IdentifierContext> identifier() {
-			return getRuleContexts(IdentifierContext.class);
-		}
-		public IdentifierContext identifier(int i) {
-			return getRuleContext(IdentifierContext.class,i);
-		}
-		public List<TerminalNode> DOT() { return getTokens(JavaParser.DOT); }
-		public TerminalNode DOT(int i) {
-			return getToken(JavaParser.DOT, i);
-		}
-		public ReceiverParameterContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_receiverParameter; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterReceiverParameter(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitReceiverParameter(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitReceiverParameter(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ReceiverParameterContext receiverParameter() throws RecognitionException {
-		ReceiverParameterContext _localctx = new ReceiverParameterContext(_ctx, getState());
-		enterRule(_localctx, 90, RULE_receiverParameter);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(725);
-			typeType();
-			setState(731);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==IDENTIFIER) {
-				{
-				{
-				setState(726);
-				identifier();
-				setState(727);
-				match(DOT);
-				}
-				}
-				setState(733);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(734);
-			match(THIS);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class FormalParameterListContext extends ParserRuleContext {
-		public List<FormalParameterContext> formalParameter() {
-			return getRuleContexts(FormalParameterContext.class);
-		}
-		public FormalParameterContext formalParameter(int i) {
-			return getRuleContext(FormalParameterContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public LastFormalParameterContext lastFormalParameter() {
-			return getRuleContext(LastFormalParameterContext.class,0);
-		}
-		public FormalParameterListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_formalParameterList; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterFormalParameterList(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitFormalParameterList(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitFormalParameterList(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FormalParameterListContext formalParameterList() throws RecognitionException {
-		FormalParameterListContext _localctx = new FormalParameterListContext(_ctx, getState());
-		enterRule(_localctx, 92, RULE_formalParameterList);
-		int _la;
-		try {
-			int _alt;
-			setState(749);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,79,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(736);
-				formalParameter();
-				setState(741);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,77,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(737);
-						match(COMMA);
-						setState(738);
-						formalParameter();
-						}
-						} 
-					}
-					setState(743);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,77,_ctx);
-				}
-				setState(746);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==COMMA) {
-					{
-					setState(744);
-					match(COMMA);
-					setState(745);
-					lastFormalParameter();
-					}
-				}
-
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(748);
-				lastFormalParameter();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class FormalParameterContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public VariableDeclaratorIdContext variableDeclaratorId() {
-			return getRuleContext(VariableDeclaratorIdContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public FormalParameterContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_formalParameter; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterFormalParameter(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitFormalParameter(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitFormalParameter(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FormalParameterContext formalParameter() throws RecognitionException {
-		FormalParameterContext _localctx = new FormalParameterContext(_ctx, getState());
-		enterRule(_localctx, 94, RULE_formalParameter);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(754);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,80,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(751);
-					variableModifier();
-					}
-					} 
-				}
-				setState(756);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,80,_ctx);
-			}
-			setState(757);
-			typeType();
-			setState(758);
-			variableDeclaratorId();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LastFormalParameterContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public TerminalNode ELLIPSIS() { return getToken(JavaParser.ELLIPSIS, 0); }
-		public VariableDeclaratorIdContext variableDeclaratorId() {
-			return getRuleContext(VariableDeclaratorIdContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public LastFormalParameterContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_lastFormalParameter; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLastFormalParameter(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLastFormalParameter(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLastFormalParameter(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LastFormalParameterContext lastFormalParameter() throws RecognitionException {
-		LastFormalParameterContext _localctx = new LastFormalParameterContext(_ctx, getState());
-		enterRule(_localctx, 96, RULE_lastFormalParameter);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(763);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,81,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(760);
-					variableModifier();
-					}
-					} 
-				}
-				setState(765);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,81,_ctx);
-			}
-			setState(766);
-			typeType();
-			setState(770);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==AT || _la==IDENTIFIER) {
-				{
-				{
-				setState(767);
-				annotation();
-				}
-				}
-				setState(772);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(773);
-			match(ELLIPSIS);
-			setState(774);
-			variableDeclaratorId();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LambdaLVTIListContext extends ParserRuleContext {
-		public List<LambdaLVTIParameterContext> lambdaLVTIParameter() {
-			return getRuleContexts(LambdaLVTIParameterContext.class);
-		}
-		public LambdaLVTIParameterContext lambdaLVTIParameter(int i) {
-			return getRuleContext(LambdaLVTIParameterContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public LambdaLVTIListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_lambdaLVTIList; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLambdaLVTIList(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLambdaLVTIList(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLambdaLVTIList(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LambdaLVTIListContext lambdaLVTIList() throws RecognitionException {
-		LambdaLVTIListContext _localctx = new LambdaLVTIListContext(_ctx, getState());
-		enterRule(_localctx, 98, RULE_lambdaLVTIList);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(776);
-			lambdaLVTIParameter();
-			setState(781);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(777);
-				match(COMMA);
-				setState(778);
-				lambdaLVTIParameter();
-				}
-				}
-				setState(783);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LambdaLVTIParameterContext extends ParserRuleContext {
-		public TerminalNode VAR() { return getToken(JavaParser.VAR, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public LambdaLVTIParameterContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_lambdaLVTIParameter; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLambdaLVTIParameter(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLambdaLVTIParameter(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLambdaLVTIParameter(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LambdaLVTIParameterContext lambdaLVTIParameter() throws RecognitionException {
-		LambdaLVTIParameterContext _localctx = new LambdaLVTIParameterContext(_ctx, getState());
-		enterRule(_localctx, 100, RULE_lambdaLVTIParameter);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(787);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,84,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(784);
-					variableModifier();
-					}
-					} 
-				}
-				setState(789);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,84,_ctx);
-			}
-			setState(790);
-			match(VAR);
-			setState(791);
-			identifier();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class QualifiedNameContext extends ParserRuleContext {
-		public List<IdentifierContext> identifier() {
-			return getRuleContexts(IdentifierContext.class);
-		}
-		public IdentifierContext identifier(int i) {
-			return getRuleContext(IdentifierContext.class,i);
-		}
-		public List<TerminalNode> DOT() { return getTokens(JavaParser.DOT); }
-		public TerminalNode DOT(int i) {
-			return getToken(JavaParser.DOT, i);
-		}
-		public QualifiedNameContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_qualifiedName; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterQualifiedName(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitQualifiedName(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitQualifiedName(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final QualifiedNameContext qualifiedName() throws RecognitionException {
-		QualifiedNameContext _localctx = new QualifiedNameContext(_ctx, getState());
-		enterRule(_localctx, 102, RULE_qualifiedName);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(793);
-			identifier();
-			setState(798);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,85,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(794);
-					match(DOT);
-					setState(795);
-					identifier();
-					}
-					} 
-				}
-				setState(800);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,85,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LiteralContext extends ParserRuleContext {
-		public IntegerLiteralContext integerLiteral() {
-			return getRuleContext(IntegerLiteralContext.class,0);
-		}
-		public FloatLiteralContext floatLiteral() {
-			return getRuleContext(FloatLiteralContext.class,0);
-		}
-		public TerminalNode CHAR_LITERAL() { return getToken(JavaParser.CHAR_LITERAL, 0); }
-		public TerminalNode STRING_LITERAL() { return getToken(JavaParser.STRING_LITERAL, 0); }
-		public TerminalNode BOOL_LITERAL() { return getToken(JavaParser.BOOL_LITERAL, 0); }
-		public TerminalNode NULL_LITERAL() { return getToken(JavaParser.NULL_LITERAL, 0); }
-		public TerminalNode TEXT_BLOCK() { return getToken(JavaParser.TEXT_BLOCK, 0); }
-		public LiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_literal; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLiteral(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLiteral(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLiteral(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LiteralContext literal() throws RecognitionException {
-		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 104, RULE_literal);
-		try {
-			setState(808);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case DECIMAL_LITERAL:
-			case HEX_LITERAL:
-			case OCT_LITERAL:
-			case BINARY_LITERAL:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(801);
-				integerLiteral();
-				}
-				break;
-			case FLOAT_LITERAL:
-			case HEX_FLOAT_LITERAL:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(802);
-				floatLiteral();
-				}
-				break;
-			case CHAR_LITERAL:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(803);
-				match(CHAR_LITERAL);
-				}
-				break;
-			case STRING_LITERAL:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(804);
-				match(STRING_LITERAL);
-				}
-				break;
-			case BOOL_LITERAL:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(805);
-				match(BOOL_LITERAL);
-				}
-				break;
-			case NULL_LITERAL:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(806);
-				match(NULL_LITERAL);
-				}
-				break;
-			case TEXT_BLOCK:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(807);
-				match(TEXT_BLOCK);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class IntegerLiteralContext extends ParserRuleContext {
-		public TerminalNode DECIMAL_LITERAL() { return getToken(JavaParser.DECIMAL_LITERAL, 0); }
-		public TerminalNode HEX_LITERAL() { return getToken(JavaParser.HEX_LITERAL, 0); }
-		public TerminalNode OCT_LITERAL() { return getToken(JavaParser.OCT_LITERAL, 0); }
-		public TerminalNode BINARY_LITERAL() { return getToken(JavaParser.BINARY_LITERAL, 0); }
-		public IntegerLiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_integerLiteral; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterIntegerLiteral(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitIntegerLiteral(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitIntegerLiteral(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final IntegerLiteralContext integerLiteral() throws RecognitionException {
-		IntegerLiteralContext _localctx = new IntegerLiteralContext(_ctx, getState());
-		enterRule(_localctx, 106, RULE_integerLiteral);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(810);
-			_la = _input.LA(1);
-			if ( !(((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 15L) != 0)) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class FloatLiteralContext extends ParserRuleContext {
-		public TerminalNode FLOAT_LITERAL() { return getToken(JavaParser.FLOAT_LITERAL, 0); }
-		public TerminalNode HEX_FLOAT_LITERAL() { return getToken(JavaParser.HEX_FLOAT_LITERAL, 0); }
-		public FloatLiteralContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_floatLiteral; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterFloatLiteral(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitFloatLiteral(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitFloatLiteral(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FloatLiteralContext floatLiteral() throws RecognitionException {
-		FloatLiteralContext _localctx = new FloatLiteralContext(_ctx, getState());
-		enterRule(_localctx, 108, RULE_floatLiteral);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(812);
-			_la = _input.LA(1);
-			if ( !(_la==FLOAT_LITERAL || _la==HEX_FLOAT_LITERAL) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AltAnnotationQualifiedNameContext extends ParserRuleContext {
-		public TerminalNode AT() { return getToken(JavaParser.AT, 0); }
-		public List<IdentifierContext> identifier() {
-			return getRuleContexts(IdentifierContext.class);
-		}
-		public IdentifierContext identifier(int i) {
-			return getRuleContext(IdentifierContext.class,i);
-		}
-		public List<TerminalNode> DOT() { return getTokens(JavaParser.DOT); }
-		public TerminalNode DOT(int i) {
-			return getToken(JavaParser.DOT, i);
-		}
-		public AltAnnotationQualifiedNameContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_altAnnotationQualifiedName; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAltAnnotationQualifiedName(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAltAnnotationQualifiedName(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAltAnnotationQualifiedName(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AltAnnotationQualifiedNameContext altAnnotationQualifiedName() throws RecognitionException {
-		AltAnnotationQualifiedNameContext _localctx = new AltAnnotationQualifiedNameContext(_ctx, getState());
-		enterRule(_localctx, 110, RULE_altAnnotationQualifiedName);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(819);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==IDENTIFIER) {
-				{
-				{
-				setState(814);
-				identifier();
-				setState(815);
-				match(DOT);
-				}
-				}
-				setState(821);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(822);
-			match(AT);
-			setState(823);
-			identifier();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationContext extends ParserRuleContext {
-		public TerminalNode AT() { return getToken(JavaParser.AT, 0); }
-		public QualifiedNameContext qualifiedName() {
-			return getRuleContext(QualifiedNameContext.class,0);
-		}
-		public AltAnnotationQualifiedNameContext altAnnotationQualifiedName() {
-			return getRuleContext(AltAnnotationQualifiedNameContext.class,0);
-		}
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public ElementValuePairsContext elementValuePairs() {
-			return getRuleContext(ElementValuePairsContext.class,0);
-		}
-		public ElementValueContext elementValue() {
-			return getRuleContext(ElementValueContext.class,0);
-		}
-		public AnnotationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotation; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotation(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotation(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotation(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationContext annotation() throws RecognitionException {
-		AnnotationContext _localctx = new AnnotationContext(_ctx, getState());
-		enterRule(_localctx, 112, RULE_annotation);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(828);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,88,_ctx) ) {
-			case 1:
-				{
-				setState(825);
-				match(AT);
-				setState(826);
-				qualifiedName();
-				}
-				break;
-			case 2:
-				{
-				setState(827);
-				altAnnotationQualifiedName();
-				}
-				break;
-			}
-			setState(836);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LPAREN) {
-				{
-				setState(830);
-				match(LPAREN);
-				setState(833);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,89,_ctx) ) {
-				case 1:
-					{
-					setState(831);
-					elementValuePairs();
-					}
-					break;
-				case 2:
-					{
-					setState(832);
-					elementValue();
-					}
-					break;
-				}
-				setState(835);
-				match(RPAREN);
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ElementValuePairsContext extends ParserRuleContext {
-		public List<ElementValuePairContext> elementValuePair() {
-			return getRuleContexts(ElementValuePairContext.class);
-		}
-		public ElementValuePairContext elementValuePair(int i) {
-			return getRuleContext(ElementValuePairContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public ElementValuePairsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_elementValuePairs; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterElementValuePairs(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitElementValuePairs(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitElementValuePairs(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ElementValuePairsContext elementValuePairs() throws RecognitionException {
-		ElementValuePairsContext _localctx = new ElementValuePairsContext(_ctx, getState());
-		enterRule(_localctx, 114, RULE_elementValuePairs);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(838);
-			elementValuePair();
-			setState(843);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(839);
-				match(COMMA);
-				setState(840);
-				elementValuePair();
-				}
-				}
-				setState(845);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ElementValuePairContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode ASSIGN() { return getToken(JavaParser.ASSIGN, 0); }
-		public ElementValueContext elementValue() {
-			return getRuleContext(ElementValueContext.class,0);
-		}
-		public ElementValuePairContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_elementValuePair; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterElementValuePair(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitElementValuePair(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitElementValuePair(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ElementValuePairContext elementValuePair() throws RecognitionException {
-		ElementValuePairContext _localctx = new ElementValuePairContext(_ctx, getState());
-		enterRule(_localctx, 116, RULE_elementValuePair);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(846);
-			identifier();
-			setState(847);
-			match(ASSIGN);
-			setState(848);
-			elementValue();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ElementValueContext extends ParserRuleContext {
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public AnnotationContext annotation() {
-			return getRuleContext(AnnotationContext.class,0);
-		}
-		public ElementValueArrayInitializerContext elementValueArrayInitializer() {
-			return getRuleContext(ElementValueArrayInitializerContext.class,0);
-		}
-		public ElementValueContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_elementValue; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterElementValue(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitElementValue(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitElementValue(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ElementValueContext elementValue() throws RecognitionException {
-		ElementValueContext _localctx = new ElementValueContext(_ctx, getState());
-		enterRule(_localctx, 118, RULE_elementValue);
-		try {
-			setState(853);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,92,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(850);
-				expression(0);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(851);
-				annotation();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(852);
-				elementValueArrayInitializer();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ElementValueArrayInitializerContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<ElementValueContext> elementValue() {
-			return getRuleContexts(ElementValueContext.class);
-		}
-		public ElementValueContext elementValue(int i) {
-			return getRuleContext(ElementValueContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public ElementValueArrayInitializerContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_elementValueArrayInitializer; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterElementValueArrayInitializer(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitElementValueArrayInitializer(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitElementValueArrayInitializer(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ElementValueArrayInitializerContext elementValueArrayInitializer() throws RecognitionException {
-		ElementValueArrayInitializerContext _localctx = new ElementValueArrayInitializerContext(_ctx, getState());
-		enterRule(_localctx, 120, RULE_elementValueArrayInitializer);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(855);
-			match(LBRACE);
-			setState(864);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610966053L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130013183L) != 0)) {
-				{
-				setState(856);
-				elementValue();
-				setState(861);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,93,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(857);
-						match(COMMA);
-						setState(858);
-						elementValue();
-						}
-						} 
-					}
-					setState(863);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,93,_ctx);
-				}
-				}
-			}
-
-			setState(867);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==COMMA) {
-				{
-				setState(866);
-				match(COMMA);
-				}
-			}
-
-			setState(869);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationTypeDeclarationContext extends ParserRuleContext {
-		public TerminalNode AT() { return getToken(JavaParser.AT, 0); }
-		public TerminalNode INTERFACE() { return getToken(JavaParser.INTERFACE, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public AnnotationTypeBodyContext annotationTypeBody() {
-			return getRuleContext(AnnotationTypeBodyContext.class,0);
-		}
-		public AnnotationTypeDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationTypeDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationTypeDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationTypeDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationTypeDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationTypeDeclarationContext annotationTypeDeclaration() throws RecognitionException {
-		AnnotationTypeDeclarationContext _localctx = new AnnotationTypeDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 122, RULE_annotationTypeDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(871);
-			match(AT);
-			setState(872);
-			match(INTERFACE);
-			setState(873);
-			identifier();
-			setState(874);
-			annotationTypeBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationTypeBodyContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<AnnotationTypeElementDeclarationContext> annotationTypeElementDeclaration() {
-			return getRuleContexts(AnnotationTypeElementDeclarationContext.class);
-		}
-		public AnnotationTypeElementDeclarationContext annotationTypeElementDeclaration(int i) {
-			return getRuleContext(AnnotationTypeElementDeclarationContext.class,i);
-		}
-		public AnnotationTypeBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationTypeBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationTypeBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationTypeBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationTypeBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationTypeBodyContext annotationTypeBody() throws RecognitionException {
-		AnnotationTypeBodyContext _localctx = new AnnotationTypeBodyContext(_ctx, getState());
-		enterRule(_localctx, 124, RULE_annotationTypeBody);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(876);
-			match(LBRACE);
-			setState(880);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -806529426349675L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660702539773L) != 0)) {
-				{
-				{
-				setState(877);
-				annotationTypeElementDeclaration();
-				}
-				}
-				setState(882);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(883);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationTypeElementDeclarationContext extends ParserRuleContext {
-		public AnnotationTypeElementRestContext annotationTypeElementRest() {
-			return getRuleContext(AnnotationTypeElementRestContext.class,0);
-		}
-		public List<ModifierContext> modifier() {
-			return getRuleContexts(ModifierContext.class);
-		}
-		public ModifierContext modifier(int i) {
-			return getRuleContext(ModifierContext.class,i);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public AnnotationTypeElementDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationTypeElementDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationTypeElementDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationTypeElementDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationTypeElementDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationTypeElementDeclarationContext annotationTypeElementDeclaration() throws RecognitionException {
-		AnnotationTypeElementDeclarationContext _localctx = new AnnotationTypeElementDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 126, RULE_annotationTypeElementDeclaration);
-		try {
-			int _alt;
-			setState(893);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case ABSTRACT:
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case CLASS:
-			case DOUBLE:
-			case ENUM:
-			case FINAL:
-			case FLOAT:
-			case INT:
-			case INTERFACE:
-			case LONG:
-			case NATIVE:
-			case PRIVATE:
-			case PROTECTED:
-			case PUBLIC:
-			case SHORT:
-			case STATIC:
-			case STRICTFP:
-			case SYNCHRONIZED:
-			case TRANSIENT:
-			case VOLATILE:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case NON_SEALED:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(888);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,97,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(885);
-						modifier();
-						}
-						} 
-					}
-					setState(890);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,97,_ctx);
-				}
-				setState(891);
-				annotationTypeElementRest();
-				}
-				break;
-			case SEMI:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(892);
-				match(SEMI);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationTypeElementRestContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public AnnotationMethodOrConstantRestContext annotationMethodOrConstantRest() {
-			return getRuleContext(AnnotationMethodOrConstantRestContext.class,0);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public ClassDeclarationContext classDeclaration() {
-			return getRuleContext(ClassDeclarationContext.class,0);
-		}
-		public InterfaceDeclarationContext interfaceDeclaration() {
-			return getRuleContext(InterfaceDeclarationContext.class,0);
-		}
-		public EnumDeclarationContext enumDeclaration() {
-			return getRuleContext(EnumDeclarationContext.class,0);
-		}
-		public AnnotationTypeDeclarationContext annotationTypeDeclaration() {
-			return getRuleContext(AnnotationTypeDeclarationContext.class,0);
-		}
-		public RecordDeclarationContext recordDeclaration() {
-			return getRuleContext(RecordDeclarationContext.class,0);
-		}
-		public AnnotationTypeElementRestContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationTypeElementRest; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationTypeElementRest(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationTypeElementRest(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationTypeElementRest(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationTypeElementRestContext annotationTypeElementRest() throws RecognitionException {
-		AnnotationTypeElementRestContext _localctx = new AnnotationTypeElementRestContext(_ctx, getState());
-		enterRule(_localctx, 128, RULE_annotationTypeElementRest);
-		try {
-			setState(919);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,104,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(895);
-				typeType();
-				setState(896);
-				annotationMethodOrConstantRest();
-				setState(897);
-				match(SEMI);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(899);
-				classDeclaration();
-				setState(901);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,99,_ctx) ) {
-				case 1:
-					{
-					setState(900);
-					match(SEMI);
-					}
-					break;
-				}
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(903);
-				interfaceDeclaration();
-				setState(905);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,100,_ctx) ) {
-				case 1:
-					{
-					setState(904);
-					match(SEMI);
-					}
-					break;
-				}
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(907);
-				enumDeclaration();
-				setState(909);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,101,_ctx) ) {
-				case 1:
-					{
-					setState(908);
-					match(SEMI);
-					}
-					break;
-				}
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(911);
-				annotationTypeDeclaration();
-				setState(913);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,102,_ctx) ) {
-				case 1:
-					{
-					setState(912);
-					match(SEMI);
-					}
-					break;
-				}
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(915);
-				recordDeclaration();
-				setState(917);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,103,_ctx) ) {
-				case 1:
-					{
-					setState(916);
-					match(SEMI);
-					}
-					break;
-				}
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationMethodOrConstantRestContext extends ParserRuleContext {
-		public AnnotationMethodRestContext annotationMethodRest() {
-			return getRuleContext(AnnotationMethodRestContext.class,0);
-		}
-		public AnnotationConstantRestContext annotationConstantRest() {
-			return getRuleContext(AnnotationConstantRestContext.class,0);
-		}
-		public AnnotationMethodOrConstantRestContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationMethodOrConstantRest; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationMethodOrConstantRest(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationMethodOrConstantRest(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationMethodOrConstantRest(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationMethodOrConstantRestContext annotationMethodOrConstantRest() throws RecognitionException {
-		AnnotationMethodOrConstantRestContext _localctx = new AnnotationMethodOrConstantRestContext(_ctx, getState());
-		enterRule(_localctx, 130, RULE_annotationMethodOrConstantRest);
-		try {
-			setState(923);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,105,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(921);
-				annotationMethodRest();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(922);
-				annotationConstantRest();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationMethodRestContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public DefaultValueContext defaultValue() {
-			return getRuleContext(DefaultValueContext.class,0);
-		}
-		public AnnotationMethodRestContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationMethodRest; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationMethodRest(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationMethodRest(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationMethodRest(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationMethodRestContext annotationMethodRest() throws RecognitionException {
-		AnnotationMethodRestContext _localctx = new AnnotationMethodRestContext(_ctx, getState());
-		enterRule(_localctx, 132, RULE_annotationMethodRest);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(925);
-			identifier();
-			setState(926);
-			match(LPAREN);
-			setState(927);
-			match(RPAREN);
-			setState(929);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==DEFAULT) {
-				{
-				setState(928);
-				defaultValue();
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AnnotationConstantRestContext extends ParserRuleContext {
-		public VariableDeclaratorsContext variableDeclarators() {
-			return getRuleContext(VariableDeclaratorsContext.class,0);
-		}
-		public AnnotationConstantRestContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_annotationConstantRest; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterAnnotationConstantRest(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitAnnotationConstantRest(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitAnnotationConstantRest(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AnnotationConstantRestContext annotationConstantRest() throws RecognitionException {
-		AnnotationConstantRestContext _localctx = new AnnotationConstantRestContext(_ctx, getState());
-		enterRule(_localctx, 134, RULE_annotationConstantRest);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(931);
-			variableDeclarators();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class DefaultValueContext extends ParserRuleContext {
-		public TerminalNode DEFAULT() { return getToken(JavaParser.DEFAULT, 0); }
-		public ElementValueContext elementValue() {
-			return getRuleContext(ElementValueContext.class,0);
-		}
-		public DefaultValueContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_defaultValue; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterDefaultValue(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitDefaultValue(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitDefaultValue(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final DefaultValueContext defaultValue() throws RecognitionException {
-		DefaultValueContext _localctx = new DefaultValueContext(_ctx, getState());
-		enterRule(_localctx, 136, RULE_defaultValue);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(933);
-			match(DEFAULT);
-			setState(934);
-			elementValue();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ModuleDeclarationContext extends ParserRuleContext {
-		public TerminalNode MODULE() { return getToken(JavaParser.MODULE, 0); }
-		public QualifiedNameContext qualifiedName() {
-			return getRuleContext(QualifiedNameContext.class,0);
-		}
-		public ModuleBodyContext moduleBody() {
-			return getRuleContext(ModuleBodyContext.class,0);
-		}
-		public TerminalNode OPEN() { return getToken(JavaParser.OPEN, 0); }
-		public ModuleDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_moduleDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterModuleDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitModuleDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitModuleDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ModuleDeclarationContext moduleDeclaration() throws RecognitionException {
-		ModuleDeclarationContext _localctx = new ModuleDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 138, RULE_moduleDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(937);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==OPEN) {
-				{
-				setState(936);
-				match(OPEN);
-				}
-			}
-
-			setState(939);
-			match(MODULE);
-			setState(940);
-			qualifiedName();
-			setState(941);
-			moduleBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ModuleBodyContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<ModuleDirectiveContext> moduleDirective() {
-			return getRuleContexts(ModuleDirectiveContext.class);
-		}
-		public ModuleDirectiveContext moduleDirective(int i) {
-			return getRuleContext(ModuleDirectiveContext.class,i);
-		}
-		public ModuleBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_moduleBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterModuleBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitModuleBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitModuleBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ModuleBodyContext moduleBody() throws RecognitionException {
-		ModuleBodyContext _localctx = new ModuleBodyContext(_ctx, getState());
-		enterRule(_localctx, 140, RULE_moduleBody);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(943);
-			match(LBRACE);
-			setState(947);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 495395959010754560L) != 0)) {
-				{
-				{
-				setState(944);
-				moduleDirective();
-				}
-				}
-				setState(949);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(950);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ModuleDirectiveContext extends ParserRuleContext {
-		public TerminalNode REQUIRES() { return getToken(JavaParser.REQUIRES, 0); }
-		public List<QualifiedNameContext> qualifiedName() {
-			return getRuleContexts(QualifiedNameContext.class);
-		}
-		public QualifiedNameContext qualifiedName(int i) {
-			return getRuleContext(QualifiedNameContext.class,i);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public List<RequiresModifierContext> requiresModifier() {
-			return getRuleContexts(RequiresModifierContext.class);
-		}
-		public RequiresModifierContext requiresModifier(int i) {
-			return getRuleContext(RequiresModifierContext.class,i);
-		}
-		public TerminalNode EXPORTS() { return getToken(JavaParser.EXPORTS, 0); }
-		public TerminalNode TO() { return getToken(JavaParser.TO, 0); }
-		public TerminalNode OPENS() { return getToken(JavaParser.OPENS, 0); }
-		public TerminalNode USES() { return getToken(JavaParser.USES, 0); }
-		public TerminalNode PROVIDES() { return getToken(JavaParser.PROVIDES, 0); }
-		public TerminalNode WITH() { return getToken(JavaParser.WITH, 0); }
-		public ModuleDirectiveContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_moduleDirective; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterModuleDirective(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitModuleDirective(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitModuleDirective(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ModuleDirectiveContext moduleDirective() throws RecognitionException {
-		ModuleDirectiveContext _localctx = new ModuleDirectiveContext(_ctx, getState());
-		enterRule(_localctx, 142, RULE_moduleDirective);
-		int _la;
-		try {
-			int _alt;
-			setState(988);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case REQUIRES:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(952);
-				match(REQUIRES);
-				setState(956);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,109,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(953);
-						requiresModifier();
-						}
-						} 
-					}
-					setState(958);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,109,_ctx);
-				}
-				setState(959);
-				qualifiedName();
-				setState(960);
-				match(SEMI);
-				}
-				break;
-			case EXPORTS:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(962);
-				match(EXPORTS);
-				setState(963);
-				qualifiedName();
-				setState(966);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==TO) {
-					{
-					setState(964);
-					match(TO);
-					setState(965);
-					qualifiedName();
-					}
-				}
-
-				setState(968);
-				match(SEMI);
-				}
-				break;
-			case OPENS:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(970);
-				match(OPENS);
-				setState(971);
-				qualifiedName();
-				setState(974);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==TO) {
-					{
-					setState(972);
-					match(TO);
-					setState(973);
-					qualifiedName();
-					}
-				}
-
-				setState(976);
-				match(SEMI);
-				}
-				break;
-			case USES:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(978);
-				match(USES);
-				setState(979);
-				qualifiedName();
-				setState(980);
-				match(SEMI);
-				}
-				break;
-			case PROVIDES:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(982);
-				match(PROVIDES);
-				setState(983);
-				qualifiedName();
-				setState(984);
-				match(WITH);
-				setState(985);
-				qualifiedName();
-				setState(986);
-				match(SEMI);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class RequiresModifierContext extends ParserRuleContext {
-		public TerminalNode TRANSITIVE() { return getToken(JavaParser.TRANSITIVE, 0); }
-		public TerminalNode STATIC() { return getToken(JavaParser.STATIC, 0); }
-		public RequiresModifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_requiresModifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterRequiresModifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitRequiresModifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitRequiresModifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final RequiresModifierContext requiresModifier() throws RecognitionException {
-		RequiresModifierContext _localctx = new RequiresModifierContext(_ctx, getState());
-		enterRule(_localctx, 144, RULE_requiresModifier);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(990);
-			_la = _input.LA(1);
-			if ( !(_la==STATIC || _la==TRANSITIVE) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class RecordDeclarationContext extends ParserRuleContext {
-		public TerminalNode RECORD() { return getToken(JavaParser.RECORD, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public RecordHeaderContext recordHeader() {
-			return getRuleContext(RecordHeaderContext.class,0);
-		}
-		public RecordBodyContext recordBody() {
-			return getRuleContext(RecordBodyContext.class,0);
-		}
-		public TypeParametersContext typeParameters() {
-			return getRuleContext(TypeParametersContext.class,0);
-		}
-		public TerminalNode IMPLEMENTS() { return getToken(JavaParser.IMPLEMENTS, 0); }
-		public TypeListContext typeList() {
-			return getRuleContext(TypeListContext.class,0);
-		}
-		public RecordDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_recordDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterRecordDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitRecordDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitRecordDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final RecordDeclarationContext recordDeclaration() throws RecognitionException {
-		RecordDeclarationContext _localctx = new RecordDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 146, RULE_recordDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(992);
-			match(RECORD);
-			setState(993);
-			identifier();
-			setState(995);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LT) {
-				{
-				setState(994);
-				typeParameters();
-				}
-			}
-
-			setState(997);
-			recordHeader();
-			setState(1000);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==IMPLEMENTS) {
-				{
-				setState(998);
-				match(IMPLEMENTS);
-				setState(999);
-				typeList();
-				}
-			}
-
-			setState(1002);
-			recordBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class RecordHeaderContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public RecordComponentListContext recordComponentList() {
-			return getRuleContext(RecordComponentListContext.class,0);
-		}
-		public RecordHeaderContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_recordHeader; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterRecordHeader(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitRecordHeader(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitRecordHeader(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final RecordHeaderContext recordHeader() throws RecognitionException {
-		RecordHeaderContext _localctx = new RecordHeaderContext(_ctx, getState());
-		enterRule(_localctx, 148, RULE_recordHeader);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1004);
-			match(LPAREN);
-			setState(1006);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223090579141953573L) != 0) || _la==AT || _la==IDENTIFIER) {
-				{
-				setState(1005);
-				recordComponentList();
-				}
-			}
-
-			setState(1008);
-			match(RPAREN);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class RecordComponentListContext extends ParserRuleContext {
-		public List<RecordComponentContext> recordComponent() {
-			return getRuleContexts(RecordComponentContext.class);
-		}
-		public RecordComponentContext recordComponent(int i) {
-			return getRuleContext(RecordComponentContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public RecordComponentListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_recordComponentList; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterRecordComponentList(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitRecordComponentList(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitRecordComponentList(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final RecordComponentListContext recordComponentList() throws RecognitionException {
-		RecordComponentListContext _localctx = new RecordComponentListContext(_ctx, getState());
-		enterRule(_localctx, 150, RULE_recordComponentList);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1010);
-			recordComponent();
-			setState(1015);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(1011);
-				match(COMMA);
-				setState(1012);
-				recordComponent();
-				}
-				}
-				setState(1017);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class RecordComponentContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public RecordComponentContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_recordComponent; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterRecordComponent(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitRecordComponent(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitRecordComponent(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final RecordComponentContext recordComponent() throws RecognitionException {
-		RecordComponentContext _localctx = new RecordComponentContext(_ctx, getState());
-		enterRule(_localctx, 152, RULE_recordComponent);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1018);
-			typeType();
-			setState(1019);
-			identifier();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class RecordBodyContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<ClassBodyDeclarationContext> classBodyDeclaration() {
-			return getRuleContexts(ClassBodyDeclarationContext.class);
-		}
-		public ClassBodyDeclarationContext classBodyDeclaration(int i) {
-			return getRuleContext(ClassBodyDeclarationContext.class,i);
-		}
-		public List<CompactConstructorDeclarationContext> compactConstructorDeclaration() {
-			return getRuleContexts(CompactConstructorDeclarationContext.class);
-		}
-		public CompactConstructorDeclarationContext compactConstructorDeclaration(int i) {
-			return getRuleContext(CompactConstructorDeclarationContext.class,i);
-		}
-		public RecordBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_recordBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterRecordBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitRecordBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitRecordBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final RecordBodyContext recordBody() throws RecognitionException {
-		RecordBodyContext _localctx = new RecordBodyContext(_ctx, getState());
-		enterRule(_localctx, 154, RULE_recordBody);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1021);
-			match(LBRACE);
-			setState(1026);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -665791937994347L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141660685729789L) != 0)) {
-				{
-				setState(1024);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,117,_ctx) ) {
-				case 1:
-					{
-					setState(1022);
-					classBodyDeclaration();
-					}
-					break;
-				case 2:
-					{
-					setState(1023);
-					compactConstructorDeclaration();
-					}
-					break;
-				}
-				}
-				setState(1028);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(1029);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class BlockContext extends ParserRuleContext {
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<BlockStatementContext> blockStatement() {
-			return getRuleContexts(BlockStatementContext.class);
-		}
-		public BlockStatementContext blockStatement(int i) {
-			return getRuleContext(BlockStatementContext.class,i);
-		}
-		public BlockContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_block; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterBlock(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitBlock(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitBlock(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final BlockContext block() throws RecognitionException {
-		BlockContext _localctx = new BlockContext(_ctx, getState());
-		enterRule(_localctx, 156, RULE_block);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1031);
-			match(LBRACE);
-			setState(1035);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -334254282492513L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141145188974593L) != 0)) {
-				{
-				{
-				setState(1032);
-				blockStatement();
-				}
-				}
-				setState(1037);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(1038);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class BlockStatementContext extends ParserRuleContext {
-		public LocalVariableDeclarationContext localVariableDeclaration() {
-			return getRuleContext(LocalVariableDeclarationContext.class,0);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public LocalTypeDeclarationContext localTypeDeclaration() {
-			return getRuleContext(LocalTypeDeclarationContext.class,0);
-		}
-		public StatementContext statement() {
-			return getRuleContext(StatementContext.class,0);
-		}
-		public BlockStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_blockStatement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterBlockStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitBlockStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitBlockStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final BlockStatementContext blockStatement() throws RecognitionException {
-		BlockStatementContext _localctx = new BlockStatementContext(_ctx, getState());
-		enterRule(_localctx, 158, RULE_blockStatement);
-		try {
-			setState(1045);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,120,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1040);
-				localVariableDeclaration();
-				setState(1041);
-				match(SEMI);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1043);
-				localTypeDeclaration();
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(1044);
-				statement();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LocalVariableDeclarationContext extends ParserRuleContext {
-		public TerminalNode VAR() { return getToken(JavaParser.VAR, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode ASSIGN() { return getToken(JavaParser.ASSIGN, 0); }
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public VariableDeclaratorsContext variableDeclarators() {
-			return getRuleContext(VariableDeclaratorsContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public LocalVariableDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_localVariableDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLocalVariableDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLocalVariableDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLocalVariableDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LocalVariableDeclarationContext localVariableDeclaration() throws RecognitionException {
-		LocalVariableDeclarationContext _localctx = new LocalVariableDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 160, RULE_localVariableDeclaration);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1050);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,121,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1047);
-					variableModifier();
-					}
-					} 
-				}
-				setState(1052);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,121,_ctx);
-			}
-			setState(1061);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,122,_ctx) ) {
-			case 1:
-				{
-				setState(1053);
-				match(VAR);
-				setState(1054);
-				identifier();
-				setState(1055);
-				match(ASSIGN);
-				setState(1056);
-				expression(0);
-				}
-				break;
-			case 2:
-				{
-				setState(1058);
-				typeType();
-				setState(1059);
-				variableDeclarators();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class IdentifierContext extends ParserRuleContext {
-		public TerminalNode IDENTIFIER() { return getToken(JavaParser.IDENTIFIER, 0); }
-		public TerminalNode MODULE() { return getToken(JavaParser.MODULE, 0); }
-		public TerminalNode OPEN() { return getToken(JavaParser.OPEN, 0); }
-		public TerminalNode REQUIRES() { return getToken(JavaParser.REQUIRES, 0); }
-		public TerminalNode EXPORTS() { return getToken(JavaParser.EXPORTS, 0); }
-		public TerminalNode OPENS() { return getToken(JavaParser.OPENS, 0); }
-		public TerminalNode TO() { return getToken(JavaParser.TO, 0); }
-		public TerminalNode USES() { return getToken(JavaParser.USES, 0); }
-		public TerminalNode PROVIDES() { return getToken(JavaParser.PROVIDES, 0); }
-		public TerminalNode WITH() { return getToken(JavaParser.WITH, 0); }
-		public TerminalNode TRANSITIVE() { return getToken(JavaParser.TRANSITIVE, 0); }
-		public TerminalNode YIELD() { return getToken(JavaParser.YIELD, 0); }
-		public TerminalNode SEALED() { return getToken(JavaParser.SEALED, 0); }
-		public TerminalNode PERMITS() { return getToken(JavaParser.PERMITS, 0); }
-		public TerminalNode RECORD() { return getToken(JavaParser.RECORD, 0); }
-		public TerminalNode VAR() { return getToken(JavaParser.VAR, 0); }
-		public IdentifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_identifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterIdentifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitIdentifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitIdentifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final IdentifierContext identifier() throws RecognitionException {
-		IdentifierContext _localctx = new IdentifierContext(_ctx, getState());
-		enterRule(_localctx, 162, RULE_identifier);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1063);
-			_la = _input.LA(1);
-			if ( !(((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==IDENTIFIER) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeIdentifierContext extends ParserRuleContext {
-		public TerminalNode IDENTIFIER() { return getToken(JavaParser.IDENTIFIER, 0); }
-		public TerminalNode MODULE() { return getToken(JavaParser.MODULE, 0); }
-		public TerminalNode OPEN() { return getToken(JavaParser.OPEN, 0); }
-		public TerminalNode REQUIRES() { return getToken(JavaParser.REQUIRES, 0); }
-		public TerminalNode EXPORTS() { return getToken(JavaParser.EXPORTS, 0); }
-		public TerminalNode OPENS() { return getToken(JavaParser.OPENS, 0); }
-		public TerminalNode TO() { return getToken(JavaParser.TO, 0); }
-		public TerminalNode USES() { return getToken(JavaParser.USES, 0); }
-		public TerminalNode PROVIDES() { return getToken(JavaParser.PROVIDES, 0); }
-		public TerminalNode WITH() { return getToken(JavaParser.WITH, 0); }
-		public TerminalNode TRANSITIVE() { return getToken(JavaParser.TRANSITIVE, 0); }
-		public TerminalNode SEALED() { return getToken(JavaParser.SEALED, 0); }
-		public TerminalNode PERMITS() { return getToken(JavaParser.PERMITS, 0); }
-		public TerminalNode RECORD() { return getToken(JavaParser.RECORD, 0); }
-		public TypeIdentifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeIdentifier; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeIdentifier(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeIdentifier(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeIdentifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeIdentifierContext typeIdentifier() throws RecognitionException {
-		TypeIdentifierContext _localctx = new TypeIdentifierContext(_ctx, getState());
-		enterRule(_localctx, 164, RULE_typeIdentifier);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1065);
-			_la = _input.LA(1);
-			if ( !(((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 29695L) != 0) || _la==IDENTIFIER) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LocalTypeDeclarationContext extends ParserRuleContext {
-		public ClassDeclarationContext classDeclaration() {
-			return getRuleContext(ClassDeclarationContext.class,0);
-		}
-		public InterfaceDeclarationContext interfaceDeclaration() {
-			return getRuleContext(InterfaceDeclarationContext.class,0);
-		}
-		public RecordDeclarationContext recordDeclaration() {
-			return getRuleContext(RecordDeclarationContext.class,0);
-		}
-		public List<ClassOrInterfaceModifierContext> classOrInterfaceModifier() {
-			return getRuleContexts(ClassOrInterfaceModifierContext.class);
-		}
-		public ClassOrInterfaceModifierContext classOrInterfaceModifier(int i) {
-			return getRuleContext(ClassOrInterfaceModifierContext.class,i);
-		}
-		public LocalTypeDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_localTypeDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLocalTypeDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLocalTypeDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLocalTypeDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LocalTypeDeclarationContext localTypeDeclaration() throws RecognitionException {
-		LocalTypeDeclarationContext _localctx = new LocalTypeDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 166, RULE_localTypeDeclaration);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1070);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,123,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1067);
-					classOrInterfaceModifier();
-					}
-					} 
-				}
-				setState(1072);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,123,_ctx);
-			}
-			setState(1076);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case CLASS:
-				{
-				setState(1073);
-				classDeclaration();
-				}
-				break;
-			case INTERFACE:
-				{
-				setState(1074);
-				interfaceDeclaration();
-				}
-				break;
-			case RECORD:
-				{
-				setState(1075);
-				recordDeclaration();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class StatementContext extends ParserRuleContext {
-		public BlockContext blockLabel;
-		public ExpressionContext statementExpression;
-		public IdentifierContext identifierLabel;
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public TerminalNode ASSERT() { return getToken(JavaParser.ASSERT, 0); }
-		public List<ExpressionContext> expression() {
-			return getRuleContexts(ExpressionContext.class);
-		}
-		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
-		}
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public TerminalNode COLON() { return getToken(JavaParser.COLON, 0); }
-		public TerminalNode IF() { return getToken(JavaParser.IF, 0); }
-		public ParExpressionContext parExpression() {
-			return getRuleContext(ParExpressionContext.class,0);
-		}
-		public List<StatementContext> statement() {
-			return getRuleContexts(StatementContext.class);
-		}
-		public StatementContext statement(int i) {
-			return getRuleContext(StatementContext.class,i);
-		}
-		public TerminalNode ELSE() { return getToken(JavaParser.ELSE, 0); }
-		public TerminalNode FOR() { return getToken(JavaParser.FOR, 0); }
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public ForControlContext forControl() {
-			return getRuleContext(ForControlContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public TerminalNode WHILE() { return getToken(JavaParser.WHILE, 0); }
-		public TerminalNode DO() { return getToken(JavaParser.DO, 0); }
-		public TerminalNode TRY() { return getToken(JavaParser.TRY, 0); }
-		public FinallyBlockContext finallyBlock() {
-			return getRuleContext(FinallyBlockContext.class,0);
-		}
-		public List<CatchClauseContext> catchClause() {
-			return getRuleContexts(CatchClauseContext.class);
-		}
-		public CatchClauseContext catchClause(int i) {
-			return getRuleContext(CatchClauseContext.class,i);
-		}
-		public ResourceSpecificationContext resourceSpecification() {
-			return getRuleContext(ResourceSpecificationContext.class,0);
-		}
-		public TerminalNode SWITCH() { return getToken(JavaParser.SWITCH, 0); }
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<SwitchBlockStatementGroupContext> switchBlockStatementGroup() {
-			return getRuleContexts(SwitchBlockStatementGroupContext.class);
-		}
-		public SwitchBlockStatementGroupContext switchBlockStatementGroup(int i) {
-			return getRuleContext(SwitchBlockStatementGroupContext.class,i);
-		}
-		public List<SwitchLabelContext> switchLabel() {
-			return getRuleContexts(SwitchLabelContext.class);
-		}
-		public SwitchLabelContext switchLabel(int i) {
-			return getRuleContext(SwitchLabelContext.class,i);
-		}
-		public TerminalNode SYNCHRONIZED() { return getToken(JavaParser.SYNCHRONIZED, 0); }
-		public TerminalNode RETURN() { return getToken(JavaParser.RETURN, 0); }
-		public TerminalNode THROW() { return getToken(JavaParser.THROW, 0); }
-		public TerminalNode BREAK() { return getToken(JavaParser.BREAK, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode CONTINUE() { return getToken(JavaParser.CONTINUE, 0); }
-		public TerminalNode YIELD() { return getToken(JavaParser.YIELD, 0); }
-		public SwitchExpressionContext switchExpression() {
-			return getRuleContext(SwitchExpressionContext.class,0);
-		}
-		public StatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_statement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final StatementContext statement() throws RecognitionException {
-		StatementContext _localctx = new StatementContext(_ctx, getState());
-		enterRule(_localctx, 168, RULE_statement);
-		int _la;
-		try {
-			int _alt;
-			setState(1191);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,138,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1078);
-				((StatementContext)_localctx).blockLabel = block();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1079);
-				match(ASSERT);
-				setState(1080);
-				expression(0);
-				setState(1083);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==COLON) {
-					{
-					setState(1081);
-					match(COLON);
-					setState(1082);
-					expression(0);
-					}
-				}
-
-				setState(1085);
-				match(SEMI);
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(1087);
-				match(IF);
-				setState(1088);
-				parExpression();
-				setState(1089);
-				statement();
-				setState(1092);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,126,_ctx) ) {
-				case 1:
-					{
-					setState(1090);
-					match(ELSE);
-					setState(1091);
-					statement();
-					}
-					break;
-				}
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(1094);
-				match(FOR);
-				setState(1095);
-				match(LPAREN);
-				setState(1096);
-				forControl();
-				setState(1097);
-				match(RPAREN);
-				setState(1098);
-				statement();
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(1100);
-				match(WHILE);
-				setState(1101);
-				parExpression();
-				setState(1102);
-				statement();
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(1104);
-				match(DO);
-				setState(1105);
-				statement();
-				setState(1106);
-				match(WHILE);
-				setState(1107);
-				parExpression();
-				setState(1108);
-				match(SEMI);
-				}
-				break;
-			case 7:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(1110);
-				match(TRY);
-				setState(1111);
-				block();
-				setState(1121);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case CATCH:
-					{
-					setState(1113); 
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					do {
-						{
-						{
-						setState(1112);
-						catchClause();
-						}
-						}
-						setState(1115); 
-						_errHandler.sync(this);
-						_la = _input.LA(1);
-					} while ( _la==CATCH );
-					setState(1118);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					if (_la==FINALLY) {
-						{
-						setState(1117);
-						finallyBlock();
-						}
-					}
-
-					}
-					break;
-				case FINALLY:
-					{
-					setState(1120);
-					finallyBlock();
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				}
-				break;
-			case 8:
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(1123);
-				match(TRY);
-				setState(1124);
-				resourceSpecification();
-				setState(1125);
-				block();
-				setState(1129);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==CATCH) {
-					{
-					{
-					setState(1126);
-					catchClause();
-					}
-					}
-					setState(1131);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				setState(1133);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==FINALLY) {
-					{
-					setState(1132);
-					finallyBlock();
-					}
-				}
-
-				}
-				break;
-			case 9:
-				enterOuterAlt(_localctx, 9);
-				{
-				setState(1135);
-				match(SWITCH);
-				setState(1136);
-				parExpression();
-				setState(1137);
-				match(LBRACE);
-				setState(1141);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,132,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1138);
-						switchBlockStatementGroup();
-						}
-						} 
-					}
-					setState(1143);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,132,_ctx);
-				}
-				setState(1147);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==CASE || _la==DEFAULT) {
-					{
-					{
-					setState(1144);
-					switchLabel();
-					}
-					}
-					setState(1149);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				setState(1150);
-				match(RBRACE);
-				}
-				break;
-			case 10:
-				enterOuterAlt(_localctx, 10);
-				{
-				setState(1152);
-				match(SYNCHRONIZED);
-				setState(1153);
-				parExpression();
-				setState(1154);
-				block();
-				}
-				break;
-			case 11:
-				enterOuterAlt(_localctx, 11);
-				{
-				setState(1156);
-				match(RETURN);
-				setState(1158);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610966053L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130004991L) != 0)) {
-					{
-					setState(1157);
-					expression(0);
-					}
-				}
-
-				setState(1160);
-				match(SEMI);
-				}
-				break;
-			case 12:
-				enterOuterAlt(_localctx, 12);
-				{
-				setState(1161);
-				match(THROW);
-				setState(1162);
-				expression(0);
-				setState(1163);
-				match(SEMI);
-				}
-				break;
-			case 13:
-				enterOuterAlt(_localctx, 13);
-				{
-				setState(1165);
-				match(BREAK);
-				setState(1167);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==IDENTIFIER) {
-					{
-					setState(1166);
-					identifier();
-					}
-				}
-
-				setState(1169);
-				match(SEMI);
-				}
-				break;
-			case 14:
-				enterOuterAlt(_localctx, 14);
-				{
-				setState(1170);
-				match(CONTINUE);
-				setState(1172);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==IDENTIFIER) {
-					{
-					setState(1171);
-					identifier();
-					}
-				}
-
-				setState(1174);
-				match(SEMI);
-				}
-				break;
-			case 15:
-				enterOuterAlt(_localctx, 15);
-				{
-				setState(1175);
-				match(YIELD);
-				setState(1176);
-				expression(0);
-				setState(1177);
-				match(SEMI);
-				}
-				break;
-			case 16:
-				enterOuterAlt(_localctx, 16);
-				{
-				setState(1179);
-				match(SEMI);
-				}
-				break;
-			case 17:
-				enterOuterAlt(_localctx, 17);
-				{
-				setState(1180);
-				((StatementContext)_localctx).statementExpression = expression(0);
-				setState(1181);
-				match(SEMI);
-				}
-				break;
-			case 18:
-				enterOuterAlt(_localctx, 18);
-				{
-				setState(1183);
-				switchExpression();
-				setState(1185);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,137,_ctx) ) {
-				case 1:
-					{
-					setState(1184);
-					match(SEMI);
-					}
-					break;
-				}
-				}
-				break;
-			case 19:
-				enterOuterAlt(_localctx, 19);
-				{
-				setState(1187);
-				((StatementContext)_localctx).identifierLabel = identifier();
-				setState(1188);
-				match(COLON);
-				setState(1189);
-				statement();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class CatchClauseContext extends ParserRuleContext {
-		public TerminalNode CATCH() { return getToken(JavaParser.CATCH, 0); }
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public CatchTypeContext catchType() {
-			return getRuleContext(CatchTypeContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public CatchClauseContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_catchClause; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterCatchClause(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitCatchClause(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitCatchClause(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final CatchClauseContext catchClause() throws RecognitionException {
-		CatchClauseContext _localctx = new CatchClauseContext(_ctx, getState());
-		enterRule(_localctx, 170, RULE_catchClause);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1193);
-			match(CATCH);
-			setState(1194);
-			match(LPAREN);
-			setState(1198);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,139,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1195);
-					variableModifier();
-					}
-					} 
-				}
-				setState(1200);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,139,_ctx);
-			}
-			setState(1201);
-			catchType();
-			setState(1202);
-			identifier();
-			setState(1203);
-			match(RPAREN);
-			setState(1204);
-			block();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class CatchTypeContext extends ParserRuleContext {
-		public List<QualifiedNameContext> qualifiedName() {
-			return getRuleContexts(QualifiedNameContext.class);
-		}
-		public QualifiedNameContext qualifiedName(int i) {
-			return getRuleContext(QualifiedNameContext.class,i);
-		}
-		public List<TerminalNode> BITOR() { return getTokens(JavaParser.BITOR); }
-		public TerminalNode BITOR(int i) {
-			return getToken(JavaParser.BITOR, i);
-		}
-		public CatchTypeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_catchType; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterCatchType(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitCatchType(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitCatchType(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final CatchTypeContext catchType() throws RecognitionException {
-		CatchTypeContext _localctx = new CatchTypeContext(_ctx, getState());
-		enterRule(_localctx, 172, RULE_catchType);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1206);
-			qualifiedName();
-			setState(1211);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==BITOR) {
-				{
-				{
-				setState(1207);
-				match(BITOR);
-				setState(1208);
-				qualifiedName();
-				}
-				}
-				setState(1213);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class FinallyBlockContext extends ParserRuleContext {
-		public TerminalNode FINALLY() { return getToken(JavaParser.FINALLY, 0); }
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public FinallyBlockContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_finallyBlock; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterFinallyBlock(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitFinallyBlock(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitFinallyBlock(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FinallyBlockContext finallyBlock() throws RecognitionException {
-		FinallyBlockContext _localctx = new FinallyBlockContext(_ctx, getState());
-		enterRule(_localctx, 174, RULE_finallyBlock);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1214);
-			match(FINALLY);
-			setState(1215);
-			block();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ResourceSpecificationContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public ResourcesContext resources() {
-			return getRuleContext(ResourcesContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public TerminalNode SEMI() { return getToken(JavaParser.SEMI, 0); }
-		public ResourceSpecificationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_resourceSpecification; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterResourceSpecification(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitResourceSpecification(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitResourceSpecification(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ResourceSpecificationContext resourceSpecification() throws RecognitionException {
-		ResourceSpecificationContext _localctx = new ResourceSpecificationContext(_ctx, getState());
-		enterRule(_localctx, 176, RULE_resourceSpecification);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1217);
-			match(LPAREN);
-			setState(1218);
-			resources();
-			setState(1220);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==SEMI) {
-				{
-				setState(1219);
-				match(SEMI);
-				}
-			}
-
-			setState(1222);
-			match(RPAREN);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ResourcesContext extends ParserRuleContext {
-		public List<ResourceContext> resource() {
-			return getRuleContexts(ResourceContext.class);
-		}
-		public ResourceContext resource(int i) {
-			return getRuleContext(ResourceContext.class,i);
-		}
-		public List<TerminalNode> SEMI() { return getTokens(JavaParser.SEMI); }
-		public TerminalNode SEMI(int i) {
-			return getToken(JavaParser.SEMI, i);
-		}
-		public ResourcesContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_resources; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterResources(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitResources(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitResources(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ResourcesContext resources() throws RecognitionException {
-		ResourcesContext _localctx = new ResourcesContext(_ctx, getState());
-		enterRule(_localctx, 178, RULE_resources);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1224);
-			resource();
-			setState(1229);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,142,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1225);
-					match(SEMI);
-					setState(1226);
-					resource();
-					}
-					} 
-				}
-				setState(1231);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,142,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ResourceContext extends ParserRuleContext {
-		public TerminalNode ASSIGN() { return getToken(JavaParser.ASSIGN, 0); }
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public ClassOrInterfaceTypeContext classOrInterfaceType() {
-			return getRuleContext(ClassOrInterfaceTypeContext.class,0);
-		}
-		public VariableDeclaratorIdContext variableDeclaratorId() {
-			return getRuleContext(VariableDeclaratorIdContext.class,0);
-		}
-		public TerminalNode VAR() { return getToken(JavaParser.VAR, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public QualifiedNameContext qualifiedName() {
-			return getRuleContext(QualifiedNameContext.class,0);
-		}
-		public ResourceContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_resource; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterResource(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitResource(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitResource(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ResourceContext resource() throws RecognitionException {
-		ResourceContext _localctx = new ResourceContext(_ctx, getState());
-		enterRule(_localctx, 180, RULE_resource);
-		try {
-			int _alt;
-			setState(1249);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,145,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1235);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,143,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1232);
-						variableModifier();
-						}
-						} 
-					}
-					setState(1237);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,143,_ctx);
-				}
-				setState(1243);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,144,_ctx) ) {
-				case 1:
-					{
-					setState(1238);
-					classOrInterfaceType();
-					setState(1239);
-					variableDeclaratorId();
-					}
-					break;
-				case 2:
-					{
-					setState(1241);
-					match(VAR);
-					setState(1242);
-					identifier();
-					}
-					break;
-				}
-				setState(1245);
-				match(ASSIGN);
-				setState(1246);
-				expression(0);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1248);
-				qualifiedName();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class SwitchBlockStatementGroupContext extends ParserRuleContext {
-		public List<SwitchLabelContext> switchLabel() {
-			return getRuleContexts(SwitchLabelContext.class);
-		}
-		public SwitchLabelContext switchLabel(int i) {
-			return getRuleContext(SwitchLabelContext.class,i);
-		}
-		public List<BlockStatementContext> blockStatement() {
-			return getRuleContexts(BlockStatementContext.class);
-		}
-		public BlockStatementContext blockStatement(int i) {
-			return getRuleContext(BlockStatementContext.class,i);
-		}
-		public SwitchBlockStatementGroupContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_switchBlockStatementGroup; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterSwitchBlockStatementGroup(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitSwitchBlockStatementGroup(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitSwitchBlockStatementGroup(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final SwitchBlockStatementGroupContext switchBlockStatementGroup() throws RecognitionException {
-		SwitchBlockStatementGroupContext _localctx = new SwitchBlockStatementGroupContext(_ctx, getState());
-		enterRule(_localctx, 182, RULE_switchBlockStatementGroup);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1252); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
-				{
-				{
-				setState(1251);
-				switchLabel();
-				}
-				}
-				setState(1254); 
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			} while ( _la==CASE || _la==DEFAULT );
-			setState(1257); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
-				{
-				{
-				setState(1256);
-				blockStatement();
-				}
-				}
-				setState(1259); 
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			} while ( ((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -334254282492513L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141145188974593L) != 0) );
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class SwitchLabelContext extends ParserRuleContext {
-		public ExpressionContext constantExpression;
-		public Token enumConstantName;
-		public IdentifierContext varName;
-		public TerminalNode CASE() { return getToken(JavaParser.CASE, 0); }
-		public TerminalNode COLON() { return getToken(JavaParser.COLON, 0); }
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public TerminalNode IDENTIFIER() { return getToken(JavaParser.IDENTIFIER, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode DEFAULT() { return getToken(JavaParser.DEFAULT, 0); }
-		public SwitchLabelContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_switchLabel; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterSwitchLabel(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitSwitchLabel(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitSwitchLabel(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final SwitchLabelContext switchLabel() throws RecognitionException {
-		SwitchLabelContext _localctx = new SwitchLabelContext(_ctx, getState());
-		enterRule(_localctx, 184, RULE_switchLabel);
-		try {
-			setState(1272);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case CASE:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1261);
-				match(CASE);
-				setState(1267);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,148,_ctx) ) {
-				case 1:
-					{
-					setState(1262);
-					((SwitchLabelContext)_localctx).constantExpression = expression(0);
-					}
-					break;
-				case 2:
-					{
-					setState(1263);
-					((SwitchLabelContext)_localctx).enumConstantName = match(IDENTIFIER);
-					}
-					break;
-				case 3:
-					{
-					setState(1264);
-					typeType();
-					setState(1265);
-					((SwitchLabelContext)_localctx).varName = identifier();
-					}
-					break;
-				}
-				setState(1269);
-				match(COLON);
-				}
-				break;
-			case DEFAULT:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1270);
-				match(DEFAULT);
-				setState(1271);
-				match(COLON);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ForControlContext extends ParserRuleContext {
-		public ExpressionListContext forUpdate;
-		public EnhancedForControlContext enhancedForControl() {
-			return getRuleContext(EnhancedForControlContext.class,0);
-		}
-		public List<TerminalNode> SEMI() { return getTokens(JavaParser.SEMI); }
-		public TerminalNode SEMI(int i) {
-			return getToken(JavaParser.SEMI, i);
-		}
-		public ForInitContext forInit() {
-			return getRuleContext(ForInitContext.class,0);
-		}
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public ExpressionListContext expressionList() {
-			return getRuleContext(ExpressionListContext.class,0);
-		}
-		public ForControlContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_forControl; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterForControl(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitForControl(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitForControl(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ForControlContext forControl() throws RecognitionException {
-		ForControlContext _localctx = new ForControlContext(_ctx, getState());
-		enterRule(_localctx, 186, RULE_forControl);
-		int _la;
-		try {
-			setState(1286);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,153,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1274);
-				enhancedForControl();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1276);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610998821L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130004991L) != 0)) {
-					{
-					setState(1275);
-					forInit();
-					}
-				}
-
-				setState(1278);
-				match(SEMI);
-				setState(1280);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610966053L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130004991L) != 0)) {
-					{
-					setState(1279);
-					expression(0);
-					}
-				}
-
-				setState(1282);
-				match(SEMI);
-				setState(1284);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610966053L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130004991L) != 0)) {
-					{
-					setState(1283);
-					((ForControlContext)_localctx).forUpdate = expressionList();
-					}
-				}
-
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ForInitContext extends ParserRuleContext {
-		public LocalVariableDeclarationContext localVariableDeclaration() {
-			return getRuleContext(LocalVariableDeclarationContext.class,0);
-		}
-		public ExpressionListContext expressionList() {
-			return getRuleContext(ExpressionListContext.class,0);
-		}
-		public ForInitContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_forInit; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterForInit(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitForInit(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitForInit(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ForInitContext forInit() throws RecognitionException {
-		ForInitContext _localctx = new ForInitContext(_ctx, getState());
-		enterRule(_localctx, 188, RULE_forInit);
-		try {
-			setState(1290);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,154,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1288);
-				localVariableDeclaration();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1289);
-				expressionList();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class EnhancedForControlContext extends ParserRuleContext {
-		public VariableDeclaratorIdContext variableDeclaratorId() {
-			return getRuleContext(VariableDeclaratorIdContext.class,0);
-		}
-		public TerminalNode COLON() { return getToken(JavaParser.COLON, 0); }
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public TerminalNode VAR() { return getToken(JavaParser.VAR, 0); }
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public EnhancedForControlContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_enhancedForControl; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterEnhancedForControl(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitEnhancedForControl(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitEnhancedForControl(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final EnhancedForControlContext enhancedForControl() throws RecognitionException {
-		EnhancedForControlContext _localctx = new EnhancedForControlContext(_ctx, getState());
-		enterRule(_localctx, 190, RULE_enhancedForControl);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1295);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,155,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1292);
-					variableModifier();
-					}
-					} 
-				}
-				setState(1297);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,155,_ctx);
-			}
-			setState(1300);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,156,_ctx) ) {
-			case 1:
-				{
-				setState(1298);
-				typeType();
-				}
-				break;
-			case 2:
-				{
-				setState(1299);
-				match(VAR);
-				}
-				break;
-			}
-			setState(1302);
-			variableDeclaratorId();
-			setState(1303);
-			match(COLON);
-			setState(1304);
-			expression(0);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ParExpressionContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public ParExpressionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_parExpression; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterParExpression(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitParExpression(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitParExpression(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ParExpressionContext parExpression() throws RecognitionException {
-		ParExpressionContext _localctx = new ParExpressionContext(_ctx, getState());
-		enterRule(_localctx, 192, RULE_parExpression);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1306);
-			match(LPAREN);
-			setState(1307);
-			expression(0);
-			setState(1308);
-			match(RPAREN);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ExpressionListContext extends ParserRuleContext {
-		public List<ExpressionContext> expression() {
-			return getRuleContexts(ExpressionContext.class);
-		}
-		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public ExpressionListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_expressionList; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterExpressionList(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitExpressionList(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitExpressionList(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ExpressionListContext expressionList() throws RecognitionException {
-		ExpressionListContext _localctx = new ExpressionListContext(_ctx, getState());
-		enterRule(_localctx, 194, RULE_expressionList);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1310);
-			expression(0);
-			setState(1315);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(1311);
-				match(COMMA);
-				setState(1312);
-				expression(0);
-				}
-				}
-				setState(1317);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class MethodCallContext extends ParserRuleContext {
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode THIS() { return getToken(JavaParser.THIS, 0); }
-		public TerminalNode SUPER() { return getToken(JavaParser.SUPER, 0); }
-		public MethodCallContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_methodCall; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterMethodCall(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitMethodCall(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitMethodCall(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final MethodCallContext methodCall() throws RecognitionException {
-		MethodCallContext _localctx = new MethodCallContext(_ctx, getState());
-		enterRule(_localctx, 196, RULE_methodCall);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1321);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case IDENTIFIER:
-				{
-				setState(1318);
-				identifier();
-				}
-				break;
-			case THIS:
-				{
-				setState(1319);
-				match(THIS);
-				}
-				break;
-			case SUPER:
-				{
-				setState(1320);
-				match(SUPER);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			setState(1323);
-			arguments();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ExpressionContext extends ParserRuleContext {
-		public Token prefix;
-		public Token bop;
-		public Token postfix;
-		public PrimaryContext primary() {
-			return getRuleContext(PrimaryContext.class,0);
-		}
-		public MethodCallContext methodCall() {
-			return getRuleContext(MethodCallContext.class,0);
-		}
-		public List<TypeTypeContext> typeType() {
-			return getRuleContexts(TypeTypeContext.class);
-		}
-		public TypeTypeContext typeType(int i) {
-			return getRuleContext(TypeTypeContext.class,i);
-		}
-		public TerminalNode COLONCOLON() { return getToken(JavaParser.COLONCOLON, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TerminalNode NEW() { return getToken(JavaParser.NEW, 0); }
-		public TypeArgumentsContext typeArguments() {
-			return getRuleContext(TypeArgumentsContext.class,0);
-		}
-		public ClassTypeContext classType() {
-			return getRuleContext(ClassTypeContext.class,0);
-		}
-		public SwitchExpressionContext switchExpression() {
-			return getRuleContext(SwitchExpressionContext.class,0);
-		}
-		public List<ExpressionContext> expression() {
-			return getRuleContexts(ExpressionContext.class);
-		}
-		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
-		}
-		public TerminalNode ADD() { return getToken(JavaParser.ADD, 0); }
-		public TerminalNode SUB() { return getToken(JavaParser.SUB, 0); }
-		public TerminalNode INC() { return getToken(JavaParser.INC, 0); }
-		public TerminalNode DEC() { return getToken(JavaParser.DEC, 0); }
-		public TerminalNode TILDE() { return getToken(JavaParser.TILDE, 0); }
-		public TerminalNode BANG() { return getToken(JavaParser.BANG, 0); }
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public List<TerminalNode> BITAND() { return getTokens(JavaParser.BITAND); }
-		public TerminalNode BITAND(int i) {
-			return getToken(JavaParser.BITAND, i);
-		}
-		public CreatorContext creator() {
-			return getRuleContext(CreatorContext.class,0);
-		}
-		public LambdaExpressionContext lambdaExpression() {
-			return getRuleContext(LambdaExpressionContext.class,0);
-		}
-		public TerminalNode MUL() { return getToken(JavaParser.MUL, 0); }
-		public TerminalNode DIV() { return getToken(JavaParser.DIV, 0); }
-		public TerminalNode MOD() { return getToken(JavaParser.MOD, 0); }
-		public List<TerminalNode> LT() { return getTokens(JavaParser.LT); }
-		public TerminalNode LT(int i) {
-			return getToken(JavaParser.LT, i);
-		}
-		public List<TerminalNode> GT() { return getTokens(JavaParser.GT); }
-		public TerminalNode GT(int i) {
-			return getToken(JavaParser.GT, i);
-		}
-		public TerminalNode LE() { return getToken(JavaParser.LE, 0); }
-		public TerminalNode GE() { return getToken(JavaParser.GE, 0); }
-		public TerminalNode EQUAL() { return getToken(JavaParser.EQUAL, 0); }
-		public TerminalNode NOTEQUAL() { return getToken(JavaParser.NOTEQUAL, 0); }
-		public TerminalNode CARET() { return getToken(JavaParser.CARET, 0); }
-		public TerminalNode BITOR() { return getToken(JavaParser.BITOR, 0); }
-		public TerminalNode AND() { return getToken(JavaParser.AND, 0); }
-		public TerminalNode OR() { return getToken(JavaParser.OR, 0); }
-		public TerminalNode COLON() { return getToken(JavaParser.COLON, 0); }
-		public TerminalNode QUESTION() { return getToken(JavaParser.QUESTION, 0); }
-		public TerminalNode ASSIGN() { return getToken(JavaParser.ASSIGN, 0); }
-		public TerminalNode ADD_ASSIGN() { return getToken(JavaParser.ADD_ASSIGN, 0); }
-		public TerminalNode SUB_ASSIGN() { return getToken(JavaParser.SUB_ASSIGN, 0); }
-		public TerminalNode MUL_ASSIGN() { return getToken(JavaParser.MUL_ASSIGN, 0); }
-		public TerminalNode DIV_ASSIGN() { return getToken(JavaParser.DIV_ASSIGN, 0); }
-		public TerminalNode AND_ASSIGN() { return getToken(JavaParser.AND_ASSIGN, 0); }
-		public TerminalNode OR_ASSIGN() { return getToken(JavaParser.OR_ASSIGN, 0); }
-		public TerminalNode XOR_ASSIGN() { return getToken(JavaParser.XOR_ASSIGN, 0); }
-		public TerminalNode RSHIFT_ASSIGN() { return getToken(JavaParser.RSHIFT_ASSIGN, 0); }
-		public TerminalNode URSHIFT_ASSIGN() { return getToken(JavaParser.URSHIFT_ASSIGN, 0); }
-		public TerminalNode LSHIFT_ASSIGN() { return getToken(JavaParser.LSHIFT_ASSIGN, 0); }
-		public TerminalNode MOD_ASSIGN() { return getToken(JavaParser.MOD_ASSIGN, 0); }
-		public TerminalNode LBRACK() { return getToken(JavaParser.LBRACK, 0); }
-		public TerminalNode RBRACK() { return getToken(JavaParser.RBRACK, 0); }
-		public TerminalNode DOT() { return getToken(JavaParser.DOT, 0); }
-		public TerminalNode THIS() { return getToken(JavaParser.THIS, 0); }
-		public InnerCreatorContext innerCreator() {
-			return getRuleContext(InnerCreatorContext.class,0);
-		}
-		public TerminalNode SUPER() { return getToken(JavaParser.SUPER, 0); }
-		public SuperSuffixContext superSuffix() {
-			return getRuleContext(SuperSuffixContext.class,0);
-		}
-		public ExplicitGenericInvocationContext explicitGenericInvocation() {
-			return getRuleContext(ExplicitGenericInvocationContext.class,0);
-		}
-		public NonWildcardTypeArgumentsContext nonWildcardTypeArguments() {
-			return getRuleContext(NonWildcardTypeArgumentsContext.class,0);
-		}
-		public TerminalNode INSTANCEOF() { return getToken(JavaParser.INSTANCEOF, 0); }
-		public PatternContext pattern() {
-			return getRuleContext(PatternContext.class,0);
-		}
-		public ExpressionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_expression; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterExpression(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitExpression(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitExpression(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ExpressionContext expression() throws RecognitionException {
-		return expression(0);
-	}
-
-	private ExpressionContext expression(int _p) throws RecognitionException {
-		ParserRuleContext _parentctx = _ctx;
-		int _parentState = getState();
-		ExpressionContext _localctx = new ExpressionContext(_ctx, _parentState);
-		ExpressionContext _prevctx = _localctx;
-		int _startState = 198;
-		enterRecursionRule(_localctx, 198, RULE_expression, _p);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1368);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,164,_ctx) ) {
-			case 1:
-				{
-				setState(1326);
-				primary();
-				}
-				break;
-			case 2:
-				{
-				setState(1327);
-				methodCall();
-				}
-				break;
-			case 3:
-				{
-				setState(1328);
-				typeType();
-				setState(1329);
-				match(COLONCOLON);
-				setState(1335);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case MODULE:
-				case OPEN:
-				case REQUIRES:
-				case EXPORTS:
-				case OPENS:
-				case TO:
-				case USES:
-				case PROVIDES:
-				case WITH:
-				case TRANSITIVE:
-				case VAR:
-				case YIELD:
-				case RECORD:
-				case SEALED:
-				case PERMITS:
-				case LT:
-				case IDENTIFIER:
-					{
-					setState(1331);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					if (_la==LT) {
-						{
-						setState(1330);
-						typeArguments();
-						}
-					}
-
-					setState(1333);
-					identifier();
-					}
-					break;
-				case NEW:
-					{
-					setState(1334);
-					match(NEW);
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				}
-				break;
-			case 4:
-				{
-				setState(1337);
-				classType();
-				setState(1338);
-				match(COLONCOLON);
-				setState(1340);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==LT) {
-					{
-					setState(1339);
-					typeArguments();
-					}
-				}
-
-				setState(1342);
-				match(NEW);
-				}
-				break;
-			case 5:
-				{
-				setState(1344);
-				switchExpression();
-				}
-				break;
-			case 6:
-				{
-				setState(1345);
-				((ExpressionContext)_localctx).prefix = _input.LT(1);
-				_la = _input.LA(1);
-				if ( !(((((_la - 90)) & ~0x3f) == 0 && ((1L << (_la - 90)) & 15363L) != 0)) ) {
-					((ExpressionContext)_localctx).prefix = (Token)_errHandler.recoverInline(this);
-				}
-				else {
-					if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-					_errHandler.reportMatch(this);
-					consume();
-				}
-				setState(1346);
-				expression(17);
-				}
-				break;
-			case 7:
-				{
-				setState(1347);
-				match(LPAREN);
-				setState(1351);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,162,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1348);
-						annotation();
-						}
-						} 
-					}
-					setState(1353);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,162,_ctx);
-				}
-				setState(1354);
-				typeType();
-				setState(1359);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==BITAND) {
-					{
-					{
-					setState(1355);
-					match(BITAND);
-					setState(1356);
-					typeType();
-					}
-					}
-					setState(1361);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				setState(1362);
-				match(RPAREN);
-				setState(1363);
-				expression(16);
-				}
-				break;
-			case 8:
-				{
-				setState(1365);
-				match(NEW);
-				setState(1366);
-				creator();
-				}
-				break;
-			case 9:
-				{
-				setState(1367);
-				lambdaExpression();
-				}
-				break;
-			}
-			_ctx.stop = _input.LT(-1);
-			setState(1453);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,171,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					if ( _parseListeners!=null ) triggerExitRuleEvent();
-					_prevctx = _localctx;
-					{
-					setState(1451);
-					_errHandler.sync(this);
-					switch ( getInterpreter().adaptivePredict(_input,170,_ctx) ) {
-					case 1:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1370);
-						if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)");
-						setState(1371);
-						((ExpressionContext)_localctx).bop = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !(((((_la - 104)) & ~0x3f) == 0 && ((1L << (_la - 104)) & 35L) != 0)) ) {
-							((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(1372);
-						expression(15);
-						}
-						break;
-					case 2:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1373);
-						if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
-						setState(1374);
-						((ExpressionContext)_localctx).bop = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !(_la==ADD || _la==SUB) ) {
-							((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(1375);
-						expression(14);
-						}
-						break;
-					case 3:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1376);
-						if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
-						setState(1384);
-						_errHandler.sync(this);
-						switch ( getInterpreter().adaptivePredict(_input,165,_ctx) ) {
-						case 1:
-							{
-							setState(1377);
-							match(LT);
-							setState(1378);
-							match(LT);
-							}
-							break;
-						case 2:
-							{
-							setState(1379);
-							match(GT);
-							setState(1380);
-							match(GT);
-							setState(1381);
-							match(GT);
-							}
-							break;
-						case 3:
-							{
-							setState(1382);
-							match(GT);
-							setState(1383);
-							match(GT);
-							}
-							break;
-						}
-						setState(1386);
-						expression(13);
-						}
-						break;
-					case 4:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1387);
-						if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
-						setState(1388);
-						((ExpressionContext)_localctx).bop = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !(((((_la - 88)) & ~0x3f) == 0 && ((1L << (_la - 88)) & 387L) != 0)) ) {
-							((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(1389);
-						expression(12);
-						}
-						break;
-					case 5:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1390);
-						if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
-						setState(1391);
-						((ExpressionContext)_localctx).bop = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !(_la==EQUAL || _la==NOTEQUAL) ) {
-							((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(1392);
-						expression(10);
-						}
-						break;
-					case 6:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1393);
-						if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
-						setState(1394);
-						((ExpressionContext)_localctx).bop = match(BITAND);
-						setState(1395);
-						expression(9);
-						}
-						break;
-					case 7:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1396);
-						if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
-						setState(1397);
-						((ExpressionContext)_localctx).bop = match(CARET);
-						setState(1398);
-						expression(8);
-						}
-						break;
-					case 8:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1399);
-						if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
-						setState(1400);
-						((ExpressionContext)_localctx).bop = match(BITOR);
-						setState(1401);
-						expression(7);
-						}
-						break;
-					case 9:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1402);
-						if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)");
-						setState(1403);
-						((ExpressionContext)_localctx).bop = match(AND);
-						setState(1404);
-						expression(6);
-						}
-						break;
-					case 10:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1405);
-						if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
-						setState(1406);
-						((ExpressionContext)_localctx).bop = match(OR);
-						setState(1407);
-						expression(5);
-						}
-						break;
-					case 11:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1408);
-						if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
-						setState(1409);
-						((ExpressionContext)_localctx).bop = match(QUESTION);
-						setState(1410);
-						expression(0);
-						setState(1411);
-						match(COLON);
-						setState(1412);
-						expression(3);
-						}
-						break;
-					case 12:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1414);
-						if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
-						setState(1415);
-						((ExpressionContext)_localctx).bop = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !(((((_la - 87)) & ~0x3f) == 0 && ((1L << (_la - 87)) & 17171480577L) != 0)) ) {
-							((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(1416);
-						expression(2);
-						}
-						break;
-					case 13:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1417);
-						if (!(precpred(_ctx, 25))) throw new FailedPredicateException(this, "precpred(_ctx, 25)");
-						setState(1418);
-						match(LBRACK);
-						setState(1419);
-						expression(0);
-						setState(1420);
-						match(RBRACK);
-						}
-						break;
-					case 14:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1422);
-						if (!(precpred(_ctx, 24))) throw new FailedPredicateException(this, "precpred(_ctx, 24)");
-						setState(1423);
-						((ExpressionContext)_localctx).bop = match(DOT);
-						setState(1435);
-						_errHandler.sync(this);
-						switch ( getInterpreter().adaptivePredict(_input,167,_ctx) ) {
-						case 1:
-							{
-							setState(1424);
-							identifier();
-							}
-							break;
-						case 2:
-							{
-							setState(1425);
-							methodCall();
-							}
-							break;
-						case 3:
-							{
-							setState(1426);
-							match(THIS);
-							}
-							break;
-						case 4:
-							{
-							setState(1427);
-							match(NEW);
-							setState(1429);
-							_errHandler.sync(this);
-							_la = _input.LA(1);
-							if (_la==LT) {
-								{
-								setState(1428);
-								nonWildcardTypeArguments();
-								}
-							}
-
-							setState(1431);
-							innerCreator();
-							}
-							break;
-						case 5:
-							{
-							setState(1432);
-							match(SUPER);
-							setState(1433);
-							superSuffix();
-							}
-							break;
-						case 6:
-							{
-							setState(1434);
-							explicitGenericInvocation();
-							}
-							break;
-						}
-						}
-						break;
-					case 15:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1437);
-						if (!(precpred(_ctx, 22))) throw new FailedPredicateException(this, "precpred(_ctx, 22)");
-						setState(1438);
-						match(COLONCOLON);
-						setState(1440);
-						_errHandler.sync(this);
-						_la = _input.LA(1);
-						if (_la==LT) {
-							{
-							setState(1439);
-							typeArguments();
-							}
-						}
-
-						setState(1442);
-						identifier();
-						}
-						break;
-					case 16:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1443);
-						if (!(precpred(_ctx, 18))) throw new FailedPredicateException(this, "precpred(_ctx, 18)");
-						setState(1444);
-						((ExpressionContext)_localctx).postfix = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !(_la==INC || _la==DEC) ) {
-							((ExpressionContext)_localctx).postfix = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						}
-						break;
-					case 17:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(1445);
-						if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
-						setState(1446);
-						((ExpressionContext)_localctx).bop = match(INSTANCEOF);
-						setState(1449);
-						_errHandler.sync(this);
-						switch ( getInterpreter().adaptivePredict(_input,169,_ctx) ) {
-						case 1:
-							{
-							setState(1447);
-							typeType();
-							}
-							break;
-						case 2:
-							{
-							setState(1448);
-							pattern();
-							}
-							break;
-						}
-						}
-						break;
-					}
-					} 
-				}
-				setState(1455);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,171,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			unrollRecursionContexts(_parentctx);
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class PatternContext extends ParserRuleContext {
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public PatternContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_pattern; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterPattern(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitPattern(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitPattern(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final PatternContext pattern() throws RecognitionException {
-		PatternContext _localctx = new PatternContext(_ctx, getState());
-		enterRule(_localctx, 200, RULE_pattern);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1459);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,172,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1456);
-					variableModifier();
-					}
-					} 
-				}
-				setState(1461);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,172,_ctx);
-			}
-			setState(1462);
-			typeType();
-			setState(1466);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,173,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1463);
-					annotation();
-					}
-					} 
-				}
-				setState(1468);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,173,_ctx);
-			}
-			setState(1469);
-			identifier();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LambdaExpressionContext extends ParserRuleContext {
-		public LambdaParametersContext lambdaParameters() {
-			return getRuleContext(LambdaParametersContext.class,0);
-		}
-		public TerminalNode ARROW() { return getToken(JavaParser.ARROW, 0); }
-		public LambdaBodyContext lambdaBody() {
-			return getRuleContext(LambdaBodyContext.class,0);
-		}
-		public LambdaExpressionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_lambdaExpression; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLambdaExpression(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLambdaExpression(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLambdaExpression(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LambdaExpressionContext lambdaExpression() throws RecognitionException {
-		LambdaExpressionContext _localctx = new LambdaExpressionContext(_ctx, getState());
-		enterRule(_localctx, 202, RULE_lambdaExpression);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1471);
-			lambdaParameters();
-			setState(1472);
-			match(ARROW);
-			setState(1473);
-			lambdaBody();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LambdaParametersContext extends ParserRuleContext {
-		public List<IdentifierContext> identifier() {
-			return getRuleContexts(IdentifierContext.class);
-		}
-		public IdentifierContext identifier(int i) {
-			return getRuleContext(IdentifierContext.class,i);
-		}
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public FormalParameterListContext formalParameterList() {
-			return getRuleContext(FormalParameterListContext.class,0);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public LambdaLVTIListContext lambdaLVTIList() {
-			return getRuleContext(LambdaLVTIListContext.class,0);
-		}
-		public LambdaParametersContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_lambdaParameters; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLambdaParameters(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLambdaParameters(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLambdaParameters(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LambdaParametersContext lambdaParameters() throws RecognitionException {
-		LambdaParametersContext _localctx = new LambdaParametersContext(_ctx, getState());
-		enterRule(_localctx, 204, RULE_lambdaParameters);
-		int _la;
-		try {
-			setState(1497);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,177,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1475);
-				identifier();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1476);
-				match(LPAREN);
-				setState(1478);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223090579141986341L) != 0) || _la==AT || _la==IDENTIFIER) {
-					{
-					setState(1477);
-					formalParameterList();
-					}
-				}
-
-				setState(1480);
-				match(RPAREN);
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(1481);
-				match(LPAREN);
-				setState(1482);
-				identifier();
-				setState(1487);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==COMMA) {
-					{
-					{
-					setState(1483);
-					match(COMMA);
-					setState(1484);
-					identifier();
-					}
-					}
-					setState(1489);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				setState(1490);
-				match(RPAREN);
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(1492);
-				match(LPAREN);
-				setState(1494);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (((((_la - 18)) & ~0x3f) == 0 && ((1L << (_la - 18)) & 281466386776065L) != 0) || _la==AT || _la==IDENTIFIER) {
-					{
-					setState(1493);
-					lambdaLVTIList();
-					}
-				}
-
-				setState(1496);
-				match(RPAREN);
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class LambdaBodyContext extends ParserRuleContext {
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public LambdaBodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_lambdaBody; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterLambdaBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitLambdaBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitLambdaBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final LambdaBodyContext lambdaBody() throws RecognitionException {
-		LambdaBodyContext _localctx = new LambdaBodyContext(_ctx, getState());
-		enterRule(_localctx, 206, RULE_lambdaBody);
-		try {
-			setState(1501);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case DOUBLE:
-			case FLOAT:
-			case INT:
-			case LONG:
-			case NEW:
-			case SHORT:
-			case SUPER:
-			case SWITCH:
-			case THIS:
-			case VOID:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case DECIMAL_LITERAL:
-			case HEX_LITERAL:
-			case OCT_LITERAL:
-			case BINARY_LITERAL:
-			case FLOAT_LITERAL:
-			case HEX_FLOAT_LITERAL:
-			case BOOL_LITERAL:
-			case CHAR_LITERAL:
-			case STRING_LITERAL:
-			case TEXT_BLOCK:
-			case NULL_LITERAL:
-			case LPAREN:
-			case LT:
-			case BANG:
-			case TILDE:
-			case INC:
-			case DEC:
-			case ADD:
-			case SUB:
-			case AT:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1499);
-				expression(0);
-				}
-				break;
-			case LBRACE:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1500);
-				block();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class PrimaryContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public TerminalNode THIS() { return getToken(JavaParser.THIS, 0); }
-		public TerminalNode SUPER() { return getToken(JavaParser.SUPER, 0); }
-		public LiteralContext literal() {
-			return getRuleContext(LiteralContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TypeTypeOrVoidContext typeTypeOrVoid() {
-			return getRuleContext(TypeTypeOrVoidContext.class,0);
-		}
-		public TerminalNode DOT() { return getToken(JavaParser.DOT, 0); }
-		public TerminalNode CLASS() { return getToken(JavaParser.CLASS, 0); }
-		public NonWildcardTypeArgumentsContext nonWildcardTypeArguments() {
-			return getRuleContext(NonWildcardTypeArgumentsContext.class,0);
-		}
-		public ExplicitGenericInvocationSuffixContext explicitGenericInvocationSuffix() {
-			return getRuleContext(ExplicitGenericInvocationSuffixContext.class,0);
-		}
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public PrimaryContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_primary; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterPrimary(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitPrimary(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitPrimary(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final PrimaryContext primary() throws RecognitionException {
-		PrimaryContext _localctx = new PrimaryContext(_ctx, getState());
-		enterRule(_localctx, 208, RULE_primary);
-		try {
-			setState(1521);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,180,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1503);
-				match(LPAREN);
-				setState(1504);
-				expression(0);
-				setState(1505);
-				match(RPAREN);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1507);
-				match(THIS);
-				}
-				break;
-			case 3:
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(1508);
-				match(SUPER);
-				}
-				break;
-			case 4:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(1509);
-				literal();
-				}
-				break;
-			case 5:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(1510);
-				identifier();
-				}
-				break;
-			case 6:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(1511);
-				typeTypeOrVoid();
-				setState(1512);
-				match(DOT);
-				setState(1513);
-				match(CLASS);
-				}
-				break;
-			case 7:
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(1515);
-				nonWildcardTypeArguments();
-				setState(1519);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case SUPER:
-				case MODULE:
-				case OPEN:
-				case REQUIRES:
-				case EXPORTS:
-				case OPENS:
-				case TO:
-				case USES:
-				case PROVIDES:
-				case WITH:
-				case TRANSITIVE:
-				case VAR:
-				case YIELD:
-				case RECORD:
-				case SEALED:
-				case PERMITS:
-				case IDENTIFIER:
-					{
-					setState(1516);
-					explicitGenericInvocationSuffix();
-					}
-					break;
-				case THIS:
-					{
-					setState(1517);
-					match(THIS);
-					setState(1518);
-					arguments();
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class SwitchExpressionContext extends ParserRuleContext {
-		public TerminalNode SWITCH() { return getToken(JavaParser.SWITCH, 0); }
-		public ParExpressionContext parExpression() {
-			return getRuleContext(ParExpressionContext.class,0);
-		}
-		public TerminalNode LBRACE() { return getToken(JavaParser.LBRACE, 0); }
-		public TerminalNode RBRACE() { return getToken(JavaParser.RBRACE, 0); }
-		public List<SwitchLabeledRuleContext> switchLabeledRule() {
-			return getRuleContexts(SwitchLabeledRuleContext.class);
-		}
-		public SwitchLabeledRuleContext switchLabeledRule(int i) {
-			return getRuleContext(SwitchLabeledRuleContext.class,i);
-		}
-		public SwitchExpressionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_switchExpression; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterSwitchExpression(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitSwitchExpression(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitSwitchExpression(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final SwitchExpressionContext switchExpression() throws RecognitionException {
-		SwitchExpressionContext _localctx = new SwitchExpressionContext(_ctx, getState());
-		enterRule(_localctx, 210, RULE_switchExpression);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1523);
-			match(SWITCH);
-			setState(1524);
-			parExpression();
-			setState(1525);
-			match(LBRACE);
-			setState(1529);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==CASE || _la==DEFAULT) {
-				{
-				{
-				setState(1526);
-				switchLabeledRule();
-				}
-				}
-				setState(1531);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(1532);
-			match(RBRACE);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class SwitchLabeledRuleContext extends ParserRuleContext {
-		public TerminalNode CASE() { return getToken(JavaParser.CASE, 0); }
-		public SwitchRuleOutcomeContext switchRuleOutcome() {
-			return getRuleContext(SwitchRuleOutcomeContext.class,0);
-		}
-		public TerminalNode ARROW() { return getToken(JavaParser.ARROW, 0); }
-		public TerminalNode COLON() { return getToken(JavaParser.COLON, 0); }
-		public ExpressionListContext expressionList() {
-			return getRuleContext(ExpressionListContext.class,0);
-		}
-		public TerminalNode NULL_LITERAL() { return getToken(JavaParser.NULL_LITERAL, 0); }
-		public GuardedPatternContext guardedPattern() {
-			return getRuleContext(GuardedPatternContext.class,0);
-		}
-		public TerminalNode DEFAULT() { return getToken(JavaParser.DEFAULT, 0); }
-		public SwitchLabeledRuleContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_switchLabeledRule; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterSwitchLabeledRule(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitSwitchLabeledRule(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitSwitchLabeledRule(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final SwitchLabeledRuleContext switchLabeledRule() throws RecognitionException {
-		SwitchLabeledRuleContext _localctx = new SwitchLabeledRuleContext(_ctx, getState());
-		enterRule(_localctx, 212, RULE_switchLabeledRule);
-		int _la;
-		try {
-			setState(1545);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case CASE:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1534);
-				match(CASE);
-				setState(1538);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,182,_ctx) ) {
-				case 1:
-					{
-					setState(1535);
-					expressionList();
-					}
-					break;
-				case 2:
-					{
-					setState(1536);
-					match(NULL_LITERAL);
-					}
-					break;
-				case 3:
-					{
-					setState(1537);
-					guardedPattern(0);
-					}
-					break;
-				}
-				setState(1540);
-				_la = _input.LA(1);
-				if ( !(_la==COLON || _la==ARROW) ) {
-				_errHandler.recoverInline(this);
-				}
-				else {
-					if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-					_errHandler.reportMatch(this);
-					consume();
-				}
-				setState(1541);
-				switchRuleOutcome();
-				}
-				break;
-			case DEFAULT:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1542);
-				match(DEFAULT);
-				setState(1543);
-				_la = _input.LA(1);
-				if ( !(_la==COLON || _la==ARROW) ) {
-				_errHandler.recoverInline(this);
-				}
-				else {
-					if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-					_errHandler.reportMatch(this);
-					consume();
-				}
-				setState(1544);
-				switchRuleOutcome();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class GuardedPatternContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public GuardedPatternContext guardedPattern() {
-			return getRuleContext(GuardedPatternContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public TypeTypeContext typeType() {
-			return getRuleContext(TypeTypeContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public List<VariableModifierContext> variableModifier() {
-			return getRuleContexts(VariableModifierContext.class);
-		}
-		public VariableModifierContext variableModifier(int i) {
-			return getRuleContext(VariableModifierContext.class,i);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public List<TerminalNode> AND() { return getTokens(JavaParser.AND); }
-		public TerminalNode AND(int i) {
-			return getToken(JavaParser.AND, i);
-		}
-		public List<ExpressionContext> expression() {
-			return getRuleContexts(ExpressionContext.class);
-		}
-		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
-		}
-		public GuardedPatternContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_guardedPattern; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterGuardedPattern(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitGuardedPattern(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitGuardedPattern(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final GuardedPatternContext guardedPattern() throws RecognitionException {
-		return guardedPattern(0);
-	}
-
-	private GuardedPatternContext guardedPattern(int _p) throws RecognitionException {
-		ParserRuleContext _parentctx = _ctx;
-		int _parentState = getState();
-		GuardedPatternContext _localctx = new GuardedPatternContext(_ctx, _parentState);
-		GuardedPatternContext _prevctx = _localctx;
-		int _startState = 214;
-		enterRecursionRule(_localctx, 214, RULE_guardedPattern, _p);
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1573);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case LPAREN:
-				{
-				setState(1548);
-				match(LPAREN);
-				setState(1549);
-				guardedPattern(0);
-				setState(1550);
-				match(RPAREN);
-				}
-				break;
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case DOUBLE:
-			case FINAL:
-			case FLOAT:
-			case INT:
-			case LONG:
-			case SHORT:
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case AT:
-			case IDENTIFIER:
-				{
-				setState(1555);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,184,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1552);
-						variableModifier();
-						}
-						} 
-					}
-					setState(1557);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,184,_ctx);
-				}
-				setState(1558);
-				typeType();
-				setState(1562);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,185,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1559);
-						annotation();
-						}
-						} 
-					}
-					setState(1564);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,185,_ctx);
-				}
-				setState(1565);
-				identifier();
-				setState(1570);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,186,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1566);
-						match(AND);
-						setState(1567);
-						expression(0);
-						}
-						} 
-					}
-					setState(1572);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,186,_ctx);
-				}
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			_ctx.stop = _input.LT(-1);
-			setState(1580);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,188,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					if ( _parseListeners!=null ) triggerExitRuleEvent();
-					_prevctx = _localctx;
-					{
-					{
-					_localctx = new GuardedPatternContext(_parentctx, _parentState);
-					pushNewRecursionContext(_localctx, _startState, RULE_guardedPattern);
-					setState(1575);
-					if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
-					setState(1576);
-					match(AND);
-					setState(1577);
-					expression(0);
-					}
-					} 
-				}
-				setState(1582);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,188,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			unrollRecursionContexts(_parentctx);
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class SwitchRuleOutcomeContext extends ParserRuleContext {
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
-		}
-		public List<BlockStatementContext> blockStatement() {
-			return getRuleContexts(BlockStatementContext.class);
-		}
-		public BlockStatementContext blockStatement(int i) {
-			return getRuleContext(BlockStatementContext.class,i);
-		}
-		public SwitchRuleOutcomeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_switchRuleOutcome; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterSwitchRuleOutcome(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitSwitchRuleOutcome(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitSwitchRuleOutcome(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final SwitchRuleOutcomeContext switchRuleOutcome() throws RecognitionException {
-		SwitchRuleOutcomeContext _localctx = new SwitchRuleOutcomeContext(_ctx, getState());
-		enterRule(_localctx, 216, RULE_switchRuleOutcome);
-		int _la;
-		try {
-			setState(1590);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,190,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1583);
-				block();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1587);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (((((_la - 1)) & ~0x3f) == 0 && ((1L << (_la - 1)) & -334254282492513L) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & -8935141145188974593L) != 0)) {
-					{
-					{
-					setState(1584);
-					blockStatement();
-					}
-					}
-					setState(1589);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassTypeContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public ClassOrInterfaceTypeContext classOrInterfaceType() {
-			return getRuleContext(ClassOrInterfaceTypeContext.class,0);
-		}
-		public TerminalNode DOT() { return getToken(JavaParser.DOT, 0); }
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public TypeArgumentsContext typeArguments() {
-			return getRuleContext(TypeArgumentsContext.class,0);
-		}
-		public ClassTypeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classType; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassType(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassType(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassType(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassTypeContext classType() throws RecognitionException {
-		ClassTypeContext _localctx = new ClassTypeContext(_ctx, getState());
-		enterRule(_localctx, 218, RULE_classType);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1595);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,191,_ctx) ) {
-			case 1:
-				{
-				setState(1592);
-				classOrInterfaceType();
-				setState(1593);
-				match(DOT);
-				}
-				break;
-			}
-			setState(1600);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,192,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1597);
-					annotation();
-					}
-					} 
-				}
-				setState(1602);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,192,_ctx);
-			}
-			setState(1603);
-			identifier();
-			setState(1605);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LT) {
-				{
-				setState(1604);
-				typeArguments();
-				}
-			}
-
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class CreatorContext extends ParserRuleContext {
-		public CreatedNameContext createdName() {
-			return getRuleContext(CreatedNameContext.class,0);
-		}
-		public ClassCreatorRestContext classCreatorRest() {
-			return getRuleContext(ClassCreatorRestContext.class,0);
-		}
-		public NonWildcardTypeArgumentsContext nonWildcardTypeArguments() {
-			return getRuleContext(NonWildcardTypeArgumentsContext.class,0);
-		}
-		public ArrayCreatorRestContext arrayCreatorRest() {
-			return getRuleContext(ArrayCreatorRestContext.class,0);
-		}
-		public CreatorContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_creator; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterCreator(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitCreator(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitCreator(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final CreatorContext creator() throws RecognitionException {
-		CreatorContext _localctx = new CreatorContext(_ctx, getState());
-		enterRule(_localctx, 220, RULE_creator);
-		int _la;
-		try {
-			setState(1616);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,195,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1608);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==LT) {
-					{
-					setState(1607);
-					nonWildcardTypeArguments();
-					}
-				}
-
-				setState(1610);
-				createdName();
-				setState(1611);
-				classCreatorRest();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1613);
-				createdName();
-				setState(1614);
-				arrayCreatorRest();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class CreatedNameContext extends ParserRuleContext {
-		public List<IdentifierContext> identifier() {
-			return getRuleContexts(IdentifierContext.class);
-		}
-		public IdentifierContext identifier(int i) {
-			return getRuleContext(IdentifierContext.class,i);
-		}
-		public List<TypeArgumentsOrDiamondContext> typeArgumentsOrDiamond() {
-			return getRuleContexts(TypeArgumentsOrDiamondContext.class);
-		}
-		public TypeArgumentsOrDiamondContext typeArgumentsOrDiamond(int i) {
-			return getRuleContext(TypeArgumentsOrDiamondContext.class,i);
-		}
-		public List<TerminalNode> DOT() { return getTokens(JavaParser.DOT); }
-		public TerminalNode DOT(int i) {
-			return getToken(JavaParser.DOT, i);
-		}
-		public PrimitiveTypeContext primitiveType() {
-			return getRuleContext(PrimitiveTypeContext.class,0);
-		}
-		public CreatedNameContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_createdName; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterCreatedName(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitCreatedName(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitCreatedName(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final CreatedNameContext createdName() throws RecognitionException {
-		CreatedNameContext _localctx = new CreatedNameContext(_ctx, getState());
-		enterRule(_localctx, 222, RULE_createdName);
-		int _la;
-		try {
-			setState(1633);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1618);
-				identifier();
-				setState(1620);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==LT) {
-					{
-					setState(1619);
-					typeArgumentsOrDiamond();
-					}
-				}
-
-				setState(1629);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==DOT) {
-					{
-					{
-					setState(1622);
-					match(DOT);
-					setState(1623);
-					identifier();
-					setState(1625);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					if (_la==LT) {
-						{
-						setState(1624);
-						typeArgumentsOrDiamond();
-						}
-					}
-
-					}
-					}
-					setState(1631);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				}
-				break;
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case DOUBLE:
-			case FLOAT:
-			case INT:
-			case LONG:
-			case SHORT:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1632);
-				primitiveType();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class InnerCreatorContext extends ParserRuleContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public ClassCreatorRestContext classCreatorRest() {
-			return getRuleContext(ClassCreatorRestContext.class,0);
-		}
-		public NonWildcardTypeArgumentsOrDiamondContext nonWildcardTypeArgumentsOrDiamond() {
-			return getRuleContext(NonWildcardTypeArgumentsOrDiamondContext.class,0);
-		}
-		public InnerCreatorContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_innerCreator; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterInnerCreator(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitInnerCreator(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitInnerCreator(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final InnerCreatorContext innerCreator() throws RecognitionException {
-		InnerCreatorContext _localctx = new InnerCreatorContext(_ctx, getState());
-		enterRule(_localctx, 224, RULE_innerCreator);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1635);
-			identifier();
-			setState(1637);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==LT) {
-				{
-				setState(1636);
-				nonWildcardTypeArgumentsOrDiamond();
-				}
-			}
-
-			setState(1639);
-			classCreatorRest();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ArrayCreatorRestContext extends ParserRuleContext {
-		public ArrayInitializerContext arrayInitializer() {
-			return getRuleContext(ArrayInitializerContext.class,0);
-		}
-		public List<TerminalNode> LBRACK() { return getTokens(JavaParser.LBRACK); }
-		public TerminalNode LBRACK(int i) {
-			return getToken(JavaParser.LBRACK, i);
-		}
-		public List<TerminalNode> RBRACK() { return getTokens(JavaParser.RBRACK); }
-		public TerminalNode RBRACK(int i) {
-			return getToken(JavaParser.RBRACK, i);
-		}
-		public List<ExpressionContext> expression() {
-			return getRuleContexts(ExpressionContext.class);
-		}
-		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
-		}
-		public ArrayCreatorRestContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_arrayCreatorRest; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterArrayCreatorRest(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitArrayCreatorRest(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitArrayCreatorRest(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ArrayCreatorRestContext arrayCreatorRest() throws RecognitionException {
-		ArrayCreatorRestContext _localctx = new ArrayCreatorRestContext(_ctx, getState());
-		enterRule(_localctx, 226, RULE_arrayCreatorRest);
-		int _la;
-		try {
-			int _alt;
-			setState(1663);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,204,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1643); 
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				do {
-					{
-					{
-					setState(1641);
-					match(LBRACK);
-					setState(1642);
-					match(RBRACK);
-					}
-					}
-					setState(1645); 
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				} while ( _la==LBRACK );
-				setState(1647);
-				arrayInitializer();
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1652); 
-				_errHandler.sync(this);
-				_alt = 1;
-				do {
-					switch (_alt) {
-					case 1:
-						{
-						{
-						setState(1648);
-						match(LBRACK);
-						setState(1649);
-						expression(0);
-						setState(1650);
-						match(RBRACK);
-						}
-						}
-						break;
-					default:
-						throw new NoViableAltException(this);
-					}
-					setState(1654); 
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,202,_ctx);
-				} while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER );
-				setState(1660);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,203,_ctx);
-				while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-					if ( _alt==1 ) {
-						{
-						{
-						setState(1656);
-						match(LBRACK);
-						setState(1657);
-						match(RBRACK);
-						}
-						} 
-					}
-					setState(1662);
-					_errHandler.sync(this);
-					_alt = getInterpreter().adaptivePredict(_input,203,_ctx);
-				}
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ClassCreatorRestContext extends ParserRuleContext {
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public ClassBodyContext classBody() {
-			return getRuleContext(ClassBodyContext.class,0);
-		}
-		public ClassCreatorRestContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_classCreatorRest; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterClassCreatorRest(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitClassCreatorRest(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitClassCreatorRest(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ClassCreatorRestContext classCreatorRest() throws RecognitionException {
-		ClassCreatorRestContext _localctx = new ClassCreatorRestContext(_ctx, getState());
-		enterRule(_localctx, 228, RULE_classCreatorRest);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1665);
-			arguments();
-			setState(1667);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,205,_ctx) ) {
-			case 1:
-				{
-				setState(1666);
-				classBody();
-				}
-				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ExplicitGenericInvocationContext extends ParserRuleContext {
-		public NonWildcardTypeArgumentsContext nonWildcardTypeArguments() {
-			return getRuleContext(NonWildcardTypeArgumentsContext.class,0);
-		}
-		public ExplicitGenericInvocationSuffixContext explicitGenericInvocationSuffix() {
-			return getRuleContext(ExplicitGenericInvocationSuffixContext.class,0);
-		}
-		public ExplicitGenericInvocationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_explicitGenericInvocation; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterExplicitGenericInvocation(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitExplicitGenericInvocation(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitExplicitGenericInvocation(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ExplicitGenericInvocationContext explicitGenericInvocation() throws RecognitionException {
-		ExplicitGenericInvocationContext _localctx = new ExplicitGenericInvocationContext(_ctx, getState());
-		enterRule(_localctx, 230, RULE_explicitGenericInvocation);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1669);
-			nonWildcardTypeArguments();
-			setState(1670);
-			explicitGenericInvocationSuffix();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeArgumentsOrDiamondContext extends ParserRuleContext {
-		public TerminalNode LT() { return getToken(JavaParser.LT, 0); }
-		public TerminalNode GT() { return getToken(JavaParser.GT, 0); }
-		public TypeArgumentsContext typeArguments() {
-			return getRuleContext(TypeArgumentsContext.class,0);
-		}
-		public TypeArgumentsOrDiamondContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeArgumentsOrDiamond; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeArgumentsOrDiamond(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeArgumentsOrDiamond(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeArgumentsOrDiamond(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeArgumentsOrDiamondContext typeArgumentsOrDiamond() throws RecognitionException {
-		TypeArgumentsOrDiamondContext _localctx = new TypeArgumentsOrDiamondContext(_ctx, getState());
-		enterRule(_localctx, 232, RULE_typeArgumentsOrDiamond);
-		try {
-			setState(1675);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,206,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1672);
-				match(LT);
-				setState(1673);
-				match(GT);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1674);
-				typeArguments();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class NonWildcardTypeArgumentsOrDiamondContext extends ParserRuleContext {
-		public TerminalNode LT() { return getToken(JavaParser.LT, 0); }
-		public TerminalNode GT() { return getToken(JavaParser.GT, 0); }
-		public NonWildcardTypeArgumentsContext nonWildcardTypeArguments() {
-			return getRuleContext(NonWildcardTypeArgumentsContext.class,0);
-		}
-		public NonWildcardTypeArgumentsOrDiamondContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_nonWildcardTypeArgumentsOrDiamond; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterNonWildcardTypeArgumentsOrDiamond(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitNonWildcardTypeArgumentsOrDiamond(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitNonWildcardTypeArgumentsOrDiamond(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final NonWildcardTypeArgumentsOrDiamondContext nonWildcardTypeArgumentsOrDiamond() throws RecognitionException {
-		NonWildcardTypeArgumentsOrDiamondContext _localctx = new NonWildcardTypeArgumentsOrDiamondContext(_ctx, getState());
-		enterRule(_localctx, 234, RULE_nonWildcardTypeArgumentsOrDiamond);
-		try {
-			setState(1680);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,207,_ctx) ) {
-			case 1:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1677);
-				match(LT);
-				setState(1678);
-				match(GT);
-				}
-				break;
-			case 2:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1679);
-				nonWildcardTypeArguments();
-				}
-				break;
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class NonWildcardTypeArgumentsContext extends ParserRuleContext {
-		public TerminalNode LT() { return getToken(JavaParser.LT, 0); }
-		public TypeListContext typeList() {
-			return getRuleContext(TypeListContext.class,0);
-		}
-		public TerminalNode GT() { return getToken(JavaParser.GT, 0); }
-		public NonWildcardTypeArgumentsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_nonWildcardTypeArguments; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterNonWildcardTypeArguments(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitNonWildcardTypeArguments(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitNonWildcardTypeArguments(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final NonWildcardTypeArgumentsContext nonWildcardTypeArguments() throws RecognitionException {
-		NonWildcardTypeArgumentsContext _localctx = new NonWildcardTypeArgumentsContext(_ctx, getState());
-		enterRule(_localctx, 236, RULE_nonWildcardTypeArguments);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1682);
-			match(LT);
-			setState(1683);
-			typeList();
-			setState(1684);
-			match(GT);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeListContext extends ParserRuleContext {
-		public List<TypeTypeContext> typeType() {
-			return getRuleContexts(TypeTypeContext.class);
-		}
-		public TypeTypeContext typeType(int i) {
-			return getRuleContext(TypeTypeContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public TypeListContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeList; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeList(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeList(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeList(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeListContext typeList() throws RecognitionException {
-		TypeListContext _localctx = new TypeListContext(_ctx, getState());
-		enterRule(_localctx, 238, RULE_typeList);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1686);
-			typeType();
-			setState(1691);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(1687);
-				match(COMMA);
-				setState(1688);
-				typeType();
-				}
-				}
-				setState(1693);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeTypeContext extends ParserRuleContext {
-		public ClassOrInterfaceTypeContext classOrInterfaceType() {
-			return getRuleContext(ClassOrInterfaceTypeContext.class,0);
-		}
-		public PrimitiveTypeContext primitiveType() {
-			return getRuleContext(PrimitiveTypeContext.class,0);
-		}
-		public List<AnnotationContext> annotation() {
-			return getRuleContexts(AnnotationContext.class);
-		}
-		public AnnotationContext annotation(int i) {
-			return getRuleContext(AnnotationContext.class,i);
-		}
-		public List<TerminalNode> LBRACK() { return getTokens(JavaParser.LBRACK); }
-		public TerminalNode LBRACK(int i) {
-			return getToken(JavaParser.LBRACK, i);
-		}
-		public List<TerminalNode> RBRACK() { return getTokens(JavaParser.RBRACK); }
-		public TerminalNode RBRACK(int i) {
-			return getToken(JavaParser.RBRACK, i);
-		}
-		public TypeTypeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeType; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeType(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeType(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeType(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeTypeContext typeType() throws RecognitionException {
-		TypeTypeContext _localctx = new TypeTypeContext(_ctx, getState());
-		enterRule(_localctx, 240, RULE_typeType);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1697);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,209,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1694);
-					annotation();
-					}
-					} 
-				}
-				setState(1699);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,209,_ctx);
-			}
-			setState(1702);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case IDENTIFIER:
-				{
-				setState(1700);
-				classOrInterfaceType();
-				}
-				break;
-			case BOOLEAN:
-			case BYTE:
-			case CHAR:
-			case DOUBLE:
-			case FLOAT:
-			case INT:
-			case LONG:
-			case SHORT:
-				{
-				setState(1701);
-				primitiveType();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			setState(1714);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,212,_ctx);
-			while ( _alt!=2 && _alt!=ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(1707);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-					while (((((_la - 51)) & ~0x3f) == 0 && ((1L << (_la - 51)) & 32767L) != 0) || _la==AT || _la==IDENTIFIER) {
-						{
-						{
-						setState(1704);
-						annotation();
-						}
-						}
-						setState(1709);
-						_errHandler.sync(this);
-						_la = _input.LA(1);
-					}
-					setState(1710);
-					match(LBRACK);
-					setState(1711);
-					match(RBRACK);
-					}
-					} 
-				}
-				setState(1716);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,212,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class PrimitiveTypeContext extends ParserRuleContext {
-		public TerminalNode BOOLEAN() { return getToken(JavaParser.BOOLEAN, 0); }
-		public TerminalNode CHAR() { return getToken(JavaParser.CHAR, 0); }
-		public TerminalNode BYTE() { return getToken(JavaParser.BYTE, 0); }
-		public TerminalNode SHORT() { return getToken(JavaParser.SHORT, 0); }
-		public TerminalNode INT() { return getToken(JavaParser.INT, 0); }
-		public TerminalNode LONG() { return getToken(JavaParser.LONG, 0); }
-		public TerminalNode FLOAT() { return getToken(JavaParser.FLOAT, 0); }
-		public TerminalNode DOUBLE() { return getToken(JavaParser.DOUBLE, 0); }
-		public PrimitiveTypeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_primitiveType; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterPrimitiveType(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitPrimitiveType(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitPrimitiveType(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final PrimitiveTypeContext primitiveType() throws RecognitionException {
-		PrimitiveTypeContext _localctx = new PrimitiveTypeContext(_ctx, getState());
-		enterRule(_localctx, 242, RULE_primitiveType);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1717);
-			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 138111107368L) != 0)) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class TypeArgumentsContext extends ParserRuleContext {
-		public TerminalNode LT() { return getToken(JavaParser.LT, 0); }
-		public List<TypeArgumentContext> typeArgument() {
-			return getRuleContexts(TypeArgumentContext.class);
-		}
-		public TypeArgumentContext typeArgument(int i) {
-			return getRuleContext(TypeArgumentContext.class,i);
-		}
-		public TerminalNode GT() { return getToken(JavaParser.GT, 0); }
-		public List<TerminalNode> COMMA() { return getTokens(JavaParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(JavaParser.COMMA, i);
-		}
-		public TypeArgumentsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_typeArguments; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterTypeArguments(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitTypeArguments(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitTypeArguments(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final TypeArgumentsContext typeArguments() throws RecognitionException {
-		TypeArgumentsContext _localctx = new TypeArgumentsContext(_ctx, getState());
-		enterRule(_localctx, 244, RULE_typeArguments);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1719);
-			match(LT);
-			setState(1720);
-			typeArgument();
-			setState(1725);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(1721);
-				match(COMMA);
-				setState(1722);
-				typeArgument();
-				}
-				}
-				setState(1727);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(1728);
-			match(GT);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class SuperSuffixContext extends ParserRuleContext {
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public TerminalNode DOT() { return getToken(JavaParser.DOT, 0); }
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public TypeArgumentsContext typeArguments() {
-			return getRuleContext(TypeArgumentsContext.class,0);
-		}
-		public SuperSuffixContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_superSuffix; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterSuperSuffix(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitSuperSuffix(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitSuperSuffix(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final SuperSuffixContext superSuffix() throws RecognitionException {
-		SuperSuffixContext _localctx = new SuperSuffixContext(_ctx, getState());
-		enterRule(_localctx, 246, RULE_superSuffix);
-		int _la;
-		try {
-			setState(1739);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case LPAREN:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1730);
-				arguments();
-				}
-				break;
-			case DOT:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1731);
-				match(DOT);
-				setState(1733);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==LT) {
-					{
-					setState(1732);
-					typeArguments();
-					}
-				}
-
-				setState(1735);
-				identifier();
-				setState(1737);
-				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,215,_ctx) ) {
-				case 1:
-					{
-					setState(1736);
-					arguments();
-					}
-					break;
-				}
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ExplicitGenericInvocationSuffixContext extends ParserRuleContext {
-		public TerminalNode SUPER() { return getToken(JavaParser.SUPER, 0); }
-		public SuperSuffixContext superSuffix() {
-			return getRuleContext(SuperSuffixContext.class,0);
-		}
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public ArgumentsContext arguments() {
-			return getRuleContext(ArgumentsContext.class,0);
-		}
-		public ExplicitGenericInvocationSuffixContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_explicitGenericInvocationSuffix; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterExplicitGenericInvocationSuffix(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitExplicitGenericInvocationSuffix(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitExplicitGenericInvocationSuffix(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ExplicitGenericInvocationSuffixContext explicitGenericInvocationSuffix() throws RecognitionException {
-		ExplicitGenericInvocationSuffixContext _localctx = new ExplicitGenericInvocationSuffixContext(_ctx, getState());
-		enterRule(_localctx, 248, RULE_explicitGenericInvocationSuffix);
-		try {
-			setState(1746);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case SUPER:
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(1741);
-				match(SUPER);
-				setState(1742);
-				superSuffix();
-				}
-				break;
-			case MODULE:
-			case OPEN:
-			case REQUIRES:
-			case EXPORTS:
-			case OPENS:
-			case TO:
-			case USES:
-			case PROVIDES:
-			case WITH:
-			case TRANSITIVE:
-			case VAR:
-			case YIELD:
-			case RECORD:
-			case SEALED:
-			case PERMITS:
-			case IDENTIFIER:
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(1743);
-				identifier();
-				setState(1744);
-				arguments();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ArgumentsContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(JavaParser.LPAREN, 0); }
-		public TerminalNode RPAREN() { return getToken(JavaParser.RPAREN, 0); }
-		public ExpressionListContext expressionList() {
-			return getRuleContext(ExpressionListContext.class,0);
-		}
-		public ArgumentsContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_arguments; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).enterArguments(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof JavaParserListener ) ((JavaParserListener)listener).exitArguments(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof JavaParserVisitor ) return ((JavaParserVisitor<? extends T>)visitor).visitArguments(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ArgumentsContext arguments() throws RecognitionException {
-		ArgumentsContext _localctx = new ArgumentsContext(_ctx, getState());
-		enterRule(_localctx, 250, RULE_arguments);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(1748);
-			match(LPAREN);
-			setState(1750);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (((((_la - 3)) & ~0x3f) == 0 && ((1L << (_la - 3)) & 9223127275610966053L) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & 2377900732130004991L) != 0)) {
-				{
-				setState(1749);
-				expressionList();
-				}
-			}
-
-			setState(1752);
-			match(RPAREN);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
-		switch (ruleIndex) {
-		case 99:
-			return expression_sempred((ExpressionContext)_localctx, predIndex);
-		case 107:
-			return guardedPattern_sempred((GuardedPatternContext)_localctx, predIndex);
-		}
-		return true;
-	}
-	private boolean expression_sempred(ExpressionContext _localctx, int predIndex) {
-		switch (predIndex) {
-		case 0:
-			return precpred(_ctx, 14);
-		case 1:
-			return precpred(_ctx, 13);
-		case 2:
-			return precpred(_ctx, 12);
-		case 3:
-			return precpred(_ctx, 11);
-		case 4:
-			return precpred(_ctx, 9);
-		case 5:
-			return precpred(_ctx, 8);
-		case 6:
-			return precpred(_ctx, 7);
-		case 7:
-			return precpred(_ctx, 6);
-		case 8:
-			return precpred(_ctx, 5);
-		case 9:
-			return precpred(_ctx, 4);
-		case 10:
-			return precpred(_ctx, 3);
-		case 11:
-			return precpred(_ctx, 2);
-		case 12:
-			return precpred(_ctx, 25);
-		case 13:
-			return precpred(_ctx, 24);
-		case 14:
-			return precpred(_ctx, 22);
-		case 15:
-			return precpred(_ctx, 18);
-		case 16:
-			return precpred(_ctx, 10);
-		}
-		return true;
-	}
-	private boolean guardedPattern_sempred(GuardedPatternContext _localctx, int predIndex) {
-		switch (predIndex) {
-		case 17:
-			return precpred(_ctx, 1);
-		}
-		return true;
-	}
-
-	public static final String _serializedATN =
-		"\u0004\u0001\u0080\u06db\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001"+
-		"\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004"+
-		"\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007"+
-		"\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b"+
-		"\u0002\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e\u0002\u000f\u0007"+
-		"\u000f\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002\u0012\u0007"+
-		"\u0012\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002\u0015\u0007"+
-		"\u0015\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002\u0018\u0007"+
-		"\u0018\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002\u001b\u0007"+
-		"\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002\u001e\u0007"+
-		"\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007!\u0002\"\u0007"+
-		"\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007&\u0002\'\u0007"+
-		"\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007+\u0002,\u0007"+
-		",\u0002-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u00070\u00021\u0007"+
-		"1\u00022\u00072\u00023\u00073\u00024\u00074\u00025\u00075\u00026\u0007"+
-		"6\u00027\u00077\u00028\u00078\u00029\u00079\u0002:\u0007:\u0002;\u0007"+
-		";\u0002<\u0007<\u0002=\u0007=\u0002>\u0007>\u0002?\u0007?\u0002@\u0007"+
-		"@\u0002A\u0007A\u0002B\u0007B\u0002C\u0007C\u0002D\u0007D\u0002E\u0007"+
-		"E\u0002F\u0007F\u0002G\u0007G\u0002H\u0007H\u0002I\u0007I\u0002J\u0007"+
-		"J\u0002K\u0007K\u0002L\u0007L\u0002M\u0007M\u0002N\u0007N\u0002O\u0007"+
-		"O\u0002P\u0007P\u0002Q\u0007Q\u0002R\u0007R\u0002S\u0007S\u0002T\u0007"+
-		"T\u0002U\u0007U\u0002V\u0007V\u0002W\u0007W\u0002X\u0007X\u0002Y\u0007"+
-		"Y\u0002Z\u0007Z\u0002[\u0007[\u0002\\\u0007\\\u0002]\u0007]\u0002^\u0007"+
-		"^\u0002_\u0007_\u0002`\u0007`\u0002a\u0007a\u0002b\u0007b\u0002c\u0007"+
-		"c\u0002d\u0007d\u0002e\u0007e\u0002f\u0007f\u0002g\u0007g\u0002h\u0007"+
-		"h\u0002i\u0007i\u0002j\u0007j\u0002k\u0007k\u0002l\u0007l\u0002m\u0007"+
-		"m\u0002n\u0007n\u0002o\u0007o\u0002p\u0007p\u0002q\u0007q\u0002r\u0007"+
-		"r\u0002s\u0007s\u0002t\u0007t\u0002u\u0007u\u0002v\u0007v\u0002w\u0007"+
-		"w\u0002x\u0007x\u0002y\u0007y\u0002z\u0007z\u0002{\u0007{\u0002|\u0007"+
-		"|\u0002}\u0007}\u0001\u0000\u0003\u0000\u00fe\b\u0000\u0001\u0000\u0001"+
-		"\u0000\u0005\u0000\u0102\b\u0000\n\u0000\f\u0000\u0105\t\u0000\u0001\u0000"+
-		"\u0001\u0000\u0005\u0000\u0109\b\u0000\n\u0000\f\u0000\u010c\t\u0000\u0001"+
-		"\u0000\u0001\u0000\u0001\u0000\u0003\u0000\u0111\b\u0000\u0001\u0001\u0005"+
-		"\u0001\u0114\b\u0001\n\u0001\f\u0001\u0117\t\u0001\u0001\u0001\u0001\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0003\u0002\u011f\b\u0002"+
-		"\u0001\u0002\u0001\u0002\u0001\u0002\u0003\u0002\u0124\b\u0002\u0001\u0002"+
-		"\u0001\u0002\u0001\u0003\u0005\u0003\u0129\b\u0003\n\u0003\f\u0003\u012c"+
-		"\t\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0003"+
-		"\u0003\u0133\b\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001"+
-		"\u0004\u0003\u0004\u013a\b\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001"+
-		"\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001"+
-		"\u0005\u0003\u0005\u0146\b\u0005\u0001\u0006\u0001\u0006\u0003\u0006\u014a"+
-		"\b\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0003\u0007\u014f\b\u0007"+
-		"\u0001\u0007\u0001\u0007\u0003\u0007\u0153\b\u0007\u0001\u0007\u0001\u0007"+
-		"\u0003\u0007\u0157\b\u0007\u0001\u0007\u0001\u0007\u0003\u0007\u015b\b"+
-		"\u0007\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0005\b"+
-		"\u0163\b\b\n\b\f\b\u0166\t\b\u0001\b\u0001\b\u0001\t\u0005\t\u016b\b\t"+
-		"\n\t\f\t\u016e\t\t\u0001\t\u0001\t\u0001\t\u0005\t\u0173\b\t\n\t\f\t\u0176"+
-		"\t\t\u0001\t\u0003\t\u0179\b\t\u0001\n\u0001\n\u0001\n\u0005\n\u017e\b"+
-		"\n\n\n\f\n\u0181\t\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0003"+
-		"\u000b\u0187\b\u000b\u0001\u000b\u0001\u000b\u0003\u000b\u018b\b\u000b"+
-		"\u0001\u000b\u0003\u000b\u018e\b\u000b\u0001\u000b\u0003\u000b\u0191\b"+
-		"\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0005\f\u0198\b"+
-		"\f\n\f\f\f\u019b\t\f\u0001\r\u0005\r\u019e\b\r\n\r\f\r\u01a1\t\r\u0001"+
-		"\r\u0001\r\u0003\r\u01a5\b\r\u0001\r\u0003\r\u01a8\b\r\u0001\u000e\u0001"+
-		"\u000e\u0005\u000e\u01ac\b\u000e\n\u000e\f\u000e\u01af\t\u000e\u0001\u000f"+
-		"\u0001\u000f\u0001\u000f\u0003\u000f\u01b4\b\u000f\u0001\u000f\u0001\u000f"+
-		"\u0003\u000f\u01b8\b\u000f\u0001\u000f\u0001\u000f\u0003\u000f\u01bc\b"+
-		"\u000f\u0001\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0005\u0010\u01c2"+
-		"\b\u0010\n\u0010\f\u0010\u01c5\t\u0010\u0001\u0010\u0001\u0010\u0001\u0011"+
-		"\u0001\u0011\u0005\u0011\u01cb\b\u0011\n\u0011\f\u0011\u01ce\t\u0011\u0001"+
-		"\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0003\u0012\u01d4\b\u0012\u0001"+
-		"\u0012\u0001\u0012\u0005\u0012\u01d8\b\u0012\n\u0012\f\u0012\u01db\t\u0012"+
-		"\u0001\u0012\u0003\u0012\u01de\b\u0012\u0001\u0013\u0001\u0013\u0001\u0013"+
-		"\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013"+
-		"\u0001\u0013\u0003\u0013\u01ea\b\u0013\u0001\u0014\u0001\u0014\u0001\u0014"+
-		"\u0001\u0014\u0001\u0014\u0005\u0014\u01f1\b\u0014\n\u0014\f\u0014\u01f4"+
-		"\t\u0014\u0001\u0014\u0001\u0014\u0003\u0014\u01f8\b\u0014\u0001\u0014"+
-		"\u0001\u0014\u0001\u0015\u0001\u0015\u0003\u0015\u01fe\b\u0015\u0001\u0016"+
-		"\u0001\u0016\u0003\u0016\u0202\b\u0016\u0001\u0017\u0001\u0017\u0001\u0017"+
-		"\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019"+
-		"\u0001\u0019\u0003\u0019\u020e\b\u0019\u0001\u0019\u0001\u0019\u0001\u001a"+
-		"\u0005\u001a\u0213\b\u001a\n\u001a\f\u001a\u0216\t\u001a\u0001\u001a\u0001"+
-		"\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001"+
-		"\u001c\u0005\u001c\u0220\b\u001c\n\u001c\f\u001c\u0223\t\u001c\u0001\u001c"+
-		"\u0001\u001c\u0003\u001c\u0227\b\u001c\u0001\u001d\u0001\u001d\u0001\u001d"+
-		"\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0003\u001d"+
-		"\u0231\b\u001d\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0005\u001e"+
-		"\u0237\b\u001e\n\u001e\f\u001e\u023a\t\u001e\u0001\u001e\u0001\u001e\u0001"+
-		"\u001f\u0001\u001f\u0001\u001f\u0005\u001f\u0241\b\u001f\n\u001f\f\u001f"+
-		"\u0244\t\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001 \u0005 \u024a"+
-		"\b \n \f \u024d\t \u0001 \u0001 \u0001!\u0001!\u0001!\u0001!\u0001!\u0001"+
-		"!\u0003!\u0257\b!\u0001\"\u0005\"\u025a\b\"\n\"\f\"\u025d\t\"\u0001\""+
-		"\u0001\"\u0001\"\u0001#\u0005#\u0263\b#\n#\f#\u0266\t#\u0001#\u0001#\u0001"+
-		"#\u0001#\u0001#\u0005#\u026d\b#\n#\f#\u0270\t#\u0001#\u0001#\u0003#\u0274"+
-		"\b#\u0001#\u0001#\u0001$\u0001$\u0001$\u0005$\u027b\b$\n$\f$\u027e\t$"+
-		"\u0001%\u0001%\u0001%\u0003%\u0283\b%\u0001&\u0001&\u0001&\u0005&\u0288"+
-		"\b&\n&\f&\u028b\t&\u0001\'\u0001\'\u0003\'\u028f\b\'\u0001(\u0001(\u0001"+
-		"(\u0001(\u0005(\u0295\b(\n(\f(\u0298\t(\u0001(\u0003(\u029b\b(\u0003("+
-		"\u029d\b(\u0001(\u0001(\u0001)\u0001)\u0003)\u02a3\b)\u0001)\u0001)\u0005"+
-		")\u02a7\b)\n)\f)\u02aa\t)\u0001)\u0001)\u0003)\u02ae\b)\u0001*\u0001*"+
-		"\u0005*\u02b2\b*\n*\f*\u02b5\t*\u0001*\u0001*\u0001*\u0003*\u02ba\b*\u0003"+
-		"*\u02bc\b*\u0001+\u0001+\u0001+\u0005+\u02c1\b+\n+\f+\u02c4\t+\u0001,"+
-		"\u0001,\u0003,\u02c8\b,\u0001,\u0001,\u0001,\u0003,\u02cd\b,\u0001,\u0003"+
-		",\u02d0\b,\u0003,\u02d2\b,\u0001,\u0001,\u0001-\u0001-\u0001-\u0001-\u0005"+
-		"-\u02da\b-\n-\f-\u02dd\t-\u0001-\u0001-\u0001.\u0001.\u0001.\u0005.\u02e4"+
-		"\b.\n.\f.\u02e7\t.\u0001.\u0001.\u0003.\u02eb\b.\u0001.\u0003.\u02ee\b"+
-		".\u0001/\u0005/\u02f1\b/\n/\f/\u02f4\t/\u0001/\u0001/\u0001/\u00010\u0005"+
-		"0\u02fa\b0\n0\f0\u02fd\t0\u00010\u00010\u00050\u0301\b0\n0\f0\u0304\t"+
-		"0\u00010\u00010\u00010\u00011\u00011\u00011\u00051\u030c\b1\n1\f1\u030f"+
-		"\t1\u00012\u00052\u0312\b2\n2\f2\u0315\t2\u00012\u00012\u00012\u00013"+
-		"\u00013\u00013\u00053\u031d\b3\n3\f3\u0320\t3\u00014\u00014\u00014\u0001"+
-		"4\u00014\u00014\u00014\u00034\u0329\b4\u00015\u00015\u00016\u00016\u0001"+
-		"7\u00017\u00017\u00057\u0332\b7\n7\f7\u0335\t7\u00017\u00017\u00017\u0001"+
-		"8\u00018\u00018\u00038\u033d\b8\u00018\u00018\u00018\u00038\u0342\b8\u0001"+
-		"8\u00038\u0345\b8\u00019\u00019\u00019\u00059\u034a\b9\n9\f9\u034d\t9"+
-		"\u0001:\u0001:\u0001:\u0001:\u0001;\u0001;\u0001;\u0003;\u0356\b;\u0001"+
-		"<\u0001<\u0001<\u0001<\u0005<\u035c\b<\n<\f<\u035f\t<\u0003<\u0361\b<"+
-		"\u0001<\u0003<\u0364\b<\u0001<\u0001<\u0001=\u0001=\u0001=\u0001=\u0001"+
-		"=\u0001>\u0001>\u0005>\u036f\b>\n>\f>\u0372\t>\u0001>\u0001>\u0001?\u0005"+
-		"?\u0377\b?\n?\f?\u037a\t?\u0001?\u0001?\u0003?\u037e\b?\u0001@\u0001@"+
-		"\u0001@\u0001@\u0001@\u0001@\u0003@\u0386\b@\u0001@\u0001@\u0003@\u038a"+
-		"\b@\u0001@\u0001@\u0003@\u038e\b@\u0001@\u0001@\u0003@\u0392\b@\u0001"+
-		"@\u0001@\u0003@\u0396\b@\u0003@\u0398\b@\u0001A\u0001A\u0003A\u039c\b"+
-		"A\u0001B\u0001B\u0001B\u0001B\u0003B\u03a2\bB\u0001C\u0001C\u0001D\u0001"+
-		"D\u0001D\u0001E\u0003E\u03aa\bE\u0001E\u0001E\u0001E\u0001E\u0001F\u0001"+
-		"F\u0005F\u03b2\bF\nF\fF\u03b5\tF\u0001F\u0001F\u0001G\u0001G\u0005G\u03bb"+
-		"\bG\nG\fG\u03be\tG\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0003"+
-		"G\u03c7\bG\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0003G\u03cf\bG\u0001"+
-		"G\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0001G\u0001"+
-		"G\u0001G\u0003G\u03dd\bG\u0001H\u0001H\u0001I\u0001I\u0001I\u0003I\u03e4"+
-		"\bI\u0001I\u0001I\u0001I\u0003I\u03e9\bI\u0001I\u0001I\u0001J\u0001J\u0003"+
-		"J\u03ef\bJ\u0001J\u0001J\u0001K\u0001K\u0001K\u0005K\u03f6\bK\nK\fK\u03f9"+
-		"\tK\u0001L\u0001L\u0001L\u0001M\u0001M\u0001M\u0005M\u0401\bM\nM\fM\u0404"+
-		"\tM\u0001M\u0001M\u0001N\u0001N\u0005N\u040a\bN\nN\fN\u040d\tN\u0001N"+
-		"\u0001N\u0001O\u0001O\u0001O\u0001O\u0001O\u0003O\u0416\bO\u0001P\u0005"+
-		"P\u0419\bP\nP\fP\u041c\tP\u0001P\u0001P\u0001P\u0001P\u0001P\u0001P\u0001"+
-		"P\u0001P\u0003P\u0426\bP\u0001Q\u0001Q\u0001R\u0001R\u0001S\u0005S\u042d"+
-		"\bS\nS\fS\u0430\tS\u0001S\u0001S\u0001S\u0003S\u0435\bS\u0001T\u0001T"+
-		"\u0001T\u0001T\u0001T\u0003T\u043c\bT\u0001T\u0001T\u0001T\u0001T\u0001"+
-		"T\u0001T\u0001T\u0003T\u0445\bT\u0001T\u0001T\u0001T\u0001T\u0001T\u0001"+
-		"T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001"+
-		"T\u0001T\u0001T\u0001T\u0004T\u045a\bT\u000bT\fT\u045b\u0001T\u0003T\u045f"+
-		"\bT\u0001T\u0003T\u0462\bT\u0001T\u0001T\u0001T\u0001T\u0005T\u0468\b"+
-		"T\nT\fT\u046b\tT\u0001T\u0003T\u046e\bT\u0001T\u0001T\u0001T\u0001T\u0005"+
-		"T\u0474\bT\nT\fT\u0477\tT\u0001T\u0005T\u047a\bT\nT\fT\u047d\tT\u0001"+
-		"T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0003T\u0487\bT\u0001"+
-		"T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0003T\u0490\bT\u0001T\u0001"+
-		"T\u0001T\u0003T\u0495\bT\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001"+
-		"T\u0001T\u0001T\u0001T\u0001T\u0003T\u04a2\bT\u0001T\u0001T\u0001T\u0001"+
-		"T\u0003T\u04a8\bT\u0001U\u0001U\u0001U\u0005U\u04ad\bU\nU\fU\u04b0\tU"+
-		"\u0001U\u0001U\u0001U\u0001U\u0001U\u0001V\u0001V\u0001V\u0005V\u04ba"+
-		"\bV\nV\fV\u04bd\tV\u0001W\u0001W\u0001W\u0001X\u0001X\u0001X\u0003X\u04c5"+
-		"\bX\u0001X\u0001X\u0001Y\u0001Y\u0001Y\u0005Y\u04cc\bY\nY\fY\u04cf\tY"+
-		"\u0001Z\u0005Z\u04d2\bZ\nZ\fZ\u04d5\tZ\u0001Z\u0001Z\u0001Z\u0001Z\u0001"+
-		"Z\u0003Z\u04dc\bZ\u0001Z\u0001Z\u0001Z\u0001Z\u0003Z\u04e2\bZ\u0001[\u0004"+
-		"[\u04e5\b[\u000b[\f[\u04e6\u0001[\u0004[\u04ea\b[\u000b[\f[\u04eb\u0001"+
-		"\\\u0001\\\u0001\\\u0001\\\u0001\\\u0001\\\u0003\\\u04f4\b\\\u0001\\\u0001"+
-		"\\\u0001\\\u0003\\\u04f9\b\\\u0001]\u0001]\u0003]\u04fd\b]\u0001]\u0001"+
-		"]\u0003]\u0501\b]\u0001]\u0001]\u0003]\u0505\b]\u0003]\u0507\b]\u0001"+
-		"^\u0001^\u0003^\u050b\b^\u0001_\u0005_\u050e\b_\n_\f_\u0511\t_\u0001_"+
-		"\u0001_\u0003_\u0515\b_\u0001_\u0001_\u0001_\u0001_\u0001`\u0001`\u0001"+
-		"`\u0001`\u0001a\u0001a\u0001a\u0005a\u0522\ba\na\fa\u0525\ta\u0001b\u0001"+
-		"b\u0001b\u0003b\u052a\bb\u0001b\u0001b\u0001c\u0001c\u0001c\u0001c\u0001"+
-		"c\u0001c\u0003c\u0534\bc\u0001c\u0001c\u0003c\u0538\bc\u0001c\u0001c\u0001"+
-		"c\u0003c\u053d\bc\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0005"+
-		"c\u0546\bc\nc\fc\u0549\tc\u0001c\u0001c\u0001c\u0005c\u054e\bc\nc\fc\u0551"+
-		"\tc\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0003c\u0559\bc\u0001c\u0001"+
-		"c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001"+
-		"c\u0001c\u0001c\u0003c\u0569\bc\u0001c\u0001c\u0001c\u0001c\u0001c\u0001"+
-		"c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001"+
-		"c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001"+
-		"c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001"+
-		"c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0003c\u0596\bc\u0001"+
-		"c\u0001c\u0001c\u0001c\u0003c\u059c\bc\u0001c\u0001c\u0001c\u0003c\u05a1"+
-		"\bc\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0001c\u0003c\u05aa\bc\u0005"+
-		"c\u05ac\bc\nc\fc\u05af\tc\u0001d\u0005d\u05b2\bd\nd\fd\u05b5\td\u0001"+
-		"d\u0001d\u0005d\u05b9\bd\nd\fd\u05bc\td\u0001d\u0001d\u0001e\u0001e\u0001"+
-		"e\u0001e\u0001f\u0001f\u0001f\u0003f\u05c7\bf\u0001f\u0001f\u0001f\u0001"+
-		"f\u0001f\u0005f\u05ce\bf\nf\ff\u05d1\tf\u0001f\u0001f\u0001f\u0001f\u0003"+
-		"f\u05d7\bf\u0001f\u0003f\u05da\bf\u0001g\u0001g\u0003g\u05de\bg\u0001"+
-		"h\u0001h\u0001h\u0001h\u0001h\u0001h\u0001h\u0001h\u0001h\u0001h\u0001"+
-		"h\u0001h\u0001h\u0001h\u0001h\u0001h\u0003h\u05f0\bh\u0003h\u05f2\bh\u0001"+
-		"i\u0001i\u0001i\u0001i\u0005i\u05f8\bi\ni\fi\u05fb\ti\u0001i\u0001i\u0001"+
-		"j\u0001j\u0001j\u0001j\u0003j\u0603\bj\u0001j\u0001j\u0001j\u0001j\u0001"+
-		"j\u0003j\u060a\bj\u0001k\u0001k\u0001k\u0001k\u0001k\u0001k\u0005k\u0612"+
-		"\bk\nk\fk\u0615\tk\u0001k\u0001k\u0005k\u0619\bk\nk\fk\u061c\tk\u0001"+
-		"k\u0001k\u0001k\u0005k\u0621\bk\nk\fk\u0624\tk\u0003k\u0626\bk\u0001k"+
-		"\u0001k\u0001k\u0005k\u062b\bk\nk\fk\u062e\tk\u0001l\u0001l\u0005l\u0632"+
-		"\bl\nl\fl\u0635\tl\u0003l\u0637\bl\u0001m\u0001m\u0001m\u0003m\u063c\b"+
-		"m\u0001m\u0005m\u063f\bm\nm\fm\u0642\tm\u0001m\u0001m\u0003m\u0646\bm"+
-		"\u0001n\u0003n\u0649\bn\u0001n\u0001n\u0001n\u0001n\u0001n\u0001n\u0003"+
-		"n\u0651\bn\u0001o\u0001o\u0003o\u0655\bo\u0001o\u0001o\u0001o\u0003o\u065a"+
-		"\bo\u0005o\u065c\bo\no\fo\u065f\to\u0001o\u0003o\u0662\bo\u0001p\u0001"+
-		"p\u0003p\u0666\bp\u0001p\u0001p\u0001q\u0001q\u0004q\u066c\bq\u000bq\f"+
-		"q\u066d\u0001q\u0001q\u0001q\u0001q\u0001q\u0004q\u0675\bq\u000bq\fq\u0676"+
-		"\u0001q\u0001q\u0005q\u067b\bq\nq\fq\u067e\tq\u0003q\u0680\bq\u0001r\u0001"+
-		"r\u0003r\u0684\br\u0001s\u0001s\u0001s\u0001t\u0001t\u0001t\u0003t\u068c"+
-		"\bt\u0001u\u0001u\u0001u\u0003u\u0691\bu\u0001v\u0001v\u0001v\u0001v\u0001"+
-		"w\u0001w\u0001w\u0005w\u069a\bw\nw\fw\u069d\tw\u0001x\u0005x\u06a0\bx"+
-		"\nx\fx\u06a3\tx\u0001x\u0001x\u0003x\u06a7\bx\u0001x\u0005x\u06aa\bx\n"+
-		"x\fx\u06ad\tx\u0001x\u0001x\u0005x\u06b1\bx\nx\fx\u06b4\tx\u0001y\u0001"+
-		"y\u0001z\u0001z\u0001z\u0001z\u0005z\u06bc\bz\nz\fz\u06bf\tz\u0001z\u0001"+
-		"z\u0001{\u0001{\u0001{\u0003{\u06c6\b{\u0001{\u0001{\u0003{\u06ca\b{\u0003"+
-		"{\u06cc\b{\u0001|\u0001|\u0001|\u0001|\u0001|\u0003|\u06d3\b|\u0001}\u0001"+
-		"}\u0003}\u06d7\b}\u0001}\u0001}\u0001}\u0000\u0002\u00c6\u00d6~\u0000"+
-		"\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c"+
-		"\u001e \"$&(*,.02468:<>@BDFHJLNPRTVXZ\\^`bdfhjlnprtvxz|~\u0080\u0082\u0084"+
-		"\u0086\u0088\u008a\u008c\u008e\u0090\u0092\u0094\u0096\u0098\u009a\u009c"+
-		"\u009e\u00a0\u00a2\u00a4\u00a6\u00a8\u00aa\u00ac\u00ae\u00b0\u00b2\u00b4"+
-		"\u00b6\u00b8\u00ba\u00bc\u00be\u00c0\u00c2\u00c4\u00c6\u00c8\u00ca\u00cc"+
-		"\u00ce\u00d0\u00d2\u00d4\u00d6\u00d8\u00da\u00dc\u00de\u00e0\u00e2\u00e4"+
-		"\u00e6\u00e8\u00ea\u00ec\u00ee\u00f0\u00f2\u00f4\u00f6\u00f8\u00fa\u0000"+
-		"\u000f\u0002\u0000\u0011\u0011((\u0001\u0000CF\u0001\u0000GH\u0002\u0000"+
-		"&&<<\u0002\u00003A\u0080\u0080\u0003\u00003<?A\u0080\u0080\u0002\u0000"+
-		"Z[dg\u0002\u0000himm\u0001\u0000fg\u0002\u0000XY_`\u0002\u0000^^aa\u0002"+
-		"\u0000WWnx\u0001\u0000de\u0002\u0000]]yy\b\u0000\u0003\u0003\u0005\u0005"+
-		"\b\b\u000e\u000e\u0014\u0014\u001b\u001b\u001d\u001d%%\u079f\u0000\u0110"+
-		"\u0001\u0000\u0000\u0000\u0002\u0115\u0001\u0000\u0000\u0000\u0004\u011c"+
-		"\u0001\u0000\u0000\u0000\u0006\u012a\u0001\u0000\u0000\u0000\b\u0139\u0001"+
-		"\u0000\u0000\u0000\n\u0145\u0001\u0000\u0000\u0000\f\u0149\u0001\u0000"+
-		"\u0000\u0000\u000e\u014b\u0001\u0000\u0000\u0000\u0010\u015e\u0001\u0000"+
-		"\u0000\u0000\u0012\u016c\u0001\u0000\u0000\u0000\u0014\u017a\u0001\u0000"+
-		"\u0000\u0000\u0016\u0182\u0001\u0000\u0000\u0000\u0018\u0194\u0001\u0000"+
-		"\u0000\u0000\u001a\u019f\u0001\u0000\u0000\u0000\u001c\u01a9\u0001\u0000"+
-		"\u0000\u0000\u001e\u01b0\u0001\u0000\u0000\u0000 \u01bf\u0001\u0000\u0000"+
-		"\u0000\"\u01c8\u0001\u0000\u0000\u0000$\u01dd\u0001\u0000\u0000\u0000"+
-		"&\u01e9\u0001\u0000\u0000\u0000(\u01eb\u0001\u0000\u0000\u0000*\u01fd"+
-		"\u0001\u0000\u0000\u0000,\u0201\u0001\u0000\u0000\u0000.\u0203\u0001\u0000"+
-		"\u0000\u00000\u0206\u0001\u0000\u0000\u00002\u0209\u0001\u0000\u0000\u0000"+
-		"4\u0214\u0001\u0000\u0000\u00006\u021a\u0001\u0000\u0000\u00008\u0226"+
-		"\u0001\u0000\u0000\u0000:\u0230\u0001\u0000\u0000\u0000<\u0232\u0001\u0000"+
-		"\u0000\u0000>\u023d\u0001\u0000\u0000\u0000@\u024b\u0001\u0000\u0000\u0000"+
-		"B\u0256\u0001\u0000\u0000\u0000D\u025b\u0001\u0000\u0000\u0000F\u0264"+
-		"\u0001\u0000\u0000\u0000H\u0277\u0001\u0000\u0000\u0000J\u027f\u0001\u0000"+
-		"\u0000\u0000L\u0284\u0001\u0000\u0000\u0000N\u028e\u0001\u0000\u0000\u0000"+
-		"P\u0290\u0001\u0000\u0000\u0000R\u02a8\u0001\u0000\u0000\u0000T\u02bb"+
-		"\u0001\u0000\u0000\u0000V\u02bd\u0001\u0000\u0000\u0000X\u02c5\u0001\u0000"+
-		"\u0000\u0000Z\u02d5\u0001\u0000\u0000\u0000\\\u02ed\u0001\u0000\u0000"+
-		"\u0000^\u02f2\u0001\u0000\u0000\u0000`\u02fb\u0001\u0000\u0000\u0000b"+
-		"\u0308\u0001\u0000\u0000\u0000d\u0313\u0001\u0000\u0000\u0000f\u0319\u0001"+
-		"\u0000\u0000\u0000h\u0328\u0001\u0000\u0000\u0000j\u032a\u0001\u0000\u0000"+
-		"\u0000l\u032c\u0001\u0000\u0000\u0000n\u0333\u0001\u0000\u0000\u0000p"+
-		"\u033c\u0001\u0000\u0000\u0000r\u0346\u0001\u0000\u0000\u0000t\u034e\u0001"+
-		"\u0000\u0000\u0000v\u0355\u0001\u0000\u0000\u0000x\u0357\u0001\u0000\u0000"+
-		"\u0000z\u0367\u0001\u0000\u0000\u0000|\u036c\u0001\u0000\u0000\u0000~"+
-		"\u037d\u0001\u0000\u0000\u0000\u0080\u0397\u0001\u0000\u0000\u0000\u0082"+
-		"\u039b\u0001\u0000\u0000\u0000\u0084\u039d\u0001\u0000\u0000\u0000\u0086"+
-		"\u03a3\u0001\u0000\u0000\u0000\u0088\u03a5\u0001\u0000\u0000\u0000\u008a"+
-		"\u03a9\u0001\u0000\u0000\u0000\u008c\u03af\u0001\u0000\u0000\u0000\u008e"+
-		"\u03dc\u0001\u0000\u0000\u0000\u0090\u03de\u0001\u0000\u0000\u0000\u0092"+
-		"\u03e0\u0001\u0000\u0000\u0000\u0094\u03ec\u0001\u0000\u0000\u0000\u0096"+
-		"\u03f2\u0001\u0000\u0000\u0000\u0098\u03fa\u0001\u0000\u0000\u0000\u009a"+
-		"\u03fd\u0001\u0000\u0000\u0000\u009c\u0407\u0001\u0000\u0000\u0000\u009e"+
-		"\u0415\u0001\u0000\u0000\u0000\u00a0\u041a\u0001\u0000\u0000\u0000\u00a2"+
-		"\u0427\u0001\u0000\u0000\u0000\u00a4\u0429\u0001\u0000\u0000\u0000\u00a6"+
-		"\u042e\u0001\u0000\u0000\u0000\u00a8\u04a7\u0001\u0000\u0000\u0000\u00aa"+
-		"\u04a9\u0001\u0000\u0000\u0000\u00ac\u04b6\u0001\u0000\u0000\u0000\u00ae"+
-		"\u04be\u0001\u0000\u0000\u0000\u00b0\u04c1\u0001\u0000\u0000\u0000\u00b2"+
-		"\u04c8\u0001\u0000\u0000\u0000\u00b4\u04e1\u0001\u0000\u0000\u0000\u00b6"+
-		"\u04e4\u0001\u0000\u0000\u0000\u00b8\u04f8\u0001\u0000\u0000\u0000\u00ba"+
-		"\u0506\u0001\u0000\u0000\u0000\u00bc\u050a\u0001\u0000\u0000\u0000\u00be"+
-		"\u050f\u0001\u0000\u0000\u0000\u00c0\u051a\u0001\u0000\u0000\u0000\u00c2"+
-		"\u051e\u0001\u0000\u0000\u0000\u00c4\u0529\u0001\u0000\u0000\u0000\u00c6"+
-		"\u0558\u0001\u0000\u0000\u0000\u00c8\u05b3\u0001\u0000\u0000\u0000\u00ca"+
-		"\u05bf\u0001\u0000\u0000\u0000\u00cc\u05d9\u0001\u0000\u0000\u0000\u00ce"+
-		"\u05dd\u0001\u0000\u0000\u0000\u00d0\u05f1\u0001\u0000\u0000\u0000\u00d2"+
-		"\u05f3\u0001\u0000\u0000\u0000\u00d4\u0609\u0001\u0000\u0000\u0000\u00d6"+
-		"\u0625\u0001\u0000\u0000\u0000\u00d8\u0636\u0001\u0000\u0000\u0000\u00da"+
-		"\u063b\u0001\u0000\u0000\u0000\u00dc\u0650\u0001\u0000\u0000\u0000\u00de"+
-		"\u0661\u0001\u0000\u0000\u0000\u00e0\u0663\u0001\u0000\u0000\u0000\u00e2"+
-		"\u067f\u0001\u0000\u0000\u0000\u00e4\u0681\u0001\u0000\u0000\u0000\u00e6"+
-		"\u0685\u0001\u0000\u0000\u0000\u00e8\u068b\u0001\u0000\u0000\u0000\u00ea"+
-		"\u0690\u0001\u0000\u0000\u0000\u00ec\u0692\u0001\u0000\u0000\u0000\u00ee"+
-		"\u0696\u0001\u0000\u0000\u0000\u00f0\u06a1\u0001\u0000\u0000\u0000\u00f2"+
-		"\u06b5\u0001\u0000\u0000\u0000\u00f4\u06b7\u0001\u0000\u0000\u0000\u00f6"+
-		"\u06cb\u0001\u0000\u0000\u0000\u00f8\u06d2\u0001\u0000\u0000\u0000\u00fa"+
-		"\u06d4\u0001\u0000\u0000\u0000\u00fc\u00fe\u0003\u0002\u0001\u0000\u00fd"+
-		"\u00fc\u0001\u0000\u0000\u0000\u00fd\u00fe\u0001\u0000\u0000\u0000\u00fe"+
-		"\u0103\u0001\u0000\u0000\u0000\u00ff\u0102\u0003\u0004\u0002\u0000\u0100"+
-		"\u0102\u0005T\u0000\u0000\u0101\u00ff\u0001\u0000\u0000\u0000\u0101\u0100"+
-		"\u0001\u0000\u0000\u0000\u0102\u0105\u0001\u0000\u0000\u0000\u0103\u0101"+
-		"\u0001\u0000\u0000\u0000\u0103\u0104\u0001\u0000\u0000\u0000\u0104\u010a"+
-		"\u0001\u0000\u0000\u0000\u0105\u0103\u0001\u0000\u0000\u0000\u0106\u0109"+
-		"\u0003\u0006\u0003\u0000\u0107\u0109\u0005T\u0000\u0000\u0108\u0106\u0001"+
-		"\u0000\u0000\u0000\u0108\u0107\u0001\u0000\u0000\u0000\u0109\u010c\u0001"+
-		"\u0000\u0000\u0000\u010a\u0108\u0001\u0000\u0000\u0000\u010a\u010b\u0001"+
-		"\u0000\u0000\u0000\u010b\u0111\u0001\u0000\u0000\u0000\u010c\u010a\u0001"+
-		"\u0000\u0000\u0000\u010d\u010e\u0003\u008aE\u0000\u010e\u010f\u0005\u0000"+
-		"\u0000\u0001\u010f\u0111\u0001\u0000\u0000\u0000\u0110\u00fd\u0001\u0000"+
-		"\u0000\u0000\u0110\u010d\u0001\u0000\u0000\u0000\u0111\u0001\u0001\u0000"+
-		"\u0000\u0000\u0112\u0114\u0003p8\u0000\u0113\u0112\u0001\u0000\u0000\u0000"+
-		"\u0114\u0117\u0001\u0000\u0000\u0000\u0115\u0113\u0001\u0000\u0000\u0000"+
-		"\u0115\u0116\u0001\u0000\u0000\u0000\u0116\u0118\u0001\u0000\u0000\u0000"+
-		"\u0117\u0115\u0001\u0000\u0000\u0000\u0118\u0119\u0005 \u0000\u0000\u0119"+
-		"\u011a\u0003f3\u0000\u011a\u011b\u0005T\u0000\u0000\u011b\u0003\u0001"+
-		"\u0000\u0000\u0000\u011c\u011e\u0005\u0019\u0000\u0000\u011d\u011f\u0005"+
-		"&\u0000\u0000\u011e\u011d\u0001\u0000\u0000\u0000\u011e\u011f\u0001\u0000"+
-		"\u0000\u0000\u011f\u0120\u0001\u0000\u0000\u0000\u0120\u0123\u0003f3\u0000"+
-		"\u0121\u0122\u0005V\u0000\u0000\u0122\u0124\u0005h\u0000\u0000\u0123\u0121"+
-		"\u0001\u0000\u0000\u0000\u0123\u0124\u0001\u0000\u0000\u0000\u0124\u0125"+
-		"\u0001\u0000\u0000\u0000\u0125\u0126\u0005T\u0000\u0000\u0126\u0005\u0001"+
-		"\u0000\u0000\u0000\u0127\u0129\u0003\n\u0005\u0000\u0128\u0127\u0001\u0000"+
-		"\u0000\u0000\u0129\u012c\u0001\u0000\u0000\u0000\u012a\u0128\u0001\u0000"+
-		"\u0000\u0000\u012a\u012b\u0001\u0000\u0000\u0000\u012b\u0132\u0001\u0000"+
-		"\u0000\u0000\u012c\u012a\u0001\u0000\u0000\u0000\u012d\u0133\u0003\u000e"+
-		"\u0007\u0000\u012e\u0133\u0003\u0016\u000b\u0000\u012f\u0133\u0003\u001e"+
-		"\u000f\u0000\u0130\u0133\u0003z=\u0000\u0131\u0133\u0003\u0092I\u0000"+
-		"\u0132\u012d\u0001\u0000\u0000\u0000\u0132\u012e\u0001\u0000\u0000\u0000"+
-		"\u0132\u012f\u0001\u0000\u0000\u0000\u0132\u0130\u0001\u0000\u0000\u0000"+
-		"\u0132\u0131\u0001\u0000\u0000\u0000\u0133\u0007\u0001\u0000\u0000\u0000"+
-		"\u0134\u013a\u0003\n\u0005\u0000\u0135\u013a\u0005\u001e\u0000\u0000\u0136"+
-		"\u013a\u0005*\u0000\u0000\u0137\u013a\u0005.\u0000\u0000\u0138\u013a\u0005"+
-		"1\u0000\u0000\u0139\u0134\u0001\u0000\u0000\u0000\u0139\u0135\u0001\u0000"+
-		"\u0000\u0000\u0139\u0136\u0001\u0000\u0000\u0000\u0139\u0137\u0001\u0000"+
-		"\u0000\u0000\u0139\u0138\u0001\u0000\u0000\u0000\u013a\t\u0001\u0000\u0000"+
-		"\u0000\u013b\u0146\u0003p8\u0000\u013c\u0146\u0005#\u0000\u0000\u013d"+
-		"\u0146\u0005\"\u0000\u0000\u013e\u0146\u0005!\u0000\u0000\u013f\u0146"+
-		"\u0005&\u0000\u0000\u0140\u0146\u0005\u0001\u0000\u0000\u0141\u0146\u0005"+
-		"\u0012\u0000\u0000\u0142\u0146\u0005\'\u0000\u0000\u0143\u0146\u0005@"+
-		"\u0000\u0000\u0144\u0146\u0005B\u0000\u0000\u0145\u013b\u0001\u0000\u0000"+
-		"\u0000\u0145\u013c\u0001\u0000\u0000\u0000\u0145\u013d\u0001\u0000\u0000"+
-		"\u0000\u0145\u013e\u0001\u0000\u0000\u0000\u0145\u013f\u0001\u0000\u0000"+
-		"\u0000\u0145\u0140\u0001\u0000\u0000\u0000\u0145\u0141\u0001\u0000\u0000"+
-		"\u0000\u0145\u0142\u0001\u0000\u0000\u0000\u0145\u0143\u0001\u0000\u0000"+
-		"\u0000\u0145\u0144\u0001\u0000\u0000\u0000\u0146\u000b\u0001\u0000\u0000"+
-		"\u0000\u0147\u014a\u0005\u0012\u0000\u0000\u0148\u014a\u0003p8\u0000\u0149"+
-		"\u0147\u0001\u0000\u0000\u0000\u0149\u0148\u0001\u0000\u0000\u0000\u014a"+
-		"\r\u0001\u0000\u0000\u0000\u014b\u014c\u0005\t\u0000\u0000\u014c\u014e"+
-		"\u0003\u00a2Q\u0000\u014d\u014f\u0003\u0010\b\u0000\u014e\u014d\u0001"+
-		"\u0000\u0000\u0000\u014e\u014f\u0001\u0000\u0000\u0000\u014f\u0152\u0001"+
-		"\u0000\u0000\u0000\u0150\u0151\u0005\u0011\u0000\u0000\u0151\u0153\u0003"+
-		"\u00f0x\u0000\u0152\u0150\u0001\u0000\u0000\u0000\u0152\u0153\u0001\u0000"+
-		"\u0000\u0000\u0153\u0156\u0001\u0000\u0000\u0000\u0154\u0155\u0005\u0018"+
-		"\u0000\u0000\u0155\u0157\u0003\u00eew\u0000\u0156\u0154\u0001\u0000\u0000"+
-		"\u0000\u0156\u0157\u0001\u0000\u0000\u0000\u0157\u015a\u0001\u0000\u0000"+
-		"\u0000\u0158\u0159\u0005A\u0000\u0000\u0159\u015b\u0003\u00eew\u0000\u015a"+
-		"\u0158\u0001\u0000\u0000\u0000\u015a\u015b\u0001\u0000\u0000\u0000\u015b"+
-		"\u015c\u0001\u0000\u0000\u0000\u015c\u015d\u0003 \u0010\u0000\u015d\u000f"+
-		"\u0001\u0000\u0000\u0000\u015e\u015f\u0005Y\u0000\u0000\u015f\u0164\u0003"+
-		"\u0012\t\u0000\u0160\u0161\u0005U\u0000\u0000\u0161\u0163\u0003\u0012"+
-		"\t\u0000\u0162\u0160\u0001\u0000\u0000\u0000\u0163\u0166\u0001\u0000\u0000"+
-		"\u0000\u0164\u0162\u0001\u0000\u0000\u0000\u0164\u0165\u0001\u0000\u0000"+
-		"\u0000\u0165\u0167\u0001\u0000\u0000\u0000\u0166\u0164\u0001\u0000\u0000"+
-		"\u0000\u0167\u0168\u0005X\u0000\u0000\u0168\u0011\u0001\u0000\u0000\u0000"+
-		"\u0169\u016b\u0003p8\u0000\u016a\u0169\u0001\u0000\u0000\u0000\u016b\u016e"+
-		"\u0001\u0000\u0000\u0000\u016c\u016a\u0001\u0000\u0000\u0000\u016c\u016d"+
-		"\u0001\u0000\u0000\u0000\u016d\u016f\u0001\u0000\u0000\u0000\u016e\u016c"+
-		"\u0001\u0000\u0000\u0000\u016f\u0178\u0003\u00a2Q\u0000\u0170\u0174\u0005"+
-		"\u0011\u0000\u0000\u0171\u0173\u0003p8\u0000\u0172\u0171\u0001\u0000\u0000"+
-		"\u0000\u0173\u0176\u0001\u0000\u0000\u0000\u0174\u0172\u0001\u0000\u0000"+
-		"\u0000\u0174\u0175\u0001\u0000\u0000\u0000\u0175\u0177\u0001\u0000\u0000"+
-		"\u0000\u0176\u0174\u0001\u0000\u0000\u0000\u0177\u0179\u0003\u0014\n\u0000"+
-		"\u0178\u0170\u0001\u0000\u0000\u0000\u0178\u0179\u0001\u0000\u0000\u0000"+
-		"\u0179\u0013\u0001\u0000\u0000\u0000\u017a\u017f\u0003\u00f0x\u0000\u017b"+
-		"\u017c\u0005j\u0000\u0000\u017c\u017e\u0003\u00f0x\u0000\u017d\u017b\u0001"+
-		"\u0000\u0000\u0000\u017e\u0181\u0001\u0000\u0000\u0000\u017f\u017d\u0001"+
-		"\u0000\u0000\u0000\u017f\u0180\u0001\u0000\u0000\u0000\u0180\u0015\u0001"+
-		"\u0000\u0000\u0000\u0181\u017f\u0001\u0000\u0000\u0000\u0182\u0183\u0005"+
-		"\u0010\u0000\u0000\u0183\u0186\u0003\u00a2Q\u0000\u0184\u0185\u0005\u0018"+
-		"\u0000\u0000\u0185\u0187\u0003\u00eew\u0000\u0186\u0184\u0001\u0000\u0000"+
-		"\u0000\u0186\u0187\u0001\u0000\u0000\u0000\u0187\u0188\u0001\u0000\u0000"+
-		"\u0000\u0188\u018a\u0005P\u0000\u0000\u0189\u018b\u0003\u0018\f\u0000"+
-		"\u018a\u0189\u0001\u0000\u0000\u0000\u018a\u018b\u0001\u0000\u0000\u0000"+
-		"\u018b\u018d\u0001\u0000\u0000\u0000\u018c\u018e\u0005U\u0000\u0000\u018d"+
-		"\u018c\u0001\u0000\u0000\u0000\u018d\u018e\u0001\u0000\u0000\u0000\u018e"+
-		"\u0190\u0001\u0000\u0000\u0000\u018f\u0191\u0003\u001c\u000e\u0000\u0190"+
-		"\u018f\u0001\u0000\u0000\u0000\u0190\u0191\u0001\u0000\u0000\u0000\u0191"+
-		"\u0192\u0001\u0000\u0000\u0000\u0192\u0193\u0005Q\u0000\u0000\u0193\u0017"+
-		"\u0001\u0000\u0000\u0000\u0194\u0199\u0003\u001a\r\u0000\u0195\u0196\u0005"+
-		"U\u0000\u0000\u0196\u0198\u0003\u001a\r\u0000\u0197\u0195\u0001\u0000"+
-		"\u0000\u0000\u0198\u019b\u0001\u0000\u0000\u0000\u0199\u0197\u0001\u0000"+
-		"\u0000\u0000\u0199\u019a\u0001\u0000\u0000\u0000\u019a\u0019\u0001\u0000"+
-		"\u0000\u0000\u019b\u0199\u0001\u0000\u0000\u0000\u019c\u019e\u0003p8\u0000"+
-		"\u019d\u019c\u0001\u0000\u0000\u0000\u019e\u01a1\u0001\u0000\u0000\u0000"+
-		"\u019f\u019d\u0001\u0000\u0000\u0000\u019f\u01a0\u0001\u0000\u0000\u0000"+
-		"\u01a0\u01a2\u0001\u0000\u0000\u0000\u01a1\u019f\u0001\u0000\u0000\u0000"+
-		"\u01a2\u01a4\u0003\u00a2Q\u0000\u01a3\u01a5\u0003\u00fa}\u0000\u01a4\u01a3"+
-		"\u0001\u0000\u0000\u0000\u01a4\u01a5\u0001\u0000\u0000\u0000\u01a5\u01a7"+
-		"\u0001\u0000\u0000\u0000\u01a6\u01a8\u0003 \u0010\u0000\u01a7\u01a6\u0001"+
-		"\u0000\u0000\u0000\u01a7\u01a8\u0001\u0000\u0000\u0000\u01a8\u001b\u0001"+
-		"\u0000\u0000\u0000\u01a9\u01ad\u0005T\u0000\u0000\u01aa\u01ac\u0003$\u0012"+
-		"\u0000\u01ab\u01aa\u0001\u0000\u0000\u0000\u01ac\u01af\u0001\u0000\u0000"+
-		"\u0000\u01ad\u01ab\u0001\u0000\u0000\u0000\u01ad\u01ae\u0001\u0000\u0000"+
-		"\u0000\u01ae\u001d\u0001\u0000\u0000\u0000\u01af\u01ad\u0001\u0000\u0000"+
-		"\u0000\u01b0\u01b1\u0005\u001c\u0000\u0000\u01b1\u01b3\u0003\u00a2Q\u0000"+
-		"\u01b2\u01b4\u0003\u0010\b\u0000\u01b3\u01b2\u0001\u0000\u0000\u0000\u01b3"+
-		"\u01b4\u0001\u0000\u0000\u0000\u01b4\u01b7\u0001\u0000\u0000\u0000\u01b5"+
-		"\u01b6\u0005\u0011\u0000\u0000\u01b6\u01b8\u0003\u00eew\u0000\u01b7\u01b5"+
-		"\u0001\u0000\u0000\u0000\u01b7\u01b8\u0001\u0000\u0000\u0000\u01b8\u01bb"+
-		"\u0001\u0000\u0000\u0000\u01b9\u01ba\u0005A\u0000\u0000\u01ba\u01bc\u0003"+
-		"\u00eew\u0000\u01bb\u01b9\u0001\u0000\u0000\u0000\u01bb\u01bc\u0001\u0000"+
-		"\u0000\u0000\u01bc\u01bd\u0001\u0000\u0000\u0000\u01bd\u01be\u0003\"\u0011"+
-		"\u0000\u01be\u001f\u0001\u0000\u0000\u0000\u01bf\u01c3\u0005P\u0000\u0000"+
-		"\u01c0\u01c2\u0003$\u0012\u0000\u01c1\u01c0\u0001\u0000\u0000\u0000\u01c2"+
-		"\u01c5\u0001\u0000\u0000\u0000\u01c3\u01c1\u0001\u0000\u0000\u0000\u01c3"+
-		"\u01c4\u0001\u0000\u0000\u0000\u01c4\u01c6\u0001\u0000\u0000\u0000\u01c5"+
-		"\u01c3\u0001\u0000\u0000\u0000\u01c6\u01c7\u0005Q\u0000\u0000\u01c7!\u0001"+
-		"\u0000\u0000\u0000\u01c8\u01cc\u0005P\u0000\u0000\u01c9\u01cb\u00038\u001c"+
-		"\u0000\u01ca\u01c9\u0001\u0000\u0000\u0000\u01cb\u01ce\u0001\u0000\u0000"+
-		"\u0000\u01cc\u01ca\u0001\u0000\u0000\u0000\u01cc\u01cd\u0001\u0000\u0000"+
-		"\u0000\u01cd\u01cf\u0001\u0000\u0000\u0000\u01ce\u01cc\u0001\u0000\u0000"+
-		"\u0000\u01cf\u01d0\u0005Q\u0000\u0000\u01d0#\u0001\u0000\u0000\u0000\u01d1"+
-		"\u01de\u0005T\u0000\u0000\u01d2\u01d4\u0005&\u0000\u0000\u01d3\u01d2\u0001"+
-		"\u0000\u0000\u0000\u01d3\u01d4\u0001\u0000\u0000\u0000\u01d4\u01d5\u0001"+
-		"\u0000\u0000\u0000\u01d5\u01de\u0003\u009cN\u0000\u01d6\u01d8\u0003\b"+
-		"\u0004\u0000\u01d7\u01d6\u0001\u0000\u0000\u0000\u01d8\u01db\u0001\u0000"+
-		"\u0000\u0000\u01d9\u01d7\u0001\u0000\u0000\u0000\u01d9\u01da\u0001\u0000"+
-		"\u0000\u0000\u01da\u01dc\u0001\u0000\u0000\u0000\u01db\u01d9\u0001\u0000"+
-		"\u0000\u0000\u01dc\u01de\u0003&\u0013\u0000\u01dd\u01d1\u0001\u0000\u0000"+
-		"\u0000\u01dd\u01d3\u0001\u0000\u0000\u0000\u01dd\u01d9\u0001\u0000\u0000"+
-		"\u0000\u01de%\u0001\u0000\u0000\u0000\u01df\u01ea\u0003\u0092I\u0000\u01e0"+
-		"\u01ea\u0003(\u0014\u0000\u01e1\u01ea\u0003.\u0017\u0000\u01e2\u01ea\u0003"+
-		"6\u001b\u0000\u01e3\u01ea\u00032\u0019\u0000\u01e4\u01ea\u00030\u0018"+
-		"\u0000\u01e5\u01ea\u0003\u001e\u000f\u0000\u01e6\u01ea\u0003z=\u0000\u01e7"+
-		"\u01ea\u0003\u000e\u0007\u0000\u01e8\u01ea\u0003\u0016\u000b\u0000\u01e9"+
-		"\u01df\u0001\u0000\u0000\u0000\u01e9\u01e0\u0001\u0000\u0000\u0000\u01e9"+
-		"\u01e1\u0001\u0000\u0000\u0000\u01e9\u01e2\u0001\u0000\u0000\u0000\u01e9"+
-		"\u01e3\u0001\u0000\u0000\u0000\u01e9\u01e4\u0001\u0000\u0000\u0000\u01e9"+
-		"\u01e5\u0001\u0000\u0000\u0000\u01e9\u01e6\u0001\u0000\u0000\u0000\u01e9"+
-		"\u01e7\u0001\u0000\u0000\u0000\u01e9\u01e8\u0001\u0000\u0000\u0000\u01ea"+
-		"\'\u0001\u0000\u0000\u0000\u01eb\u01ec\u0003,\u0016\u0000\u01ec\u01ed"+
-		"\u0003\u00a2Q\u0000\u01ed\u01f2\u0003X,\u0000\u01ee\u01ef\u0005R\u0000"+
-		"\u0000\u01ef\u01f1\u0005S\u0000\u0000\u01f0\u01ee\u0001\u0000\u0000\u0000"+
-		"\u01f1\u01f4\u0001\u0000\u0000\u0000\u01f2\u01f0\u0001\u0000\u0000\u0000"+
-		"\u01f2\u01f3\u0001\u0000\u0000\u0000\u01f3\u01f7\u0001\u0000\u0000\u0000"+
-		"\u01f4\u01f2\u0001\u0000\u0000\u0000\u01f5\u01f6\u0005-\u0000\u0000\u01f6"+
-		"\u01f8\u0003V+\u0000\u01f7\u01f5\u0001\u0000\u0000\u0000\u01f7\u01f8\u0001"+
-		"\u0000\u0000\u0000\u01f8\u01f9\u0001\u0000\u0000\u0000\u01f9\u01fa\u0003"+
-		"*\u0015\u0000\u01fa)\u0001\u0000\u0000\u0000\u01fb\u01fe\u0003\u009cN"+
-		"\u0000\u01fc\u01fe\u0005T\u0000\u0000\u01fd\u01fb\u0001\u0000\u0000\u0000"+
-		"\u01fd\u01fc\u0001\u0000\u0000\u0000\u01fe+\u0001\u0000\u0000\u0000\u01ff"+
-		"\u0202\u0003\u00f0x\u0000\u0200\u0202\u00050\u0000\u0000\u0201\u01ff\u0001"+
-		"\u0000\u0000\u0000\u0201\u0200\u0001\u0000\u0000\u0000\u0202-\u0001\u0000"+
-		"\u0000\u0000\u0203\u0204\u0003\u0010\b\u0000\u0204\u0205\u0003(\u0014"+
-		"\u0000\u0205/\u0001\u0000\u0000\u0000\u0206\u0207\u0003\u0010\b\u0000"+
-		"\u0207\u0208\u00032\u0019\u0000\u02081\u0001\u0000\u0000\u0000\u0209\u020a"+
-		"\u0003\u00a2Q\u0000\u020a\u020d\u0003X,\u0000\u020b\u020c\u0005-\u0000"+
-		"\u0000\u020c\u020e\u0003V+\u0000\u020d\u020b\u0001\u0000\u0000\u0000\u020d"+
-		"\u020e\u0001\u0000\u0000\u0000\u020e\u020f\u0001\u0000\u0000\u0000\u020f"+
-		"\u0210\u0003\u009cN\u0000\u02103\u0001\u0000\u0000\u0000\u0211\u0213\u0003"+
-		"\b\u0004\u0000\u0212\u0211\u0001\u0000\u0000\u0000\u0213\u0216\u0001\u0000"+
-		"\u0000\u0000\u0214\u0212\u0001\u0000\u0000\u0000\u0214\u0215\u0001\u0000"+
-		"\u0000\u0000\u0215\u0217\u0001\u0000\u0000\u0000\u0216\u0214\u0001\u0000"+
-		"\u0000\u0000\u0217\u0218\u0003\u00a2Q\u0000\u0218\u0219\u0003\u009cN\u0000"+
-		"\u02195\u0001\u0000\u0000\u0000\u021a\u021b\u0003\u00f0x\u0000\u021b\u021c"+
-		"\u0003H$\u0000\u021c\u021d\u0005T\u0000\u0000\u021d7\u0001\u0000\u0000"+
-		"\u0000\u021e\u0220\u0003\b\u0004\u0000\u021f\u021e\u0001\u0000\u0000\u0000"+
-		"\u0220\u0223\u0001\u0000\u0000\u0000\u0221\u021f\u0001\u0000\u0000\u0000"+
-		"\u0221\u0222\u0001\u0000\u0000\u0000\u0222\u0224\u0001\u0000\u0000\u0000"+
-		"\u0223\u0221\u0001\u0000\u0000\u0000\u0224\u0227\u0003:\u001d\u0000\u0225"+
-		"\u0227\u0005T\u0000\u0000\u0226\u0221\u0001\u0000\u0000\u0000\u0226\u0225"+
-		"\u0001\u0000\u0000\u0000\u02279\u0001\u0000\u0000\u0000\u0228\u0231\u0003"+
-		"\u0092I\u0000\u0229\u0231\u0003<\u001e\u0000\u022a\u0231\u0003@ \u0000"+
-		"\u022b\u0231\u0003D\"\u0000\u022c\u0231\u0003\u001e\u000f\u0000\u022d"+
-		"\u0231\u0003z=\u0000\u022e\u0231\u0003\u000e\u0007\u0000\u022f\u0231\u0003"+
-		"\u0016\u000b\u0000\u0230\u0228\u0001\u0000\u0000\u0000\u0230\u0229\u0001"+
-		"\u0000\u0000\u0000\u0230\u022a\u0001\u0000\u0000\u0000\u0230\u022b\u0001"+
-		"\u0000\u0000\u0000\u0230\u022c\u0001\u0000\u0000\u0000\u0230\u022d\u0001"+
-		"\u0000\u0000\u0000\u0230\u022e\u0001\u0000\u0000\u0000\u0230\u022f\u0001"+
-		"\u0000\u0000\u0000\u0231;\u0001\u0000\u0000\u0000\u0232\u0233\u0003\u00f0"+
-		"x\u0000\u0233\u0238\u0003>\u001f\u0000\u0234\u0235\u0005U\u0000\u0000"+
-		"\u0235\u0237\u0003>\u001f\u0000\u0236\u0234\u0001\u0000\u0000\u0000\u0237"+
-		"\u023a\u0001\u0000\u0000\u0000\u0238\u0236\u0001\u0000\u0000\u0000\u0238"+
-		"\u0239\u0001\u0000\u0000\u0000\u0239\u023b\u0001\u0000\u0000\u0000\u023a"+
-		"\u0238\u0001\u0000\u0000\u0000\u023b\u023c\u0005T\u0000\u0000\u023c=\u0001"+
-		"\u0000\u0000\u0000\u023d\u0242\u0003\u00a2Q\u0000\u023e\u023f\u0005R\u0000"+
-		"\u0000\u023f\u0241\u0005S\u0000\u0000\u0240\u023e\u0001\u0000\u0000\u0000"+
-		"\u0241\u0244\u0001\u0000\u0000\u0000\u0242\u0240\u0001\u0000\u0000\u0000"+
-		"\u0242\u0243\u0001\u0000\u0000\u0000\u0243\u0245\u0001\u0000\u0000\u0000"+
-		"\u0244\u0242\u0001\u0000\u0000\u0000\u0245\u0246\u0005W\u0000\u0000\u0246"+
-		"\u0247\u0003N\'\u0000\u0247?\u0001\u0000\u0000\u0000\u0248\u024a\u0003"+
-		"B!\u0000\u0249\u0248\u0001\u0000\u0000\u0000\u024a\u024d\u0001\u0000\u0000"+
-		"\u0000\u024b\u0249\u0001\u0000\u0000\u0000\u024b\u024c\u0001\u0000\u0000"+
-		"\u0000\u024c\u024e\u0001\u0000\u0000\u0000\u024d\u024b\u0001\u0000\u0000"+
-		"\u0000\u024e\u024f\u0003F#\u0000\u024fA\u0001\u0000\u0000\u0000\u0250"+
-		"\u0257\u0003p8\u0000\u0251\u0257\u0005#\u0000\u0000\u0252\u0257\u0005"+
-		"\u0001\u0000\u0000\u0253\u0257\u0005\f\u0000\u0000\u0254\u0257\u0005&"+
-		"\u0000\u0000\u0255\u0257\u0005\'\u0000\u0000\u0256\u0250\u0001\u0000\u0000"+
-		"\u0000\u0256\u0251\u0001\u0000\u0000\u0000\u0256\u0252\u0001\u0000\u0000"+
-		"\u0000\u0256\u0253\u0001\u0000\u0000\u0000\u0256\u0254\u0001\u0000\u0000"+
-		"\u0000\u0256\u0255\u0001\u0000\u0000\u0000\u0257C\u0001\u0000\u0000\u0000"+
-		"\u0258\u025a\u0003B!\u0000\u0259\u0258\u0001\u0000\u0000\u0000\u025a\u025d"+
-		"\u0001\u0000\u0000\u0000\u025b\u0259\u0001\u0000\u0000\u0000\u025b\u025c"+
-		"\u0001\u0000\u0000\u0000\u025c\u025e\u0001\u0000\u0000\u0000\u025d\u025b"+
-		"\u0001\u0000\u0000\u0000\u025e\u025f\u0003\u0010\b\u0000\u025f\u0260\u0003"+
-		"F#\u0000\u0260E\u0001\u0000\u0000\u0000\u0261\u0263\u0003p8\u0000\u0262"+
-		"\u0261\u0001\u0000\u0000\u0000\u0263\u0266\u0001\u0000\u0000\u0000\u0264"+
-		"\u0262\u0001\u0000\u0000\u0000\u0264\u0265\u0001\u0000\u0000\u0000\u0265"+
-		"\u0267\u0001\u0000\u0000\u0000\u0266\u0264\u0001\u0000\u0000\u0000\u0267"+
-		"\u0268\u0003,\u0016\u0000\u0268\u0269\u0003\u00a2Q\u0000\u0269\u026e\u0003"+
-		"X,\u0000\u026a\u026b\u0005R\u0000\u0000\u026b\u026d\u0005S\u0000\u0000"+
-		"\u026c\u026a\u0001\u0000\u0000\u0000\u026d\u0270\u0001\u0000\u0000\u0000"+
-		"\u026e\u026c\u0001\u0000\u0000\u0000\u026e\u026f\u0001\u0000\u0000\u0000"+
-		"\u026f\u0273\u0001\u0000\u0000\u0000\u0270\u026e\u0001\u0000\u0000\u0000"+
-		"\u0271\u0272\u0005-\u0000\u0000\u0272\u0274\u0003V+\u0000\u0273\u0271"+
-		"\u0001\u0000\u0000\u0000\u0273\u0274\u0001\u0000\u0000\u0000\u0274\u0275"+
-		"\u0001\u0000\u0000\u0000\u0275\u0276\u0003*\u0015\u0000\u0276G\u0001\u0000"+
-		"\u0000\u0000\u0277\u027c\u0003J%\u0000\u0278\u0279\u0005U\u0000\u0000"+
-		"\u0279\u027b\u0003J%\u0000\u027a\u0278\u0001\u0000\u0000\u0000\u027b\u027e"+
-		"\u0001\u0000\u0000\u0000\u027c\u027a\u0001\u0000\u0000\u0000\u027c\u027d"+
-		"\u0001\u0000\u0000\u0000\u027dI\u0001\u0000\u0000\u0000\u027e\u027c\u0001"+
-		"\u0000\u0000\u0000\u027f\u0282\u0003L&\u0000\u0280\u0281\u0005W\u0000"+
-		"\u0000\u0281\u0283\u0003N\'\u0000\u0282\u0280\u0001\u0000\u0000\u0000"+
-		"\u0282\u0283\u0001\u0000\u0000\u0000\u0283K\u0001\u0000\u0000\u0000\u0284"+
-		"\u0289\u0003\u00a2Q\u0000\u0285\u0286\u0005R\u0000\u0000\u0286\u0288\u0005"+
-		"S\u0000\u0000\u0287\u0285\u0001\u0000\u0000\u0000\u0288\u028b\u0001\u0000"+
-		"\u0000\u0000\u0289\u0287\u0001\u0000\u0000\u0000\u0289\u028a\u0001\u0000"+
-		"\u0000\u0000\u028aM\u0001\u0000\u0000\u0000\u028b\u0289\u0001\u0000\u0000"+
-		"\u0000\u028c\u028f\u0003P(\u0000\u028d\u028f\u0003\u00c6c\u0000\u028e"+
-		"\u028c\u0001\u0000\u0000\u0000\u028e\u028d\u0001\u0000\u0000\u0000\u028f"+
-		"O\u0001\u0000\u0000\u0000\u0290\u029c\u0005P\u0000\u0000\u0291\u0296\u0003"+
-		"N\'\u0000\u0292\u0293\u0005U\u0000\u0000\u0293\u0295\u0003N\'\u0000\u0294"+
-		"\u0292\u0001\u0000\u0000\u0000\u0295\u0298\u0001\u0000\u0000\u0000\u0296"+
-		"\u0294\u0001\u0000\u0000\u0000\u0296\u0297\u0001\u0000\u0000\u0000\u0297"+
-		"\u029a\u0001\u0000\u0000\u0000\u0298\u0296\u0001\u0000\u0000\u0000\u0299"+
-		"\u029b\u0005U\u0000\u0000\u029a\u0299\u0001\u0000\u0000\u0000\u029a\u029b"+
-		"\u0001\u0000\u0000\u0000\u029b\u029d\u0001\u0000\u0000\u0000\u029c\u0291"+
-		"\u0001\u0000\u0000\u0000\u029c\u029d\u0001\u0000\u0000\u0000\u029d\u029e"+
-		"\u0001\u0000\u0000\u0000\u029e\u029f\u0005Q\u0000\u0000\u029fQ\u0001\u0000"+
-		"\u0000\u0000\u02a0\u02a2\u0003\u00a2Q\u0000\u02a1\u02a3\u0003\u00f4z\u0000"+
-		"\u02a2\u02a1\u0001\u0000\u0000\u0000\u02a2\u02a3\u0001\u0000\u0000\u0000"+
-		"\u02a3\u02a4\u0001\u0000\u0000\u0000\u02a4\u02a5\u0005V\u0000\u0000\u02a5"+
-		"\u02a7\u0001\u0000\u0000\u0000\u02a6\u02a0\u0001\u0000\u0000\u0000\u02a7"+
-		"\u02aa\u0001\u0000\u0000\u0000\u02a8\u02a6\u0001\u0000\u0000\u0000\u02a8"+
-		"\u02a9\u0001\u0000\u0000\u0000\u02a9\u02ab\u0001\u0000\u0000\u0000\u02aa"+
-		"\u02a8\u0001\u0000\u0000\u0000\u02ab\u02ad\u0003\u00a4R\u0000\u02ac\u02ae"+
-		"\u0003\u00f4z\u0000\u02ad\u02ac\u0001\u0000\u0000\u0000\u02ad\u02ae\u0001"+
-		"\u0000\u0000\u0000\u02aeS\u0001\u0000\u0000\u0000\u02af\u02bc\u0003\u00f0"+
-		"x\u0000\u02b0\u02b2\u0003p8\u0000\u02b1\u02b0\u0001\u0000\u0000\u0000"+
-		"\u02b2\u02b5\u0001\u0000\u0000\u0000\u02b3\u02b1\u0001\u0000\u0000\u0000"+
-		"\u02b3\u02b4\u0001\u0000\u0000\u0000\u02b4\u02b6\u0001\u0000\u0000\u0000"+
-		"\u02b5\u02b3\u0001\u0000\u0000\u0000\u02b6\u02b9\u0005\\\u0000\u0000\u02b7"+
-		"\u02b8\u0007\u0000\u0000\u0000\u02b8\u02ba\u0003\u00f0x\u0000\u02b9\u02b7"+
-		"\u0001\u0000\u0000\u0000\u02b9\u02ba\u0001\u0000\u0000\u0000\u02ba\u02bc"+
-		"\u0001\u0000\u0000\u0000\u02bb\u02af\u0001\u0000\u0000\u0000\u02bb\u02b3"+
-		"\u0001\u0000\u0000\u0000\u02bcU\u0001\u0000\u0000\u0000\u02bd\u02c2\u0003"+
-		"f3\u0000\u02be\u02bf\u0005U\u0000\u0000\u02bf\u02c1\u0003f3\u0000\u02c0"+
-		"\u02be\u0001\u0000\u0000\u0000\u02c1\u02c4\u0001\u0000\u0000\u0000\u02c2"+
-		"\u02c0\u0001\u0000\u0000\u0000\u02c2\u02c3\u0001\u0000\u0000\u0000\u02c3"+
-		"W\u0001\u0000\u0000\u0000\u02c4\u02c2\u0001\u0000\u0000\u0000\u02c5\u02d1"+
-		"\u0005N\u0000\u0000\u02c6\u02c8\u0003Z-\u0000\u02c7\u02c6\u0001\u0000"+
-		"\u0000\u0000\u02c7\u02c8\u0001\u0000\u0000\u0000\u02c8\u02d2\u0001\u0000"+
-		"\u0000\u0000\u02c9\u02cc\u0003Z-\u0000\u02ca\u02cb\u0005U\u0000\u0000"+
-		"\u02cb\u02cd\u0003\\.\u0000\u02cc\u02ca\u0001\u0000\u0000\u0000\u02cc"+
-		"\u02cd\u0001\u0000\u0000\u0000\u02cd\u02d2\u0001\u0000\u0000\u0000\u02ce"+
-		"\u02d0\u0003\\.\u0000\u02cf\u02ce\u0001\u0000\u0000\u0000\u02cf\u02d0"+
-		"\u0001\u0000\u0000\u0000\u02d0\u02d2\u0001\u0000\u0000\u0000\u02d1\u02c7"+
-		"\u0001\u0000\u0000\u0000\u02d1\u02c9\u0001\u0000\u0000\u0000\u02d1\u02cf"+
-		"\u0001\u0000\u0000\u0000\u02d2\u02d3\u0001\u0000\u0000\u0000\u02d3\u02d4"+
-		"\u0005O\u0000\u0000\u02d4Y\u0001\u0000\u0000\u0000\u02d5\u02db\u0003\u00f0"+
-		"x\u0000\u02d6\u02d7\u0003\u00a2Q\u0000\u02d7\u02d8\u0005V\u0000\u0000"+
-		"\u02d8\u02da\u0001\u0000\u0000\u0000\u02d9\u02d6\u0001\u0000\u0000\u0000"+
-		"\u02da\u02dd\u0001\u0000\u0000\u0000\u02db\u02d9\u0001\u0000\u0000\u0000"+
-		"\u02db\u02dc\u0001\u0000\u0000\u0000\u02dc\u02de\u0001\u0000\u0000\u0000"+
-		"\u02dd\u02db\u0001\u0000\u0000\u0000\u02de\u02df\u0005+\u0000\u0000\u02df"+
-		"[\u0001\u0000\u0000\u0000\u02e0\u02e5\u0003^/\u0000\u02e1\u02e2\u0005"+
-		"U\u0000\u0000\u02e2\u02e4\u0003^/\u0000\u02e3\u02e1\u0001\u0000\u0000"+
-		"\u0000\u02e4\u02e7\u0001\u0000\u0000\u0000\u02e5\u02e3\u0001\u0000\u0000"+
-		"\u0000\u02e5\u02e6\u0001\u0000\u0000\u0000\u02e6\u02ea\u0001\u0000\u0000"+
-		"\u0000\u02e7\u02e5\u0001\u0000\u0000\u0000\u02e8\u02e9\u0005U\u0000\u0000"+
-		"\u02e9\u02eb\u0003`0\u0000\u02ea\u02e8\u0001\u0000\u0000\u0000\u02ea\u02eb"+
-		"\u0001\u0000\u0000\u0000\u02eb\u02ee\u0001\u0000\u0000\u0000\u02ec\u02ee"+
-		"\u0003`0\u0000\u02ed\u02e0\u0001\u0000\u0000\u0000\u02ed\u02ec\u0001\u0000"+
-		"\u0000\u0000\u02ee]\u0001\u0000\u0000\u0000\u02ef\u02f1\u0003\f\u0006"+
-		"\u0000\u02f0\u02ef\u0001\u0000\u0000\u0000\u02f1\u02f4\u0001\u0000\u0000"+
-		"\u0000\u02f2\u02f0\u0001\u0000\u0000\u0000\u02f2\u02f3\u0001\u0000\u0000"+
-		"\u0000\u02f3\u02f5\u0001\u0000\u0000\u0000\u02f4\u02f2\u0001\u0000\u0000"+
-		"\u0000\u02f5\u02f6\u0003\u00f0x\u0000\u02f6\u02f7\u0003L&\u0000\u02f7"+
-		"_\u0001\u0000\u0000\u0000\u02f8\u02fa\u0003\f\u0006\u0000\u02f9\u02f8"+
-		"\u0001\u0000\u0000\u0000\u02fa\u02fd\u0001\u0000\u0000\u0000\u02fb\u02f9"+
-		"\u0001\u0000\u0000\u0000\u02fb\u02fc\u0001\u0000\u0000\u0000\u02fc\u02fe"+
-		"\u0001\u0000\u0000\u0000\u02fd\u02fb\u0001\u0000\u0000\u0000\u02fe\u0302"+
-		"\u0003\u00f0x\u0000\u02ff\u0301\u0003p8\u0000\u0300\u02ff\u0001\u0000"+
-		"\u0000\u0000\u0301\u0304\u0001\u0000\u0000\u0000\u0302\u0300\u0001\u0000"+
-		"\u0000\u0000\u0302\u0303\u0001\u0000\u0000\u0000\u0303\u0305\u0001\u0000"+
-		"\u0000\u0000\u0304\u0302\u0001\u0000\u0000\u0000\u0305\u0306\u0005|\u0000"+
-		"\u0000\u0306\u0307\u0003L&\u0000\u0307a\u0001\u0000\u0000\u0000\u0308"+
-		"\u030d\u0003d2\u0000\u0309\u030a\u0005U\u0000\u0000\u030a\u030c\u0003"+
-		"d2\u0000\u030b\u0309\u0001\u0000\u0000\u0000\u030c\u030f\u0001\u0000\u0000"+
-		"\u0000\u030d\u030b\u0001\u0000\u0000\u0000\u030d\u030e\u0001\u0000\u0000"+
-		"\u0000\u030ec\u0001\u0000\u0000\u0000\u030f\u030d\u0001\u0000\u0000\u0000"+
-		"\u0310\u0312\u0003\f\u0006\u0000\u0311\u0310\u0001\u0000\u0000\u0000\u0312"+
-		"\u0315\u0001\u0000\u0000\u0000\u0313\u0311\u0001\u0000\u0000\u0000\u0313"+
-		"\u0314\u0001\u0000\u0000\u0000\u0314\u0316\u0001\u0000\u0000\u0000\u0315"+
-		"\u0313\u0001\u0000\u0000\u0000\u0316\u0317\u0005=\u0000\u0000\u0317\u0318"+
-		"\u0003\u00a2Q\u0000\u0318e\u0001\u0000\u0000\u0000\u0319\u031e\u0003\u00a2"+
-		"Q\u0000\u031a\u031b\u0005V\u0000\u0000\u031b\u031d\u0003\u00a2Q\u0000"+
-		"\u031c\u031a\u0001\u0000\u0000\u0000\u031d\u0320\u0001\u0000\u0000\u0000"+
-		"\u031e\u031c\u0001\u0000\u0000\u0000\u031e\u031f\u0001\u0000\u0000\u0000"+
-		"\u031fg\u0001\u0000\u0000\u0000\u0320\u031e\u0001\u0000\u0000\u0000\u0321"+
-		"\u0329\u0003j5\u0000\u0322\u0329\u0003l6\u0000\u0323\u0329\u0005J\u0000"+
-		"\u0000\u0324\u0329\u0005K\u0000\u0000\u0325\u0329\u0005I\u0000\u0000\u0326"+
-		"\u0329\u0005M\u0000\u0000\u0327\u0329\u0005L\u0000\u0000\u0328\u0321\u0001"+
-		"\u0000\u0000\u0000\u0328\u0322\u0001\u0000\u0000\u0000\u0328\u0323\u0001"+
-		"\u0000\u0000\u0000\u0328\u0324\u0001\u0000\u0000\u0000\u0328\u0325\u0001"+
-		"\u0000\u0000\u0000\u0328\u0326\u0001\u0000\u0000\u0000\u0328\u0327\u0001"+
-		"\u0000\u0000\u0000\u0329i\u0001\u0000\u0000\u0000\u032a\u032b\u0007\u0001"+
-		"\u0000\u0000\u032bk\u0001\u0000\u0000\u0000\u032c\u032d\u0007\u0002\u0000"+
-		"\u0000\u032dm\u0001\u0000\u0000\u0000\u032e\u032f\u0003\u00a2Q\u0000\u032f"+
-		"\u0330\u0005V\u0000\u0000\u0330\u0332\u0001\u0000\u0000\u0000\u0331\u032e"+
-		"\u0001\u0000\u0000\u0000\u0332\u0335\u0001\u0000\u0000\u0000\u0333\u0331"+
-		"\u0001\u0000\u0000\u0000\u0333\u0334\u0001\u0000\u0000\u0000\u0334\u0336"+
-		"\u0001\u0000\u0000\u0000\u0335\u0333\u0001\u0000\u0000\u0000\u0336\u0337"+
-		"\u0005{\u0000\u0000\u0337\u0338\u0003\u00a2Q\u0000\u0338o\u0001\u0000"+
-		"\u0000\u0000\u0339\u033a\u0005{\u0000\u0000\u033a\u033d\u0003f3\u0000"+
-		"\u033b\u033d\u0003n7\u0000\u033c\u0339\u0001\u0000\u0000\u0000\u033c\u033b"+
-		"\u0001\u0000\u0000\u0000\u033d\u0344\u0001\u0000\u0000\u0000\u033e\u0341"+
-		"\u0005N\u0000\u0000\u033f\u0342\u0003r9\u0000\u0340\u0342\u0003v;\u0000"+
-		"\u0341\u033f\u0001\u0000\u0000\u0000\u0341\u0340\u0001\u0000\u0000\u0000"+
-		"\u0341\u0342\u0001\u0000\u0000\u0000\u0342\u0343\u0001\u0000\u0000\u0000"+
-		"\u0343\u0345\u0005O\u0000\u0000\u0344\u033e\u0001\u0000\u0000\u0000\u0344"+
-		"\u0345\u0001\u0000\u0000\u0000\u0345q\u0001\u0000\u0000\u0000\u0346\u034b"+
-		"\u0003t:\u0000\u0347\u0348\u0005U\u0000\u0000\u0348\u034a\u0003t:\u0000"+
-		"\u0349\u0347\u0001\u0000\u0000\u0000\u034a\u034d\u0001\u0000\u0000\u0000"+
-		"\u034b\u0349\u0001\u0000\u0000\u0000\u034b\u034c\u0001\u0000\u0000\u0000"+
-		"\u034cs\u0001\u0000\u0000\u0000\u034d\u034b\u0001\u0000\u0000\u0000\u034e"+
-		"\u034f\u0003\u00a2Q\u0000\u034f\u0350\u0005W\u0000\u0000\u0350\u0351\u0003"+
-		"v;\u0000\u0351u\u0001\u0000\u0000\u0000\u0352\u0356\u0003\u00c6c\u0000"+
-		"\u0353\u0356\u0003p8\u0000\u0354\u0356\u0003x<\u0000\u0355\u0352\u0001"+
-		"\u0000\u0000\u0000\u0355\u0353\u0001\u0000\u0000\u0000\u0355\u0354\u0001"+
-		"\u0000\u0000\u0000\u0356w\u0001\u0000\u0000\u0000\u0357\u0360\u0005P\u0000"+
-		"\u0000\u0358\u035d\u0003v;\u0000\u0359\u035a\u0005U\u0000\u0000\u035a"+
-		"\u035c\u0003v;\u0000\u035b\u0359\u0001\u0000\u0000\u0000\u035c\u035f\u0001"+
-		"\u0000\u0000\u0000\u035d\u035b\u0001\u0000\u0000\u0000\u035d\u035e\u0001"+
-		"\u0000\u0000\u0000\u035e\u0361\u0001\u0000\u0000\u0000\u035f\u035d\u0001"+
-		"\u0000\u0000\u0000\u0360\u0358\u0001\u0000\u0000\u0000\u0360\u0361\u0001"+
-		"\u0000\u0000\u0000\u0361\u0363\u0001\u0000\u0000\u0000\u0362\u0364\u0005"+
-		"U\u0000\u0000\u0363\u0362\u0001\u0000\u0000\u0000\u0363\u0364\u0001\u0000"+
-		"\u0000\u0000\u0364\u0365\u0001\u0000\u0000\u0000\u0365\u0366\u0005Q\u0000"+
-		"\u0000\u0366y\u0001\u0000\u0000\u0000\u0367\u0368\u0005{\u0000\u0000\u0368"+
-		"\u0369\u0005\u001c\u0000\u0000\u0369\u036a\u0003\u00a2Q\u0000\u036a\u036b"+
-		"\u0003|>\u0000\u036b{\u0001\u0000\u0000\u0000\u036c\u0370\u0005P\u0000"+
-		"\u0000\u036d\u036f\u0003~?\u0000\u036e\u036d\u0001\u0000\u0000\u0000\u036f"+
-		"\u0372\u0001\u0000\u0000\u0000\u0370\u036e\u0001\u0000\u0000\u0000\u0370"+
-		"\u0371\u0001\u0000\u0000\u0000\u0371\u0373\u0001\u0000\u0000\u0000\u0372"+
-		"\u0370\u0001\u0000\u0000\u0000\u0373\u0374\u0005Q\u0000\u0000\u0374}\u0001"+
-		"\u0000\u0000\u0000\u0375\u0377\u0003\b\u0004\u0000\u0376\u0375\u0001\u0000"+
-		"\u0000\u0000\u0377\u037a\u0001\u0000\u0000\u0000\u0378\u0376\u0001\u0000"+
-		"\u0000\u0000\u0378\u0379\u0001\u0000\u0000\u0000\u0379\u037b\u0001\u0000"+
-		"\u0000\u0000\u037a\u0378\u0001\u0000\u0000\u0000\u037b\u037e\u0003\u0080"+
-		"@\u0000\u037c\u037e\u0005T\u0000\u0000\u037d\u0378\u0001\u0000\u0000\u0000"+
-		"\u037d\u037c\u0001\u0000\u0000\u0000\u037e\u007f\u0001\u0000\u0000\u0000"+
-		"\u037f\u0380\u0003\u00f0x\u0000\u0380\u0381\u0003\u0082A\u0000\u0381\u0382"+
-		"\u0005T\u0000\u0000\u0382\u0398\u0001\u0000\u0000\u0000\u0383\u0385\u0003"+
-		"\u000e\u0007\u0000\u0384\u0386\u0005T\u0000\u0000\u0385\u0384\u0001\u0000"+
-		"\u0000\u0000\u0385\u0386\u0001\u0000\u0000\u0000\u0386\u0398\u0001\u0000"+
-		"\u0000\u0000\u0387\u0389\u0003\u001e\u000f\u0000\u0388\u038a\u0005T\u0000"+
-		"\u0000\u0389\u0388\u0001\u0000\u0000\u0000\u0389\u038a\u0001\u0000\u0000"+
-		"\u0000\u038a\u0398\u0001\u0000\u0000\u0000\u038b\u038d\u0003\u0016\u000b"+
-		"\u0000\u038c\u038e\u0005T\u0000\u0000\u038d\u038c\u0001\u0000\u0000\u0000"+
-		"\u038d\u038e\u0001\u0000\u0000\u0000\u038e\u0398\u0001\u0000\u0000\u0000"+
-		"\u038f\u0391\u0003z=\u0000\u0390\u0392\u0005T\u0000\u0000\u0391\u0390"+
-		"\u0001\u0000\u0000\u0000\u0391\u0392\u0001\u0000\u0000\u0000\u0392\u0398"+
-		"\u0001\u0000\u0000\u0000\u0393\u0395\u0003\u0092I\u0000\u0394\u0396\u0005"+
-		"T\u0000\u0000\u0395\u0394\u0001\u0000\u0000\u0000\u0395\u0396\u0001\u0000"+
-		"\u0000\u0000\u0396\u0398\u0001\u0000\u0000\u0000\u0397\u037f\u0001\u0000"+
-		"\u0000\u0000\u0397\u0383\u0001\u0000\u0000\u0000\u0397\u0387\u0001\u0000"+
-		"\u0000\u0000\u0397\u038b\u0001\u0000\u0000\u0000\u0397\u038f\u0001\u0000"+
-		"\u0000\u0000\u0397\u0393\u0001\u0000\u0000\u0000\u0398\u0081\u0001\u0000"+
-		"\u0000\u0000\u0399\u039c\u0003\u0084B\u0000\u039a\u039c\u0003\u0086C\u0000"+
-		"\u039b\u0399\u0001\u0000\u0000\u0000\u039b\u039a\u0001\u0000\u0000\u0000"+
-		"\u039c\u0083\u0001\u0000\u0000\u0000\u039d\u039e\u0003\u00a2Q\u0000\u039e"+
-		"\u039f\u0005N\u0000\u0000\u039f\u03a1\u0005O\u0000\u0000\u03a0\u03a2\u0003"+
-		"\u0088D\u0000\u03a1\u03a0\u0001\u0000\u0000\u0000\u03a1\u03a2\u0001\u0000"+
-		"\u0000\u0000\u03a2\u0085\u0001\u0000\u0000\u0000\u03a3\u03a4\u0003H$\u0000"+
-		"\u03a4\u0087\u0001\u0000\u0000\u0000\u03a5\u03a6\u0005\f\u0000\u0000\u03a6"+
-		"\u03a7\u0003v;\u0000\u03a7\u0089\u0001\u0000\u0000\u0000\u03a8\u03aa\u0005"+
-		"4\u0000\u0000\u03a9\u03a8\u0001\u0000\u0000\u0000\u03a9\u03aa\u0001\u0000"+
-		"\u0000\u0000\u03aa\u03ab\u0001\u0000\u0000\u0000\u03ab\u03ac\u00053\u0000"+
-		"\u0000\u03ac\u03ad\u0003f3\u0000\u03ad\u03ae\u0003\u008cF\u0000\u03ae"+
-		"\u008b\u0001\u0000\u0000\u0000\u03af\u03b3\u0005P\u0000\u0000\u03b0\u03b2"+
-		"\u0003\u008eG\u0000\u03b1\u03b0\u0001\u0000\u0000\u0000\u03b2\u03b5\u0001"+
-		"\u0000\u0000\u0000\u03b3\u03b1\u0001\u0000\u0000\u0000\u03b3\u03b4\u0001"+
-		"\u0000\u0000\u0000\u03b4\u03b6\u0001\u0000\u0000\u0000\u03b5\u03b3\u0001"+
-		"\u0000\u0000\u0000\u03b6\u03b7\u0005Q\u0000\u0000\u03b7\u008d\u0001\u0000"+
-		"\u0000\u0000\u03b8\u03bc\u00055\u0000\u0000\u03b9\u03bb\u0003\u0090H\u0000"+
-		"\u03ba\u03b9\u0001\u0000\u0000\u0000\u03bb\u03be\u0001\u0000\u0000\u0000"+
-		"\u03bc\u03ba\u0001\u0000\u0000\u0000\u03bc\u03bd\u0001\u0000\u0000\u0000"+
-		"\u03bd\u03bf\u0001\u0000\u0000\u0000\u03be\u03bc\u0001\u0000\u0000\u0000"+
-		"\u03bf\u03c0\u0003f3\u0000\u03c0\u03c1\u0005T\u0000\u0000\u03c1\u03dd"+
-		"\u0001\u0000\u0000\u0000\u03c2\u03c3\u00056\u0000\u0000\u03c3\u03c6\u0003"+
-		"f3\u0000\u03c4\u03c5\u00058\u0000\u0000\u03c5\u03c7\u0003f3\u0000\u03c6"+
-		"\u03c4\u0001\u0000\u0000\u0000\u03c6\u03c7\u0001\u0000\u0000\u0000\u03c7"+
-		"\u03c8\u0001\u0000\u0000\u0000\u03c8\u03c9\u0005T\u0000\u0000\u03c9\u03dd"+
-		"\u0001\u0000\u0000\u0000\u03ca\u03cb\u00057\u0000\u0000\u03cb\u03ce\u0003"+
-		"f3\u0000\u03cc\u03cd\u00058\u0000\u0000\u03cd\u03cf\u0003f3\u0000\u03ce"+
-		"\u03cc\u0001\u0000\u0000\u0000\u03ce\u03cf\u0001\u0000\u0000\u0000\u03cf"+
-		"\u03d0\u0001\u0000\u0000\u0000\u03d0\u03d1\u0005T\u0000\u0000\u03d1\u03dd"+
-		"\u0001\u0000\u0000\u0000\u03d2\u03d3\u00059\u0000\u0000\u03d3\u03d4\u0003"+
-		"f3\u0000\u03d4\u03d5\u0005T\u0000\u0000\u03d5\u03dd\u0001\u0000\u0000"+
-		"\u0000\u03d6\u03d7\u0005:\u0000\u0000\u03d7\u03d8\u0003f3\u0000\u03d8"+
-		"\u03d9\u0005;\u0000\u0000\u03d9\u03da\u0003f3\u0000\u03da\u03db\u0005"+
-		"T\u0000\u0000\u03db\u03dd\u0001\u0000\u0000\u0000\u03dc\u03b8\u0001\u0000"+
-		"\u0000\u0000\u03dc\u03c2\u0001\u0000\u0000\u0000\u03dc\u03ca\u0001\u0000"+
-		"\u0000\u0000\u03dc\u03d2\u0001\u0000\u0000\u0000\u03dc\u03d6\u0001\u0000"+
-		"\u0000\u0000\u03dd\u008f\u0001\u0000\u0000\u0000\u03de\u03df\u0007\u0003"+
-		"\u0000\u0000\u03df\u0091\u0001\u0000\u0000\u0000\u03e0\u03e1\u0005?\u0000"+
-		"\u0000\u03e1\u03e3\u0003\u00a2Q\u0000\u03e2\u03e4\u0003\u0010\b\u0000"+
-		"\u03e3\u03e2\u0001\u0000\u0000\u0000\u03e3\u03e4\u0001\u0000\u0000\u0000"+
-		"\u03e4\u03e5\u0001\u0000\u0000\u0000\u03e5\u03e8\u0003\u0094J\u0000\u03e6"+
-		"\u03e7\u0005\u0018\u0000\u0000\u03e7\u03e9\u0003\u00eew\u0000\u03e8\u03e6"+
-		"\u0001\u0000\u0000\u0000\u03e8\u03e9\u0001\u0000\u0000\u0000\u03e9\u03ea"+
-		"\u0001\u0000\u0000\u0000\u03ea\u03eb\u0003\u009aM\u0000\u03eb\u0093\u0001"+
-		"\u0000\u0000\u0000\u03ec\u03ee\u0005N\u0000\u0000\u03ed\u03ef\u0003\u0096"+
-		"K\u0000\u03ee\u03ed\u0001\u0000\u0000\u0000\u03ee\u03ef\u0001\u0000\u0000"+
-		"\u0000\u03ef\u03f0\u0001\u0000\u0000\u0000\u03f0\u03f1\u0005O\u0000\u0000"+
-		"\u03f1\u0095\u0001\u0000\u0000\u0000\u03f2\u03f7\u0003\u0098L\u0000\u03f3"+
-		"\u03f4\u0005U\u0000\u0000\u03f4\u03f6\u0003\u0098L\u0000\u03f5\u03f3\u0001"+
-		"\u0000\u0000\u0000\u03f6\u03f9\u0001\u0000\u0000\u0000\u03f7\u03f5\u0001"+
-		"\u0000\u0000\u0000\u03f7\u03f8\u0001\u0000\u0000\u0000\u03f8\u0097\u0001"+
-		"\u0000\u0000\u0000\u03f9\u03f7\u0001\u0000\u0000\u0000\u03fa\u03fb\u0003"+
-		"\u00f0x\u0000\u03fb\u03fc\u0003\u00a2Q\u0000\u03fc\u0099\u0001\u0000\u0000"+
-		"\u0000\u03fd\u0402\u0005P\u0000\u0000\u03fe\u0401\u0003$\u0012\u0000\u03ff"+
-		"\u0401\u00034\u001a\u0000\u0400\u03fe\u0001\u0000\u0000\u0000\u0400\u03ff"+
-		"\u0001\u0000\u0000\u0000\u0401\u0404\u0001\u0000\u0000\u0000\u0402\u0400"+
-		"\u0001\u0000\u0000\u0000\u0402\u0403\u0001\u0000\u0000\u0000\u0403\u0405"+
-		"\u0001\u0000\u0000\u0000\u0404\u0402\u0001\u0000\u0000\u0000\u0405\u0406"+
-		"\u0005Q\u0000\u0000\u0406\u009b\u0001\u0000\u0000\u0000\u0407\u040b\u0005"+
-		"P\u0000\u0000\u0408\u040a\u0003\u009eO\u0000\u0409\u0408\u0001\u0000\u0000"+
-		"\u0000\u040a\u040d\u0001\u0000\u0000\u0000\u040b\u0409\u0001\u0000\u0000"+
-		"\u0000\u040b\u040c\u0001\u0000\u0000\u0000\u040c\u040e\u0001\u0000\u0000"+
-		"\u0000\u040d\u040b\u0001\u0000\u0000\u0000\u040e\u040f\u0005Q\u0000\u0000"+
-		"\u040f\u009d\u0001\u0000\u0000\u0000\u0410\u0411\u0003\u00a0P\u0000\u0411"+
-		"\u0412\u0005T\u0000\u0000\u0412\u0416\u0001\u0000\u0000\u0000\u0413\u0416"+
-		"\u0003\u00a6S\u0000\u0414\u0416\u0003\u00a8T\u0000\u0415\u0410\u0001\u0000"+
-		"\u0000\u0000\u0415\u0413\u0001\u0000\u0000\u0000\u0415\u0414\u0001\u0000"+
-		"\u0000\u0000\u0416\u009f\u0001\u0000\u0000\u0000\u0417\u0419\u0003\f\u0006"+
-		"\u0000\u0418\u0417\u0001\u0000\u0000\u0000\u0419\u041c\u0001\u0000\u0000"+
-		"\u0000\u041a\u0418\u0001\u0000\u0000\u0000\u041a\u041b\u0001\u0000\u0000"+
-		"\u0000\u041b\u0425\u0001\u0000\u0000\u0000\u041c\u041a\u0001\u0000\u0000"+
-		"\u0000\u041d\u041e\u0005=\u0000\u0000\u041e\u041f\u0003\u00a2Q\u0000\u041f"+
-		"\u0420\u0005W\u0000\u0000\u0420\u0421\u0003\u00c6c\u0000\u0421\u0426\u0001"+
-		"\u0000\u0000\u0000\u0422\u0423\u0003\u00f0x\u0000\u0423\u0424\u0003H$"+
-		"\u0000\u0424\u0426\u0001\u0000\u0000\u0000\u0425\u041d\u0001\u0000\u0000"+
-		"\u0000\u0425\u0422\u0001\u0000\u0000\u0000\u0426\u00a1\u0001\u0000\u0000"+
-		"\u0000\u0427\u0428\u0007\u0004\u0000\u0000\u0428\u00a3\u0001\u0000\u0000"+
-		"\u0000\u0429\u042a\u0007\u0005\u0000\u0000\u042a\u00a5\u0001\u0000\u0000"+
-		"\u0000\u042b\u042d\u0003\n\u0005\u0000\u042c\u042b\u0001\u0000\u0000\u0000"+
-		"\u042d\u0430\u0001\u0000\u0000\u0000\u042e\u042c\u0001\u0000\u0000\u0000"+
-		"\u042e\u042f\u0001\u0000\u0000\u0000\u042f\u0434\u0001\u0000\u0000\u0000"+
-		"\u0430\u042e\u0001\u0000\u0000\u0000\u0431\u0435\u0003\u000e\u0007\u0000"+
-		"\u0432\u0435\u0003\u001e\u000f\u0000\u0433\u0435\u0003\u0092I\u0000\u0434"+
-		"\u0431\u0001\u0000\u0000\u0000\u0434\u0432\u0001\u0000\u0000\u0000\u0434"+
-		"\u0433\u0001\u0000\u0000\u0000\u0435\u00a7\u0001\u0000\u0000\u0000\u0436"+
-		"\u04a8\u0003\u009cN\u0000\u0437\u0438\u0005\u0002\u0000\u0000\u0438\u043b"+
-		"\u0003\u00c6c\u0000\u0439\u043a\u0005]\u0000\u0000\u043a\u043c\u0003\u00c6"+
-		"c\u0000\u043b\u0439\u0001\u0000\u0000\u0000\u043b\u043c\u0001\u0000\u0000"+
-		"\u0000\u043c\u043d\u0001\u0000\u0000\u0000\u043d\u043e\u0005T\u0000\u0000"+
-		"\u043e\u04a8\u0001\u0000\u0000\u0000\u043f\u0440\u0005\u0016\u0000\u0000"+
-		"\u0440\u0441\u0003\u00c0`\u0000\u0441\u0444\u0003\u00a8T\u0000\u0442\u0443"+
-		"\u0005\u000f\u0000\u0000\u0443\u0445\u0003\u00a8T\u0000\u0444\u0442\u0001"+
-		"\u0000\u0000\u0000\u0444\u0445\u0001\u0000\u0000\u0000\u0445\u04a8\u0001"+
-		"\u0000\u0000\u0000\u0446\u0447\u0005\u0015\u0000\u0000\u0447\u0448\u0005"+
-		"N\u0000\u0000\u0448\u0449\u0003\u00ba]\u0000\u0449\u044a\u0005O\u0000"+
-		"\u0000\u044a\u044b\u0003\u00a8T\u0000\u044b\u04a8\u0001\u0000\u0000\u0000"+
-		"\u044c\u044d\u00052\u0000\u0000\u044d\u044e\u0003\u00c0`\u0000\u044e\u044f"+
-		"\u0003\u00a8T\u0000\u044f\u04a8\u0001\u0000\u0000\u0000\u0450\u0451\u0005"+
-		"\r\u0000\u0000\u0451\u0452\u0003\u00a8T\u0000\u0452\u0453\u00052\u0000"+
-		"\u0000\u0453\u0454\u0003\u00c0`\u0000\u0454\u0455\u0005T\u0000\u0000\u0455"+
-		"\u04a8\u0001\u0000\u0000\u0000\u0456\u0457\u0005/\u0000\u0000\u0457\u0461"+
-		"\u0003\u009cN\u0000\u0458\u045a\u0003\u00aaU\u0000\u0459\u0458\u0001\u0000"+
-		"\u0000\u0000\u045a\u045b\u0001\u0000\u0000\u0000\u045b\u0459\u0001\u0000"+
-		"\u0000\u0000\u045b\u045c\u0001\u0000\u0000\u0000\u045c\u045e\u0001\u0000"+
-		"\u0000\u0000\u045d\u045f\u0003\u00aeW\u0000\u045e\u045d\u0001\u0000\u0000"+
-		"\u0000\u045e\u045f\u0001\u0000\u0000\u0000\u045f\u0462\u0001\u0000\u0000"+
-		"\u0000\u0460\u0462\u0003\u00aeW\u0000\u0461\u0459\u0001\u0000\u0000\u0000"+
-		"\u0461\u0460\u0001\u0000\u0000\u0000\u0462\u04a8\u0001\u0000\u0000\u0000"+
-		"\u0463\u0464\u0005/\u0000\u0000\u0464\u0465\u0003\u00b0X\u0000\u0465\u0469"+
-		"\u0003\u009cN\u0000\u0466\u0468\u0003\u00aaU\u0000\u0467\u0466\u0001\u0000"+
-		"\u0000\u0000\u0468\u046b\u0001\u0000\u0000\u0000\u0469\u0467\u0001\u0000"+
-		"\u0000\u0000\u0469\u046a\u0001\u0000\u0000\u0000\u046a\u046d\u0001\u0000"+
-		"\u0000\u0000\u046b\u0469\u0001\u0000\u0000\u0000\u046c\u046e\u0003\u00ae"+
-		"W\u0000\u046d\u046c\u0001\u0000\u0000\u0000\u046d\u046e\u0001\u0000\u0000"+
-		"\u0000\u046e\u04a8\u0001\u0000\u0000\u0000\u046f\u0470\u0005)\u0000\u0000"+
-		"\u0470\u0471\u0003\u00c0`\u0000\u0471\u0475\u0005P\u0000\u0000\u0472\u0474"+
-		"\u0003\u00b6[\u0000\u0473\u0472\u0001\u0000\u0000\u0000\u0474\u0477\u0001"+
-		"\u0000\u0000\u0000\u0475\u0473\u0001\u0000\u0000\u0000\u0475\u0476\u0001"+
-		"\u0000\u0000\u0000\u0476\u047b\u0001\u0000\u0000\u0000\u0477\u0475\u0001"+
-		"\u0000\u0000\u0000\u0478\u047a\u0003\u00b8\\\u0000\u0479\u0478\u0001\u0000"+
-		"\u0000\u0000\u047a\u047d\u0001\u0000\u0000\u0000\u047b\u0479\u0001\u0000"+
-		"\u0000\u0000\u047b\u047c\u0001\u0000\u0000\u0000\u047c\u047e\u0001\u0000"+
-		"\u0000\u0000\u047d\u047b\u0001\u0000\u0000\u0000\u047e\u047f\u0005Q\u0000"+
-		"\u0000\u047f\u04a8\u0001\u0000\u0000\u0000\u0480\u0481\u0005*\u0000\u0000"+
-		"\u0481\u0482\u0003\u00c0`\u0000\u0482\u0483\u0003\u009cN\u0000\u0483\u04a8"+
-		"\u0001\u0000\u0000\u0000\u0484\u0486\u0005$\u0000\u0000\u0485\u0487\u0003"+
-		"\u00c6c\u0000\u0486\u0485\u0001\u0000\u0000\u0000\u0486\u0487\u0001\u0000"+
-		"\u0000\u0000\u0487\u0488\u0001\u0000\u0000\u0000\u0488\u04a8\u0005T\u0000"+
-		"\u0000\u0489\u048a\u0005,\u0000\u0000\u048a\u048b\u0003\u00c6c\u0000\u048b"+
-		"\u048c\u0005T\u0000\u0000\u048c\u04a8\u0001\u0000\u0000\u0000\u048d\u048f"+
-		"\u0005\u0004\u0000\u0000\u048e\u0490\u0003\u00a2Q\u0000\u048f\u048e\u0001"+
-		"\u0000\u0000\u0000\u048f\u0490\u0001\u0000\u0000\u0000\u0490\u0491\u0001"+
-		"\u0000\u0000\u0000\u0491\u04a8\u0005T\u0000\u0000\u0492\u0494\u0005\u000b"+
-		"\u0000\u0000\u0493\u0495\u0003\u00a2Q\u0000\u0494\u0493\u0001\u0000\u0000"+
-		"\u0000\u0494\u0495\u0001\u0000\u0000\u0000\u0495\u0496\u0001\u0000\u0000"+
-		"\u0000\u0496\u04a8\u0005T\u0000\u0000\u0497\u0498\u0005>\u0000\u0000\u0498"+
-		"\u0499\u0003\u00c6c\u0000\u0499\u049a\u0005T\u0000\u0000\u049a\u04a8\u0001"+
-		"\u0000\u0000\u0000\u049b\u04a8\u0005T\u0000\u0000\u049c\u049d\u0003\u00c6"+
-		"c\u0000\u049d\u049e\u0005T\u0000\u0000\u049e\u04a8\u0001\u0000\u0000\u0000"+
-		"\u049f\u04a1\u0003\u00d2i\u0000\u04a0\u04a2\u0005T\u0000\u0000\u04a1\u04a0"+
-		"\u0001\u0000\u0000\u0000\u04a1\u04a2\u0001\u0000\u0000\u0000\u04a2\u04a8"+
-		"\u0001\u0000\u0000\u0000\u04a3\u04a4\u0003\u00a2Q\u0000\u04a4\u04a5\u0005"+
-		"]\u0000\u0000\u04a5\u04a6\u0003\u00a8T\u0000\u04a6\u04a8\u0001\u0000\u0000"+
-		"\u0000\u04a7\u0436\u0001\u0000\u0000\u0000\u04a7\u0437\u0001\u0000\u0000"+
-		"\u0000\u04a7\u043f\u0001\u0000\u0000\u0000\u04a7\u0446\u0001\u0000\u0000"+
-		"\u0000\u04a7\u044c\u0001\u0000\u0000\u0000\u04a7\u0450\u0001\u0000\u0000"+
-		"\u0000\u04a7\u0456\u0001\u0000\u0000\u0000\u04a7\u0463\u0001\u0000\u0000"+
-		"\u0000\u04a7\u046f\u0001\u0000\u0000\u0000\u04a7\u0480\u0001\u0000\u0000"+
-		"\u0000\u04a7\u0484\u0001\u0000\u0000\u0000\u04a7\u0489\u0001\u0000\u0000"+
-		"\u0000\u04a7\u048d\u0001\u0000\u0000\u0000\u04a7\u0492\u0001\u0000\u0000"+
-		"\u0000\u04a7\u0497\u0001\u0000\u0000\u0000\u04a7\u049b\u0001\u0000\u0000"+
-		"\u0000\u04a7\u049c\u0001\u0000\u0000\u0000\u04a7\u049f\u0001\u0000\u0000"+
-		"\u0000\u04a7\u04a3\u0001\u0000\u0000\u0000\u04a8\u00a9\u0001\u0000\u0000"+
-		"\u0000\u04a9\u04aa\u0005\u0007\u0000\u0000\u04aa\u04ae\u0005N\u0000\u0000"+
-		"\u04ab\u04ad\u0003\f\u0006\u0000\u04ac\u04ab\u0001\u0000\u0000\u0000\u04ad"+
-		"\u04b0\u0001\u0000\u0000\u0000\u04ae\u04ac\u0001\u0000\u0000\u0000\u04ae"+
-		"\u04af\u0001\u0000\u0000\u0000\u04af\u04b1\u0001\u0000\u0000\u0000\u04b0"+
-		"\u04ae\u0001\u0000\u0000\u0000\u04b1\u04b2\u0003\u00acV\u0000\u04b2\u04b3"+
-		"\u0003\u00a2Q\u0000\u04b3\u04b4\u0005O\u0000\u0000\u04b4\u04b5\u0003\u009c"+
-		"N\u0000\u04b5\u00ab\u0001\u0000\u0000\u0000\u04b6\u04bb\u0003f3\u0000"+
-		"\u04b7\u04b8\u0005k\u0000\u0000\u04b8\u04ba\u0003f3\u0000\u04b9\u04b7"+
-		"\u0001\u0000\u0000\u0000\u04ba\u04bd\u0001\u0000\u0000\u0000\u04bb\u04b9"+
-		"\u0001\u0000\u0000\u0000\u04bb\u04bc\u0001\u0000\u0000\u0000\u04bc\u00ad"+
-		"\u0001\u0000\u0000\u0000\u04bd\u04bb\u0001\u0000\u0000\u0000\u04be\u04bf"+
-		"\u0005\u0013\u0000\u0000\u04bf\u04c0\u0003\u009cN\u0000\u04c0\u00af\u0001"+
-		"\u0000\u0000\u0000\u04c1\u04c2\u0005N\u0000\u0000\u04c2\u04c4\u0003\u00b2"+
-		"Y\u0000\u04c3\u04c5\u0005T\u0000\u0000\u04c4\u04c3\u0001\u0000\u0000\u0000"+
-		"\u04c4\u04c5\u0001\u0000\u0000\u0000\u04c5\u04c6\u0001\u0000\u0000\u0000"+
-		"\u04c6\u04c7\u0005O\u0000\u0000\u04c7\u00b1\u0001\u0000\u0000\u0000\u04c8"+
-		"\u04cd\u0003\u00b4Z\u0000\u04c9\u04ca\u0005T\u0000\u0000\u04ca\u04cc\u0003"+
-		"\u00b4Z\u0000\u04cb\u04c9\u0001\u0000\u0000\u0000\u04cc\u04cf\u0001\u0000"+
-		"\u0000\u0000\u04cd\u04cb\u0001\u0000\u0000\u0000\u04cd\u04ce\u0001\u0000"+
-		"\u0000\u0000\u04ce\u00b3\u0001\u0000\u0000\u0000\u04cf\u04cd\u0001\u0000"+
-		"\u0000\u0000\u04d0\u04d2\u0003\f\u0006\u0000\u04d1\u04d0\u0001\u0000\u0000"+
-		"\u0000\u04d2\u04d5\u0001\u0000\u0000\u0000\u04d3\u04d1\u0001\u0000\u0000"+
-		"\u0000\u04d3\u04d4\u0001\u0000\u0000\u0000\u04d4\u04db\u0001\u0000\u0000"+
-		"\u0000\u04d5\u04d3\u0001\u0000\u0000\u0000\u04d6\u04d7\u0003R)\u0000\u04d7"+
-		"\u04d8\u0003L&\u0000\u04d8\u04dc\u0001\u0000\u0000\u0000\u04d9\u04da\u0005"+
-		"=\u0000\u0000\u04da\u04dc\u0003\u00a2Q\u0000\u04db\u04d6\u0001\u0000\u0000"+
-		"\u0000\u04db\u04d9\u0001\u0000\u0000\u0000\u04dc\u04dd\u0001\u0000\u0000"+
-		"\u0000\u04dd\u04de\u0005W\u0000\u0000\u04de\u04df\u0003\u00c6c\u0000\u04df"+
-		"\u04e2\u0001\u0000\u0000\u0000\u04e0\u04e2\u0003f3\u0000\u04e1\u04d3\u0001"+
-		"\u0000\u0000\u0000\u04e1\u04e0\u0001\u0000\u0000\u0000\u04e2\u00b5\u0001"+
-		"\u0000\u0000\u0000\u04e3\u04e5\u0003\u00b8\\\u0000\u04e4\u04e3\u0001\u0000"+
-		"\u0000\u0000\u04e5\u04e6\u0001\u0000\u0000\u0000\u04e6\u04e4\u0001\u0000"+
-		"\u0000\u0000\u04e6\u04e7\u0001\u0000\u0000\u0000\u04e7\u04e9\u0001\u0000"+
-		"\u0000\u0000\u04e8\u04ea\u0003\u009eO\u0000\u04e9\u04e8\u0001\u0000\u0000"+
-		"\u0000\u04ea\u04eb\u0001\u0000\u0000\u0000\u04eb\u04e9\u0001\u0000\u0000"+
-		"\u0000\u04eb\u04ec\u0001\u0000\u0000\u0000\u04ec\u00b7\u0001\u0000\u0000"+
-		"\u0000\u04ed\u04f3\u0005\u0006\u0000\u0000\u04ee\u04f4\u0003\u00c6c\u0000"+
-		"\u04ef\u04f4\u0005\u0080\u0000\u0000\u04f0\u04f1\u0003\u00f0x\u0000\u04f1"+
-		"\u04f2\u0003\u00a2Q\u0000\u04f2\u04f4\u0001\u0000\u0000\u0000\u04f3\u04ee"+
-		"\u0001\u0000\u0000\u0000\u04f3\u04ef\u0001\u0000\u0000\u0000\u04f3\u04f0"+
-		"\u0001\u0000\u0000\u0000\u04f4\u04f5\u0001\u0000\u0000\u0000\u04f5\u04f9"+
-		"\u0005]\u0000\u0000\u04f6\u04f7\u0005\f\u0000\u0000\u04f7\u04f9\u0005"+
-		"]\u0000\u0000\u04f8\u04ed\u0001\u0000\u0000\u0000\u04f8\u04f6\u0001\u0000"+
-		"\u0000\u0000\u04f9\u00b9\u0001\u0000\u0000\u0000\u04fa\u0507\u0003\u00be"+
-		"_\u0000\u04fb\u04fd\u0003\u00bc^\u0000\u04fc\u04fb\u0001\u0000\u0000\u0000"+
-		"\u04fc\u04fd\u0001\u0000\u0000\u0000\u04fd\u04fe\u0001\u0000\u0000\u0000"+
-		"\u04fe\u0500\u0005T\u0000\u0000\u04ff\u0501\u0003\u00c6c\u0000\u0500\u04ff"+
-		"\u0001\u0000\u0000\u0000\u0500\u0501\u0001\u0000\u0000\u0000\u0501\u0502"+
-		"\u0001\u0000\u0000\u0000\u0502\u0504\u0005T\u0000\u0000\u0503\u0505\u0003"+
-		"\u00c2a\u0000\u0504\u0503\u0001\u0000\u0000\u0000\u0504\u0505\u0001\u0000"+
-		"\u0000\u0000\u0505\u0507\u0001\u0000\u0000\u0000\u0506\u04fa\u0001\u0000"+
-		"\u0000\u0000\u0506\u04fc\u0001\u0000\u0000\u0000\u0507\u00bb\u0001\u0000"+
-		"\u0000\u0000\u0508\u050b\u0003\u00a0P\u0000\u0509\u050b\u0003\u00c2a\u0000"+
-		"\u050a\u0508\u0001\u0000\u0000\u0000\u050a\u0509\u0001\u0000\u0000\u0000"+
-		"\u050b\u00bd\u0001\u0000\u0000\u0000\u050c\u050e\u0003\f\u0006\u0000\u050d"+
-		"\u050c\u0001\u0000\u0000\u0000\u050e\u0511\u0001\u0000\u0000\u0000\u050f"+
-		"\u050d\u0001\u0000\u0000\u0000\u050f\u0510\u0001\u0000\u0000\u0000\u0510"+
-		"\u0514\u0001\u0000\u0000\u0000\u0511\u050f\u0001\u0000\u0000\u0000\u0512"+
-		"\u0515\u0003\u00f0x\u0000\u0513\u0515\u0005=\u0000\u0000\u0514\u0512\u0001"+
-		"\u0000\u0000\u0000\u0514\u0513\u0001\u0000\u0000\u0000\u0515\u0516\u0001"+
-		"\u0000\u0000\u0000\u0516\u0517\u0003L&\u0000\u0517\u0518\u0005]\u0000"+
-		"\u0000\u0518\u0519\u0003\u00c6c\u0000\u0519\u00bf\u0001\u0000\u0000\u0000"+
-		"\u051a\u051b\u0005N\u0000\u0000\u051b\u051c\u0003\u00c6c\u0000\u051c\u051d"+
-		"\u0005O\u0000\u0000\u051d\u00c1\u0001\u0000\u0000\u0000\u051e\u0523\u0003"+
-		"\u00c6c\u0000\u051f\u0520\u0005U\u0000\u0000\u0520\u0522\u0003\u00c6c"+
-		"\u0000\u0521\u051f\u0001\u0000\u0000\u0000\u0522\u0525\u0001\u0000\u0000"+
-		"\u0000\u0523\u0521\u0001\u0000\u0000\u0000\u0523\u0524\u0001\u0000\u0000"+
-		"\u0000\u0524\u00c3\u0001\u0000\u0000\u0000\u0525\u0523\u0001\u0000\u0000"+
-		"\u0000\u0526\u052a\u0003\u00a2Q\u0000\u0527\u052a\u0005+\u0000\u0000\u0528"+
-		"\u052a\u0005(\u0000\u0000\u0529\u0526\u0001\u0000\u0000\u0000\u0529\u0527"+
-		"\u0001\u0000\u0000\u0000\u0529\u0528\u0001\u0000\u0000\u0000\u052a\u052b"+
-		"\u0001\u0000\u0000\u0000\u052b\u052c\u0003\u00fa}\u0000\u052c\u00c5\u0001"+
-		"\u0000\u0000\u0000\u052d\u052e\u0006c\uffff\uffff\u0000\u052e\u0559\u0003"+
-		"\u00d0h\u0000\u052f\u0559\u0003\u00c4b\u0000\u0530\u0531\u0003\u00f0x"+
-		"\u0000\u0531\u0537\u0005z\u0000\u0000\u0532\u0534\u0003\u00f4z\u0000\u0533"+
-		"\u0532\u0001\u0000\u0000\u0000\u0533\u0534\u0001\u0000\u0000\u0000\u0534"+
-		"\u0535\u0001\u0000\u0000\u0000\u0535\u0538\u0003\u00a2Q\u0000\u0536\u0538"+
-		"\u0005\u001f\u0000\u0000\u0537\u0533\u0001\u0000\u0000\u0000\u0537\u0536"+
-		"\u0001\u0000\u0000\u0000\u0538\u0559\u0001\u0000\u0000\u0000\u0539\u053a"+
-		"\u0003\u00dam\u0000\u053a\u053c\u0005z\u0000\u0000\u053b\u053d\u0003\u00f4"+
-		"z\u0000\u053c\u053b\u0001\u0000\u0000\u0000\u053c\u053d\u0001\u0000\u0000"+
-		"\u0000\u053d\u053e\u0001\u0000\u0000\u0000\u053e\u053f\u0005\u001f\u0000"+
-		"\u0000\u053f\u0559\u0001\u0000\u0000\u0000\u0540\u0559\u0003\u00d2i\u0000"+
-		"\u0541\u0542\u0007\u0006\u0000\u0000\u0542\u0559\u0003\u00c6c\u0011\u0543"+
-		"\u0547\u0005N\u0000\u0000\u0544\u0546\u0003p8\u0000\u0545\u0544\u0001"+
-		"\u0000\u0000\u0000\u0546\u0549\u0001\u0000\u0000\u0000\u0547\u0545\u0001"+
-		"\u0000\u0000\u0000\u0547\u0548\u0001\u0000\u0000\u0000\u0548\u054a\u0001"+
-		"\u0000\u0000\u0000\u0549\u0547\u0001\u0000\u0000\u0000\u054a\u054f\u0003"+
-		"\u00f0x\u0000\u054b\u054c\u0005j\u0000\u0000\u054c\u054e\u0003\u00f0x"+
-		"\u0000\u054d\u054b\u0001\u0000\u0000\u0000\u054e\u0551\u0001\u0000\u0000"+
-		"\u0000\u054f\u054d\u0001\u0000\u0000\u0000\u054f\u0550\u0001\u0000\u0000"+
-		"\u0000\u0550\u0552\u0001\u0000\u0000\u0000\u0551\u054f\u0001\u0000\u0000"+
-		"\u0000\u0552\u0553\u0005O\u0000\u0000\u0553\u0554\u0003\u00c6c\u0010\u0554"+
-		"\u0559\u0001\u0000\u0000\u0000\u0555\u0556\u0005\u001f\u0000\u0000\u0556"+
-		"\u0559\u0003\u00dcn\u0000\u0557\u0559\u0003\u00cae\u0000\u0558\u052d\u0001"+
-		"\u0000\u0000\u0000\u0558\u052f\u0001\u0000\u0000\u0000\u0558\u0530\u0001"+
-		"\u0000\u0000\u0000\u0558\u0539\u0001\u0000\u0000\u0000\u0558\u0540\u0001"+
-		"\u0000\u0000\u0000\u0558\u0541\u0001\u0000\u0000\u0000\u0558\u0543\u0001"+
-		"\u0000\u0000\u0000\u0558\u0555\u0001\u0000\u0000\u0000\u0558\u0557\u0001"+
-		"\u0000\u0000\u0000\u0559\u05ad\u0001\u0000\u0000\u0000\u055a\u055b\n\u000e"+
-		"\u0000\u0000\u055b\u055c\u0007\u0007\u0000\u0000\u055c\u05ac\u0003\u00c6"+
-		"c\u000f\u055d\u055e\n\r\u0000\u0000\u055e\u055f\u0007\b\u0000\u0000\u055f"+
-		"\u05ac\u0003\u00c6c\u000e\u0560\u0568\n\f\u0000\u0000\u0561\u0562\u0005"+
-		"Y\u0000\u0000\u0562\u0569\u0005Y\u0000\u0000\u0563\u0564\u0005X\u0000"+
-		"\u0000\u0564\u0565\u0005X\u0000\u0000\u0565\u0569\u0005X\u0000\u0000\u0566"+
-		"\u0567\u0005X\u0000\u0000\u0567\u0569\u0005X\u0000\u0000\u0568\u0561\u0001"+
-		"\u0000\u0000\u0000\u0568\u0563\u0001\u0000\u0000\u0000\u0568\u0566\u0001"+
-		"\u0000\u0000\u0000\u0569\u056a\u0001\u0000\u0000\u0000\u056a\u05ac\u0003"+
-		"\u00c6c\r\u056b\u056c\n\u000b\u0000\u0000\u056c\u056d\u0007\t\u0000\u0000"+
-		"\u056d\u05ac\u0003\u00c6c\f\u056e\u056f\n\t\u0000\u0000\u056f\u0570\u0007"+
-		"\n\u0000\u0000\u0570\u05ac\u0003\u00c6c\n\u0571\u0572\n\b\u0000\u0000"+
-		"\u0572\u0573\u0005j\u0000\u0000\u0573\u05ac\u0003\u00c6c\t\u0574\u0575"+
-		"\n\u0007\u0000\u0000\u0575\u0576\u0005l\u0000\u0000\u0576\u05ac\u0003"+
-		"\u00c6c\b\u0577\u0578\n\u0006\u0000\u0000\u0578\u0579\u0005k\u0000\u0000"+
-		"\u0579\u05ac\u0003\u00c6c\u0007\u057a\u057b\n\u0005\u0000\u0000\u057b"+
-		"\u057c\u0005b\u0000\u0000\u057c\u05ac\u0003\u00c6c\u0006\u057d\u057e\n"+
-		"\u0004\u0000\u0000\u057e\u057f\u0005c\u0000\u0000\u057f\u05ac\u0003\u00c6"+
-		"c\u0005\u0580\u0581\n\u0003\u0000\u0000\u0581\u0582\u0005\\\u0000\u0000"+
-		"\u0582\u0583\u0003\u00c6c\u0000\u0583\u0584\u0005]\u0000\u0000\u0584\u0585"+
-		"\u0003\u00c6c\u0003\u0585\u05ac\u0001\u0000\u0000\u0000\u0586\u0587\n"+
-		"\u0002\u0000\u0000\u0587\u0588\u0007\u000b\u0000\u0000\u0588\u05ac\u0003"+
-		"\u00c6c\u0002\u0589\u058a\n\u0019\u0000\u0000\u058a\u058b\u0005R\u0000"+
-		"\u0000\u058b\u058c\u0003\u00c6c\u0000\u058c\u058d\u0005S\u0000\u0000\u058d"+
-		"\u05ac\u0001\u0000\u0000\u0000\u058e\u058f\n\u0018\u0000\u0000\u058f\u059b"+
-		"\u0005V\u0000\u0000\u0590\u059c\u0003\u00a2Q\u0000\u0591\u059c\u0003\u00c4"+
-		"b\u0000\u0592\u059c\u0005+\u0000\u0000\u0593\u0595\u0005\u001f\u0000\u0000"+
-		"\u0594\u0596\u0003\u00ecv\u0000\u0595\u0594\u0001\u0000\u0000\u0000\u0595"+
-		"\u0596\u0001\u0000\u0000\u0000\u0596\u0597\u0001\u0000\u0000\u0000\u0597"+
-		"\u059c\u0003\u00e0p\u0000\u0598\u0599\u0005(\u0000\u0000\u0599\u059c\u0003"+
-		"\u00f6{\u0000\u059a\u059c\u0003\u00e6s\u0000\u059b\u0590\u0001\u0000\u0000"+
-		"\u0000\u059b\u0591\u0001\u0000\u0000\u0000\u059b\u0592\u0001\u0000\u0000"+
-		"\u0000\u059b\u0593\u0001\u0000\u0000\u0000\u059b\u0598\u0001\u0000\u0000"+
-		"\u0000\u059b\u059a\u0001\u0000\u0000\u0000\u059c\u05ac\u0001\u0000\u0000"+
-		"\u0000\u059d\u059e\n\u0016\u0000\u0000\u059e\u05a0\u0005z\u0000\u0000"+
-		"\u059f\u05a1\u0003\u00f4z\u0000\u05a0\u059f\u0001\u0000\u0000\u0000\u05a0"+
-		"\u05a1\u0001\u0000\u0000\u0000\u05a1\u05a2\u0001\u0000\u0000\u0000\u05a2"+
-		"\u05ac\u0003\u00a2Q\u0000\u05a3\u05a4\n\u0012\u0000\u0000\u05a4\u05ac"+
-		"\u0007\f\u0000\u0000\u05a5\u05a6\n\n\u0000\u0000\u05a6\u05a9\u0005\u001a"+
-		"\u0000\u0000\u05a7\u05aa\u0003\u00f0x\u0000\u05a8\u05aa\u0003\u00c8d\u0000"+
-		"\u05a9\u05a7\u0001\u0000\u0000\u0000\u05a9\u05a8\u0001\u0000\u0000\u0000"+
-		"\u05aa\u05ac\u0001\u0000\u0000\u0000\u05ab\u055a\u0001\u0000\u0000\u0000"+
-		"\u05ab\u055d\u0001\u0000\u0000\u0000\u05ab\u0560\u0001\u0000\u0000\u0000"+
-		"\u05ab\u056b\u0001\u0000\u0000\u0000\u05ab\u056e\u0001\u0000\u0000\u0000"+
-		"\u05ab\u0571\u0001\u0000\u0000\u0000\u05ab\u0574\u0001\u0000\u0000\u0000"+
-		"\u05ab\u0577\u0001\u0000\u0000\u0000\u05ab\u057a\u0001\u0000\u0000\u0000"+
-		"\u05ab\u057d\u0001\u0000\u0000\u0000\u05ab\u0580\u0001\u0000\u0000\u0000"+
-		"\u05ab\u0586\u0001\u0000\u0000\u0000\u05ab\u0589\u0001\u0000\u0000\u0000"+
-		"\u05ab\u058e\u0001\u0000\u0000\u0000\u05ab\u059d\u0001\u0000\u0000\u0000"+
-		"\u05ab\u05a3\u0001\u0000\u0000\u0000\u05ab\u05a5\u0001\u0000\u0000\u0000"+
-		"\u05ac\u05af\u0001\u0000\u0000\u0000\u05ad\u05ab\u0001\u0000\u0000\u0000"+
-		"\u05ad\u05ae\u0001\u0000\u0000\u0000\u05ae\u00c7\u0001\u0000\u0000\u0000"+
-		"\u05af\u05ad\u0001\u0000\u0000\u0000\u05b0\u05b2\u0003\f\u0006\u0000\u05b1"+
-		"\u05b0\u0001\u0000\u0000\u0000\u05b2\u05b5\u0001\u0000\u0000\u0000\u05b3"+
-		"\u05b1\u0001\u0000\u0000\u0000\u05b3\u05b4\u0001\u0000\u0000\u0000\u05b4"+
-		"\u05b6\u0001\u0000\u0000\u0000\u05b5\u05b3\u0001\u0000\u0000\u0000\u05b6"+
-		"\u05ba\u0003\u00f0x\u0000\u05b7\u05b9\u0003p8\u0000\u05b8\u05b7\u0001"+
-		"\u0000\u0000\u0000\u05b9\u05bc\u0001\u0000\u0000\u0000\u05ba\u05b8\u0001"+
-		"\u0000\u0000\u0000\u05ba\u05bb\u0001\u0000\u0000\u0000\u05bb\u05bd\u0001"+
-		"\u0000\u0000\u0000\u05bc\u05ba\u0001\u0000\u0000\u0000\u05bd\u05be\u0003"+
-		"\u00a2Q\u0000\u05be\u00c9\u0001\u0000\u0000\u0000\u05bf\u05c0\u0003\u00cc"+
-		"f\u0000\u05c0\u05c1\u0005y\u0000\u0000\u05c1\u05c2\u0003\u00ceg\u0000"+
-		"\u05c2\u00cb\u0001\u0000\u0000\u0000\u05c3\u05da\u0003\u00a2Q\u0000\u05c4"+
-		"\u05c6\u0005N\u0000\u0000\u05c5\u05c7\u0003\\.\u0000\u05c6\u05c5\u0001"+
-		"\u0000\u0000\u0000\u05c6\u05c7\u0001\u0000\u0000\u0000\u05c7\u05c8\u0001"+
-		"\u0000\u0000\u0000\u05c8\u05da\u0005O\u0000\u0000\u05c9\u05ca\u0005N\u0000"+
-		"\u0000\u05ca\u05cf\u0003\u00a2Q\u0000\u05cb\u05cc\u0005U\u0000\u0000\u05cc"+
-		"\u05ce\u0003\u00a2Q\u0000\u05cd\u05cb\u0001\u0000\u0000\u0000\u05ce\u05d1"+
-		"\u0001\u0000\u0000\u0000\u05cf\u05cd\u0001\u0000\u0000\u0000\u05cf\u05d0"+
-		"\u0001\u0000\u0000\u0000\u05d0\u05d2\u0001\u0000\u0000\u0000\u05d1\u05cf"+
-		"\u0001\u0000\u0000\u0000\u05d2\u05d3\u0005O\u0000\u0000\u05d3\u05da\u0001"+
-		"\u0000\u0000\u0000\u05d4\u05d6\u0005N\u0000\u0000\u05d5\u05d7\u0003b1"+
-		"\u0000\u05d6\u05d5\u0001\u0000\u0000\u0000\u05d6\u05d7\u0001\u0000\u0000"+
-		"\u0000\u05d7\u05d8\u0001\u0000\u0000\u0000\u05d8\u05da\u0005O\u0000\u0000"+
-		"\u05d9\u05c3\u0001\u0000\u0000\u0000\u05d9\u05c4\u0001\u0000\u0000\u0000"+
-		"\u05d9\u05c9\u0001\u0000\u0000\u0000\u05d9\u05d4\u0001\u0000\u0000\u0000"+
-		"\u05da\u00cd\u0001\u0000\u0000\u0000\u05db\u05de\u0003\u00c6c\u0000\u05dc"+
-		"\u05de\u0003\u009cN\u0000\u05dd\u05db\u0001\u0000\u0000\u0000\u05dd\u05dc"+
-		"\u0001\u0000\u0000\u0000\u05de\u00cf\u0001\u0000\u0000\u0000\u05df\u05e0"+
-		"\u0005N\u0000\u0000\u05e0\u05e1\u0003\u00c6c\u0000\u05e1\u05e2\u0005O"+
-		"\u0000\u0000\u05e2\u05f2\u0001\u0000\u0000\u0000\u05e3\u05f2\u0005+\u0000"+
-		"\u0000\u05e4\u05f2\u0005(\u0000\u0000\u05e5\u05f2\u0003h4\u0000\u05e6"+
-		"\u05f2\u0003\u00a2Q\u0000\u05e7\u05e8\u0003,\u0016\u0000\u05e8\u05e9\u0005"+
-		"V\u0000\u0000\u05e9\u05ea\u0005\t\u0000\u0000\u05ea\u05f2\u0001\u0000"+
-		"\u0000\u0000\u05eb\u05ef\u0003\u00ecv\u0000\u05ec\u05f0\u0003\u00f8|\u0000"+
-		"\u05ed\u05ee\u0005+\u0000\u0000\u05ee\u05f0\u0003\u00fa}\u0000\u05ef\u05ec"+
-		"\u0001\u0000\u0000\u0000\u05ef\u05ed\u0001\u0000\u0000\u0000\u05f0\u05f2"+
-		"\u0001\u0000\u0000\u0000\u05f1\u05df\u0001\u0000\u0000\u0000\u05f1\u05e3"+
-		"\u0001\u0000\u0000\u0000\u05f1\u05e4\u0001\u0000\u0000\u0000\u05f1\u05e5"+
-		"\u0001\u0000\u0000\u0000\u05f1\u05e6\u0001\u0000\u0000\u0000\u05f1\u05e7"+
-		"\u0001\u0000\u0000\u0000\u05f1\u05eb\u0001\u0000\u0000\u0000\u05f2\u00d1"+
-		"\u0001\u0000\u0000\u0000\u05f3\u05f4\u0005)\u0000\u0000\u05f4\u05f5\u0003"+
-		"\u00c0`\u0000\u05f5\u05f9\u0005P\u0000\u0000\u05f6\u05f8\u0003\u00d4j"+
-		"\u0000\u05f7\u05f6\u0001\u0000\u0000\u0000\u05f8\u05fb\u0001\u0000\u0000"+
-		"\u0000\u05f9\u05f7\u0001\u0000\u0000\u0000\u05f9\u05fa\u0001\u0000\u0000"+
-		"\u0000\u05fa\u05fc\u0001\u0000\u0000\u0000\u05fb\u05f9\u0001\u0000\u0000"+
-		"\u0000\u05fc\u05fd\u0005Q\u0000\u0000\u05fd\u00d3\u0001\u0000\u0000\u0000"+
-		"\u05fe\u0602\u0005\u0006\u0000\u0000\u05ff\u0603\u0003\u00c2a\u0000\u0600"+
-		"\u0603\u0005M\u0000\u0000\u0601\u0603\u0003\u00d6k\u0000\u0602\u05ff\u0001"+
-		"\u0000\u0000\u0000\u0602\u0600\u0001\u0000\u0000\u0000\u0602\u0601\u0001"+
-		"\u0000\u0000\u0000\u0603\u0604\u0001\u0000\u0000\u0000\u0604\u0605\u0007"+
-		"\r\u0000\u0000\u0605\u060a\u0003\u00d8l\u0000\u0606\u0607\u0005\f\u0000"+
-		"\u0000\u0607\u0608\u0007\r\u0000\u0000\u0608\u060a\u0003\u00d8l\u0000"+
-		"\u0609\u05fe\u0001\u0000\u0000\u0000\u0609\u0606\u0001\u0000\u0000\u0000"+
-		"\u060a\u00d5\u0001\u0000\u0000\u0000\u060b\u060c\u0006k\uffff\uffff\u0000"+
-		"\u060c\u060d\u0005N\u0000\u0000\u060d\u060e\u0003\u00d6k\u0000\u060e\u060f"+
-		"\u0005O\u0000\u0000\u060f\u0626\u0001\u0000\u0000\u0000\u0610\u0612\u0003"+
-		"\f\u0006\u0000\u0611\u0610\u0001\u0000\u0000\u0000\u0612\u0615\u0001\u0000"+
-		"\u0000\u0000\u0613\u0611\u0001\u0000\u0000\u0000\u0613\u0614\u0001\u0000"+
-		"\u0000\u0000\u0614\u0616\u0001\u0000\u0000\u0000\u0615\u0613\u0001\u0000"+
-		"\u0000\u0000\u0616\u061a\u0003\u00f0x\u0000\u0617\u0619\u0003p8\u0000"+
-		"\u0618\u0617\u0001\u0000\u0000\u0000\u0619\u061c\u0001\u0000\u0000\u0000"+
-		"\u061a\u0618\u0001\u0000\u0000\u0000\u061a\u061b\u0001\u0000\u0000\u0000"+
-		"\u061b\u061d\u0001\u0000\u0000\u0000\u061c\u061a\u0001\u0000\u0000\u0000"+
-		"\u061d\u0622\u0003\u00a2Q\u0000\u061e\u061f\u0005b\u0000\u0000\u061f\u0621"+
-		"\u0003\u00c6c\u0000\u0620\u061e\u0001\u0000\u0000\u0000\u0621\u0624\u0001"+
-		"\u0000\u0000\u0000\u0622\u0620\u0001\u0000\u0000\u0000\u0622\u0623\u0001"+
-		"\u0000\u0000\u0000\u0623\u0626\u0001\u0000\u0000\u0000\u0624\u0622\u0001"+
-		"\u0000\u0000\u0000\u0625\u060b\u0001\u0000\u0000\u0000\u0625\u0613\u0001"+
-		"\u0000\u0000\u0000\u0626\u062c\u0001\u0000\u0000\u0000\u0627\u0628\n\u0001"+
-		"\u0000\u0000\u0628\u0629\u0005b\u0000\u0000\u0629\u062b\u0003\u00c6c\u0000"+
-		"\u062a\u0627\u0001\u0000\u0000\u0000\u062b\u062e\u0001\u0000\u0000\u0000"+
-		"\u062c\u062a\u0001\u0000\u0000\u0000\u062c\u062d\u0001\u0000\u0000\u0000"+
-		"\u062d\u00d7\u0001\u0000\u0000\u0000\u062e\u062c\u0001\u0000\u0000\u0000"+
-		"\u062f\u0637\u0003\u009cN\u0000\u0630\u0632\u0003\u009eO\u0000\u0631\u0630"+
-		"\u0001\u0000\u0000\u0000\u0632\u0635\u0001\u0000\u0000\u0000\u0633\u0631"+
-		"\u0001\u0000\u0000\u0000\u0633\u0634\u0001\u0000\u0000\u0000\u0634\u0637"+
-		"\u0001\u0000\u0000\u0000\u0635\u0633\u0001\u0000\u0000\u0000\u0636\u062f"+
-		"\u0001\u0000\u0000\u0000\u0636\u0633\u0001\u0000\u0000\u0000\u0637\u00d9"+
-		"\u0001\u0000\u0000\u0000\u0638\u0639\u0003R)\u0000\u0639\u063a\u0005V"+
-		"\u0000\u0000\u063a\u063c\u0001\u0000\u0000\u0000\u063b\u0638\u0001\u0000"+
-		"\u0000\u0000\u063b\u063c\u0001\u0000\u0000\u0000\u063c\u0640\u0001\u0000"+
-		"\u0000\u0000\u063d\u063f\u0003p8\u0000\u063e\u063d\u0001\u0000\u0000\u0000"+
-		"\u063f\u0642\u0001\u0000\u0000\u0000\u0640\u063e\u0001\u0000\u0000\u0000"+
-		"\u0640\u0641\u0001\u0000\u0000\u0000\u0641\u0643\u0001\u0000\u0000\u0000"+
-		"\u0642\u0640\u0001\u0000\u0000\u0000\u0643\u0645\u0003\u00a2Q\u0000\u0644"+
-		"\u0646\u0003\u00f4z\u0000\u0645\u0644\u0001\u0000\u0000\u0000\u0645\u0646"+
-		"\u0001\u0000\u0000\u0000\u0646\u00db\u0001\u0000\u0000\u0000\u0647\u0649"+
-		"\u0003\u00ecv\u0000\u0648\u0647\u0001\u0000\u0000\u0000\u0648\u0649\u0001"+
-		"\u0000\u0000\u0000\u0649\u064a\u0001\u0000\u0000\u0000\u064a\u064b\u0003"+
-		"\u00deo\u0000\u064b\u064c\u0003\u00e4r\u0000\u064c\u0651\u0001\u0000\u0000"+
-		"\u0000\u064d\u064e\u0003\u00deo\u0000\u064e\u064f\u0003\u00e2q\u0000\u064f"+
-		"\u0651\u0001\u0000\u0000\u0000\u0650\u0648\u0001\u0000\u0000\u0000\u0650"+
-		"\u064d\u0001\u0000\u0000\u0000\u0651\u00dd\u0001\u0000\u0000\u0000\u0652"+
-		"\u0654\u0003\u00a2Q\u0000\u0653\u0655\u0003\u00e8t\u0000\u0654\u0653\u0001"+
-		"\u0000\u0000\u0000\u0654\u0655\u0001\u0000\u0000\u0000\u0655\u065d\u0001"+
-		"\u0000\u0000\u0000\u0656\u0657\u0005V\u0000\u0000\u0657\u0659\u0003\u00a2"+
-		"Q\u0000\u0658\u065a\u0003\u00e8t\u0000\u0659\u0658\u0001\u0000\u0000\u0000"+
-		"\u0659\u065a\u0001\u0000\u0000\u0000\u065a\u065c\u0001\u0000\u0000\u0000"+
-		"\u065b\u0656\u0001\u0000\u0000\u0000\u065c\u065f\u0001\u0000\u0000\u0000"+
-		"\u065d\u065b\u0001\u0000\u0000\u0000\u065d\u065e\u0001\u0000\u0000\u0000"+
-		"\u065e\u0662\u0001\u0000\u0000\u0000\u065f\u065d\u0001\u0000\u0000\u0000"+
-		"\u0660\u0662\u0003\u00f2y\u0000\u0661\u0652\u0001\u0000\u0000\u0000\u0661"+
-		"\u0660\u0001\u0000\u0000\u0000\u0662\u00df\u0001\u0000\u0000\u0000\u0663"+
-		"\u0665\u0003\u00a2Q\u0000\u0664\u0666\u0003\u00eau\u0000\u0665\u0664\u0001"+
-		"\u0000\u0000\u0000\u0665\u0666\u0001\u0000\u0000\u0000\u0666\u0667\u0001"+
-		"\u0000\u0000\u0000\u0667\u0668\u0003\u00e4r\u0000\u0668\u00e1\u0001\u0000"+
-		"\u0000\u0000\u0669\u066a\u0005R\u0000\u0000\u066a\u066c\u0005S\u0000\u0000"+
-		"\u066b\u0669\u0001\u0000\u0000\u0000\u066c\u066d\u0001\u0000\u0000\u0000"+
-		"\u066d\u066b\u0001\u0000\u0000\u0000\u066d\u066e\u0001\u0000\u0000\u0000"+
-		"\u066e\u066f\u0001\u0000\u0000\u0000\u066f\u0680\u0003P(\u0000\u0670\u0671"+
-		"\u0005R\u0000\u0000\u0671\u0672\u0003\u00c6c\u0000\u0672\u0673\u0005S"+
-		"\u0000\u0000\u0673\u0675\u0001\u0000\u0000\u0000\u0674\u0670\u0001\u0000"+
-		"\u0000\u0000\u0675\u0676\u0001\u0000\u0000\u0000\u0676\u0674\u0001\u0000"+
-		"\u0000\u0000\u0676\u0677\u0001\u0000\u0000\u0000\u0677\u067c\u0001\u0000"+
-		"\u0000\u0000\u0678\u0679\u0005R\u0000\u0000\u0679\u067b\u0005S\u0000\u0000"+
-		"\u067a\u0678\u0001\u0000\u0000\u0000\u067b\u067e\u0001\u0000\u0000\u0000"+
-		"\u067c\u067a\u0001\u0000\u0000\u0000\u067c\u067d\u0001\u0000\u0000\u0000"+
-		"\u067d\u0680\u0001\u0000\u0000\u0000\u067e\u067c\u0001\u0000\u0000\u0000"+
-		"\u067f\u066b\u0001\u0000\u0000\u0000\u067f\u0674\u0001\u0000\u0000\u0000"+
-		"\u0680\u00e3\u0001\u0000\u0000\u0000\u0681\u0683\u0003\u00fa}\u0000\u0682"+
-		"\u0684\u0003 \u0010\u0000\u0683\u0682\u0001\u0000\u0000\u0000\u0683\u0684"+
-		"\u0001\u0000\u0000\u0000\u0684\u00e5\u0001\u0000\u0000\u0000\u0685\u0686"+
-		"\u0003\u00ecv\u0000\u0686\u0687\u0003\u00f8|\u0000\u0687\u00e7\u0001\u0000"+
-		"\u0000\u0000\u0688\u0689\u0005Y\u0000\u0000\u0689\u068c\u0005X\u0000\u0000"+
-		"\u068a\u068c\u0003\u00f4z\u0000\u068b\u0688\u0001\u0000\u0000\u0000\u068b"+
-		"\u068a\u0001\u0000\u0000\u0000\u068c\u00e9\u0001\u0000\u0000\u0000\u068d"+
-		"\u068e\u0005Y\u0000\u0000\u068e\u0691\u0005X\u0000\u0000\u068f\u0691\u0003"+
-		"\u00ecv\u0000\u0690\u068d\u0001\u0000\u0000\u0000\u0690\u068f\u0001\u0000"+
-		"\u0000\u0000\u0691\u00eb\u0001\u0000\u0000\u0000\u0692\u0693\u0005Y\u0000"+
-		"\u0000\u0693\u0694\u0003\u00eew\u0000\u0694\u0695\u0005X\u0000\u0000\u0695"+
-		"\u00ed\u0001\u0000\u0000\u0000\u0696\u069b\u0003\u00f0x\u0000\u0697\u0698"+
-		"\u0005U\u0000\u0000\u0698\u069a\u0003\u00f0x\u0000\u0699\u0697\u0001\u0000"+
-		"\u0000\u0000\u069a\u069d\u0001\u0000\u0000\u0000\u069b\u0699\u0001\u0000"+
-		"\u0000\u0000\u069b\u069c\u0001\u0000\u0000\u0000\u069c\u00ef\u0001\u0000"+
-		"\u0000\u0000\u069d\u069b\u0001\u0000\u0000\u0000\u069e\u06a0\u0003p8\u0000"+
-		"\u069f\u069e\u0001\u0000\u0000\u0000\u06a0\u06a3\u0001\u0000\u0000\u0000"+
-		"\u06a1\u069f\u0001\u0000\u0000\u0000\u06a1\u06a2\u0001\u0000\u0000\u0000"+
-		"\u06a2\u06a6\u0001\u0000\u0000\u0000\u06a3\u06a1\u0001\u0000\u0000\u0000"+
-		"\u06a4\u06a7\u0003R)\u0000\u06a5\u06a7\u0003\u00f2y\u0000\u06a6\u06a4"+
-		"\u0001\u0000\u0000\u0000\u06a6\u06a5\u0001\u0000\u0000\u0000\u06a7\u06b2"+
-		"\u0001\u0000\u0000\u0000\u06a8\u06aa\u0003p8\u0000\u06a9\u06a8\u0001\u0000"+
-		"\u0000\u0000\u06aa\u06ad\u0001\u0000\u0000\u0000\u06ab\u06a9\u0001\u0000"+
-		"\u0000\u0000\u06ab\u06ac\u0001\u0000\u0000\u0000\u06ac\u06ae\u0001\u0000"+
-		"\u0000\u0000\u06ad\u06ab\u0001\u0000\u0000\u0000\u06ae\u06af\u0005R\u0000"+
-		"\u0000\u06af\u06b1\u0005S\u0000\u0000\u06b0\u06ab\u0001\u0000\u0000\u0000"+
-		"\u06b1\u06b4\u0001\u0000\u0000\u0000\u06b2\u06b0\u0001\u0000\u0000\u0000"+
-		"\u06b2\u06b3\u0001\u0000\u0000\u0000\u06b3\u00f1\u0001\u0000\u0000\u0000"+
-		"\u06b4\u06b2\u0001\u0000\u0000\u0000\u06b5\u06b6\u0007\u000e\u0000\u0000"+
-		"\u06b6\u00f3\u0001\u0000\u0000\u0000\u06b7\u06b8\u0005Y\u0000\u0000\u06b8"+
-		"\u06bd\u0003T*\u0000\u06b9\u06ba\u0005U\u0000\u0000\u06ba\u06bc\u0003"+
-		"T*\u0000\u06bb\u06b9\u0001\u0000\u0000\u0000\u06bc\u06bf\u0001\u0000\u0000"+
-		"\u0000\u06bd\u06bb\u0001\u0000\u0000\u0000\u06bd\u06be\u0001\u0000\u0000"+
-		"\u0000\u06be\u06c0\u0001\u0000\u0000\u0000\u06bf\u06bd\u0001\u0000\u0000"+
-		"\u0000\u06c0\u06c1\u0005X\u0000\u0000\u06c1\u00f5\u0001\u0000\u0000\u0000"+
-		"\u06c2\u06cc\u0003\u00fa}\u0000\u06c3\u06c5\u0005V\u0000\u0000\u06c4\u06c6"+
-		"\u0003\u00f4z\u0000\u06c5\u06c4\u0001\u0000\u0000\u0000\u06c5\u06c6\u0001"+
-		"\u0000\u0000\u0000\u06c6\u06c7\u0001\u0000\u0000\u0000\u06c7\u06c9\u0003"+
-		"\u00a2Q\u0000\u06c8\u06ca\u0003\u00fa}\u0000\u06c9\u06c8\u0001\u0000\u0000"+
-		"\u0000\u06c9\u06ca\u0001\u0000\u0000\u0000\u06ca\u06cc\u0001\u0000\u0000"+
-		"\u0000\u06cb\u06c2\u0001\u0000\u0000\u0000\u06cb\u06c3\u0001\u0000\u0000"+
-		"\u0000\u06cc\u00f7\u0001\u0000\u0000\u0000\u06cd\u06ce\u0005(\u0000\u0000"+
-		"\u06ce\u06d3\u0003\u00f6{\u0000\u06cf\u06d0\u0003\u00a2Q\u0000\u06d0\u06d1"+
-		"\u0003\u00fa}\u0000\u06d1\u06d3\u0001\u0000\u0000\u0000\u06d2\u06cd\u0001"+
-		"\u0000\u0000\u0000\u06d2\u06cf\u0001\u0000\u0000\u0000\u06d3\u00f9\u0001"+
-		"\u0000\u0000\u0000\u06d4\u06d6\u0005N\u0000\u0000\u06d5\u06d7\u0003\u00c2"+
-		"a\u0000\u06d6\u06d5\u0001\u0000\u0000\u0000\u06d6\u06d7\u0001\u0000\u0000"+
-		"\u0000\u06d7\u06d8\u0001\u0000\u0000\u0000\u06d8\u06d9\u0005O\u0000\u0000"+
-		"\u06d9\u00fb\u0001\u0000\u0000\u0000\u00db\u00fd\u0101\u0103\u0108\u010a"+
-		"\u0110\u0115\u011e\u0123\u012a\u0132\u0139\u0145\u0149\u014e\u0152\u0156"+
-		"\u015a\u0164\u016c\u0174\u0178\u017f\u0186\u018a\u018d\u0190\u0199\u019f"+
-		"\u01a4\u01a7\u01ad\u01b3\u01b7\u01bb\u01c3\u01cc\u01d3\u01d9\u01dd\u01e9"+
-		"\u01f2\u01f7\u01fd\u0201\u020d\u0214\u0221\u0226\u0230\u0238\u0242\u024b"+
-		"\u0256\u025b\u0264\u026e\u0273\u027c\u0282\u0289\u028e\u0296\u029a\u029c"+
-		"\u02a2\u02a8\u02ad\u02b3\u02b9\u02bb\u02c2\u02c7\u02cc\u02cf\u02d1\u02db"+
-		"\u02e5\u02ea\u02ed\u02f2\u02fb\u0302\u030d\u0313\u031e\u0328\u0333\u033c"+
-		"\u0341\u0344\u034b\u0355\u035d\u0360\u0363\u0370\u0378\u037d\u0385\u0389"+
-		"\u038d\u0391\u0395\u0397\u039b\u03a1\u03a9\u03b3\u03bc\u03c6\u03ce\u03dc"+
-		"\u03e3\u03e8\u03ee\u03f7\u0400\u0402\u040b\u0415\u041a\u0425\u042e\u0434"+
-		"\u043b\u0444\u045b\u045e\u0461\u0469\u046d\u0475\u047b\u0486\u048f\u0494"+
-		"\u04a1\u04a7\u04ae\u04bb\u04c4\u04cd\u04d3\u04db\u04e1\u04e6\u04eb\u04f3"+
-		"\u04f8\u04fc\u0500\u0504\u0506\u050a\u050f\u0514\u0523\u0529\u0533\u0537"+
-		"\u053c\u0547\u054f\u0558\u0568\u0595\u059b\u05a0\u05a9\u05ab\u05ad\u05b3"+
-		"\u05ba\u05c6\u05cf\u05d6\u05d9\u05dd\u05ef\u05f1\u05f9\u0602\u0609\u0613"+
-		"\u061a\u0622\u0625\u062c\u0633\u0636\u063b\u0640\u0645\u0648\u0650\u0654"+
-		"\u0659\u065d\u0661\u0665\u066d\u0676\u067c\u067f\u0683\u068b\u0690\u069b"+
-		"\u06a1\u06a6\u06ab\u06b2\u06bd\u06c5\u06c9\u06cb\u06d2\u06d6";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-	static {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
-	}
-}
\ No newline at end of file
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserBaseListener.java b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserBaseListener.java
deleted file mode 100644
index c545b28..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserBaseListener.java
+++ /dev/null
@@ -1,1552 +0,0 @@
-// Generated from C:/Users/weg20/StudioProjects/apkide/openapi/src/main/java/com/apkide/openapi/language/java\JavaParser.g4
-package com.apkide.openapi.language.java.ast;
-
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.tree.ErrorNode;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-/**
- * This class provides an empty implementation of {@link JavaParserListener},
- * which can be extended to create a listener which only needs to handle a subset
- * of the available methods.
- */
-@SuppressWarnings("CheckReturnValue")
-public class JavaParserBaseListener implements JavaParserListener {
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCompilationUnit(JavaParser.CompilationUnitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCompilationUnit(JavaParser.CompilationUnitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterPackageDeclaration(JavaParser.PackageDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitPackageDeclaration(JavaParser.PackageDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterImportDeclaration(JavaParser.ImportDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitImportDeclaration(JavaParser.ImportDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeDeclaration(JavaParser.TypeDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeDeclaration(JavaParser.TypeDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterModifier(JavaParser.ModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitModifier(JavaParser.ModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassOrInterfaceModifier(JavaParser.ClassOrInterfaceModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassOrInterfaceModifier(JavaParser.ClassOrInterfaceModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVariableModifier(JavaParser.VariableModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVariableModifier(JavaParser.VariableModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassDeclaration(JavaParser.ClassDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassDeclaration(JavaParser.ClassDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeParameters(JavaParser.TypeParametersContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeParameters(JavaParser.TypeParametersContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeParameter(JavaParser.TypeParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeParameter(JavaParser.TypeParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeBound(JavaParser.TypeBoundContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeBound(JavaParser.TypeBoundContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEnumDeclaration(JavaParser.EnumDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEnumDeclaration(JavaParser.EnumDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEnumConstants(JavaParser.EnumConstantsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEnumConstants(JavaParser.EnumConstantsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEnumConstant(JavaParser.EnumConstantContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEnumConstant(JavaParser.EnumConstantContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEnumBodyDeclarations(JavaParser.EnumBodyDeclarationsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEnumBodyDeclarations(JavaParser.EnumBodyDeclarationsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceDeclaration(JavaParser.InterfaceDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceDeclaration(JavaParser.InterfaceDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassBody(JavaParser.ClassBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassBody(JavaParser.ClassBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceBody(JavaParser.InterfaceBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceBody(JavaParser.InterfaceBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassBodyDeclaration(JavaParser.ClassBodyDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassBodyDeclaration(JavaParser.ClassBodyDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMemberDeclaration(JavaParser.MemberDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitMemberDeclaration(JavaParser.MemberDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMethodDeclaration(JavaParser.MethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitMethodDeclaration(JavaParser.MethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMethodBody(JavaParser.MethodBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitMethodBody(JavaParser.MethodBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeTypeOrVoid(JavaParser.TypeTypeOrVoidContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeTypeOrVoid(JavaParser.TypeTypeOrVoidContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterGenericMethodDeclaration(JavaParser.GenericMethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitGenericMethodDeclaration(JavaParser.GenericMethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterGenericConstructorDeclaration(JavaParser.GenericConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitGenericConstructorDeclaration(JavaParser.GenericConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCompactConstructorDeclaration(JavaParser.CompactConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCompactConstructorDeclaration(JavaParser.CompactConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFieldDeclaration(JavaParser.FieldDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFieldDeclaration(JavaParser.FieldDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceBodyDeclaration(JavaParser.InterfaceBodyDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceBodyDeclaration(JavaParser.InterfaceBodyDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceMemberDeclaration(JavaParser.InterfaceMemberDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceMemberDeclaration(JavaParser.InterfaceMemberDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterConstDeclaration(JavaParser.ConstDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitConstDeclaration(JavaParser.ConstDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterConstantDeclarator(JavaParser.ConstantDeclaratorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitConstantDeclarator(JavaParser.ConstantDeclaratorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceMethodDeclaration(JavaParser.InterfaceMethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceMethodDeclaration(JavaParser.InterfaceMethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceMethodModifier(JavaParser.InterfaceMethodModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceMethodModifier(JavaParser.InterfaceMethodModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterGenericInterfaceMethodDeclaration(JavaParser.GenericInterfaceMethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitGenericInterfaceMethodDeclaration(JavaParser.GenericInterfaceMethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInterfaceCommonBodyDeclaration(JavaParser.InterfaceCommonBodyDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInterfaceCommonBodyDeclaration(JavaParser.InterfaceCommonBodyDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVariableDeclarators(JavaParser.VariableDeclaratorsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVariableDeclarators(JavaParser.VariableDeclaratorsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVariableDeclarator(JavaParser.VariableDeclaratorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVariableDeclarator(JavaParser.VariableDeclaratorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVariableDeclaratorId(JavaParser.VariableDeclaratorIdContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVariableDeclaratorId(JavaParser.VariableDeclaratorIdContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVariableInitializer(JavaParser.VariableInitializerContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVariableInitializer(JavaParser.VariableInitializerContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterArrayInitializer(JavaParser.ArrayInitializerContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitArrayInitializer(JavaParser.ArrayInitializerContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassOrInterfaceType(JavaParser.ClassOrInterfaceTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassOrInterfaceType(JavaParser.ClassOrInterfaceTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeArgument(JavaParser.TypeArgumentContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeArgument(JavaParser.TypeArgumentContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterQualifiedNameList(JavaParser.QualifiedNameListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitQualifiedNameList(JavaParser.QualifiedNameListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFormalParameters(JavaParser.FormalParametersContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFormalParameters(JavaParser.FormalParametersContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterReceiverParameter(JavaParser.ReceiverParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitReceiverParameter(JavaParser.ReceiverParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFormalParameterList(JavaParser.FormalParameterListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFormalParameterList(JavaParser.FormalParameterListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFormalParameter(JavaParser.FormalParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFormalParameter(JavaParser.FormalParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLastFormalParameter(JavaParser.LastFormalParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLastFormalParameter(JavaParser.LastFormalParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLambdaLVTIList(JavaParser.LambdaLVTIListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLambdaLVTIList(JavaParser.LambdaLVTIListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLambdaLVTIParameter(JavaParser.LambdaLVTIParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLambdaLVTIParameter(JavaParser.LambdaLVTIParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterQualifiedName(JavaParser.QualifiedNameContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitQualifiedName(JavaParser.QualifiedNameContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLiteral(JavaParser.LiteralContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLiteral(JavaParser.LiteralContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterIntegerLiteral(JavaParser.IntegerLiteralContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitIntegerLiteral(JavaParser.IntegerLiteralContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFloatLiteral(JavaParser.FloatLiteralContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFloatLiteral(JavaParser.FloatLiteralContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAltAnnotationQualifiedName(JavaParser.AltAnnotationQualifiedNameContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAltAnnotationQualifiedName(JavaParser.AltAnnotationQualifiedNameContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotation(JavaParser.AnnotationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotation(JavaParser.AnnotationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterElementValuePairs(JavaParser.ElementValuePairsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitElementValuePairs(JavaParser.ElementValuePairsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterElementValuePair(JavaParser.ElementValuePairContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitElementValuePair(JavaParser.ElementValuePairContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterElementValue(JavaParser.ElementValueContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitElementValue(JavaParser.ElementValueContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterElementValueArrayInitializer(JavaParser.ElementValueArrayInitializerContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitElementValueArrayInitializer(JavaParser.ElementValueArrayInitializerContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationTypeDeclaration(JavaParser.AnnotationTypeDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationTypeDeclaration(JavaParser.AnnotationTypeDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationTypeBody(JavaParser.AnnotationTypeBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationTypeBody(JavaParser.AnnotationTypeBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationTypeElementDeclaration(JavaParser.AnnotationTypeElementDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationTypeElementDeclaration(JavaParser.AnnotationTypeElementDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationTypeElementRest(JavaParser.AnnotationTypeElementRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationTypeElementRest(JavaParser.AnnotationTypeElementRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationMethodOrConstantRest(JavaParser.AnnotationMethodOrConstantRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationMethodOrConstantRest(JavaParser.AnnotationMethodOrConstantRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationMethodRest(JavaParser.AnnotationMethodRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationMethodRest(JavaParser.AnnotationMethodRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnnotationConstantRest(JavaParser.AnnotationConstantRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnnotationConstantRest(JavaParser.AnnotationConstantRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterDefaultValue(JavaParser.DefaultValueContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitDefaultValue(JavaParser.DefaultValueContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterModuleDeclaration(JavaParser.ModuleDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitModuleDeclaration(JavaParser.ModuleDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterModuleBody(JavaParser.ModuleBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitModuleBody(JavaParser.ModuleBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterModuleDirective(JavaParser.ModuleDirectiveContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitModuleDirective(JavaParser.ModuleDirectiveContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRequiresModifier(JavaParser.RequiresModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRequiresModifier(JavaParser.RequiresModifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRecordDeclaration(JavaParser.RecordDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRecordDeclaration(JavaParser.RecordDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRecordHeader(JavaParser.RecordHeaderContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRecordHeader(JavaParser.RecordHeaderContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRecordComponentList(JavaParser.RecordComponentListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRecordComponentList(JavaParser.RecordComponentListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRecordComponent(JavaParser.RecordComponentContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRecordComponent(JavaParser.RecordComponentContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRecordBody(JavaParser.RecordBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRecordBody(JavaParser.RecordBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBlock(JavaParser.BlockContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBlock(JavaParser.BlockContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBlockStatement(JavaParser.BlockStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBlockStatement(JavaParser.BlockStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLocalVariableDeclaration(JavaParser.LocalVariableDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLocalVariableDeclaration(JavaParser.LocalVariableDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterIdentifier(JavaParser.IdentifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitIdentifier(JavaParser.IdentifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeIdentifier(JavaParser.TypeIdentifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeIdentifier(JavaParser.TypeIdentifierContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLocalTypeDeclaration(JavaParser.LocalTypeDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLocalTypeDeclaration(JavaParser.LocalTypeDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterStatement(JavaParser.StatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitStatement(JavaParser.StatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCatchClause(JavaParser.CatchClauseContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCatchClause(JavaParser.CatchClauseContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCatchType(JavaParser.CatchTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCatchType(JavaParser.CatchTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFinallyBlock(JavaParser.FinallyBlockContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFinallyBlock(JavaParser.FinallyBlockContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterResourceSpecification(JavaParser.ResourceSpecificationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitResourceSpecification(JavaParser.ResourceSpecificationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterResources(JavaParser.ResourcesContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitResources(JavaParser.ResourcesContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterResource(JavaParser.ResourceContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitResource(JavaParser.ResourceContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSwitchBlockStatementGroup(JavaParser.SwitchBlockStatementGroupContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSwitchBlockStatementGroup(JavaParser.SwitchBlockStatementGroupContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSwitchLabel(JavaParser.SwitchLabelContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSwitchLabel(JavaParser.SwitchLabelContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterForControl(JavaParser.ForControlContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitForControl(JavaParser.ForControlContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterForInit(JavaParser.ForInitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitForInit(JavaParser.ForInitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEnhancedForControl(JavaParser.EnhancedForControlContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEnhancedForControl(JavaParser.EnhancedForControlContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterParExpression(JavaParser.ParExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitParExpression(JavaParser.ParExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExpressionList(JavaParser.ExpressionListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExpressionList(JavaParser.ExpressionListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMethodCall(JavaParser.MethodCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitMethodCall(JavaParser.MethodCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExpression(JavaParser.ExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExpression(JavaParser.ExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterPattern(JavaParser.PatternContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitPattern(JavaParser.PatternContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLambdaExpression(JavaParser.LambdaExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLambdaExpression(JavaParser.LambdaExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLambdaParameters(JavaParser.LambdaParametersContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLambdaParameters(JavaParser.LambdaParametersContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLambdaBody(JavaParser.LambdaBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLambdaBody(JavaParser.LambdaBodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterPrimary(JavaParser.PrimaryContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitPrimary(JavaParser.PrimaryContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSwitchExpression(JavaParser.SwitchExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSwitchExpression(JavaParser.SwitchExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSwitchLabeledRule(JavaParser.SwitchLabeledRuleContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSwitchLabeledRule(JavaParser.SwitchLabeledRuleContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterGuardedPattern(JavaParser.GuardedPatternContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitGuardedPattern(JavaParser.GuardedPatternContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSwitchRuleOutcome(JavaParser.SwitchRuleOutcomeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSwitchRuleOutcome(JavaParser.SwitchRuleOutcomeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassType(JavaParser.ClassTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassType(JavaParser.ClassTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCreator(JavaParser.CreatorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCreator(JavaParser.CreatorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCreatedName(JavaParser.CreatedNameContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCreatedName(JavaParser.CreatedNameContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterInnerCreator(JavaParser.InnerCreatorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitInnerCreator(JavaParser.InnerCreatorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterArrayCreatorRest(JavaParser.ArrayCreatorRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitArrayCreatorRest(JavaParser.ArrayCreatorRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassCreatorRest(JavaParser.ClassCreatorRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassCreatorRest(JavaParser.ClassCreatorRestContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExplicitGenericInvocation(JavaParser.ExplicitGenericInvocationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExplicitGenericInvocation(JavaParser.ExplicitGenericInvocationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeArgumentsOrDiamond(JavaParser.TypeArgumentsOrDiamondContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeArgumentsOrDiamond(JavaParser.TypeArgumentsOrDiamondContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNonWildcardTypeArgumentsOrDiamond(JavaParser.NonWildcardTypeArgumentsOrDiamondContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNonWildcardTypeArgumentsOrDiamond(JavaParser.NonWildcardTypeArgumentsOrDiamondContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNonWildcardTypeArguments(JavaParser.NonWildcardTypeArgumentsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNonWildcardTypeArguments(JavaParser.NonWildcardTypeArgumentsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeList(JavaParser.TypeListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeList(JavaParser.TypeListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeType(JavaParser.TypeTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeType(JavaParser.TypeTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterPrimitiveType(JavaParser.PrimitiveTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitPrimitiveType(JavaParser.PrimitiveTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeArguments(JavaParser.TypeArgumentsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeArguments(JavaParser.TypeArgumentsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSuperSuffix(JavaParser.SuperSuffixContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSuperSuffix(JavaParser.SuperSuffixContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExplicitGenericInvocationSuffix(JavaParser.ExplicitGenericInvocationSuffixContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExplicitGenericInvocationSuffix(JavaParser.ExplicitGenericInvocationSuffixContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterArguments(JavaParser.ArgumentsContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitArguments(JavaParser.ArgumentsContext ctx) { }
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEveryRule(ParserRuleContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEveryRule(ParserRuleContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void visitTerminal(TerminalNode node) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void visitErrorNode(ErrorNode node) { }
-}
\ No newline at end of file
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserBaseVisitor.java b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserBaseVisitor.java
deleted file mode 100644
index a8801b1..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserBaseVisitor.java
+++ /dev/null
@@ -1,898 +0,0 @@
-// Generated from C:/Users/weg20/StudioProjects/apkide/openapi/src/main/java/com/apkide/openapi/language/java\JavaParser.g4
-package com.apkide.openapi.language.java.ast;
-
-import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
-
-/**
- * This class provides an empty implementation of {@link JavaParserVisitor},
- * which can be extended to create a visitor which only needs to handle a subset
- * of the available methods.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-@SuppressWarnings("CheckReturnValue")
-public class JavaParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements JavaParserVisitor<T> {
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitCompilationUnit(JavaParser.CompilationUnitContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitPackageDeclaration(JavaParser.PackageDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitImportDeclaration(JavaParser.ImportDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeDeclaration(JavaParser.TypeDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitModifier(JavaParser.ModifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassOrInterfaceModifier(JavaParser.ClassOrInterfaceModifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitVariableModifier(JavaParser.VariableModifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassDeclaration(JavaParser.ClassDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeParameters(JavaParser.TypeParametersContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeParameter(JavaParser.TypeParameterContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeBound(JavaParser.TypeBoundContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitEnumDeclaration(JavaParser.EnumDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitEnumConstants(JavaParser.EnumConstantsContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitEnumConstant(JavaParser.EnumConstantContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitEnumBodyDeclarations(JavaParser.EnumBodyDeclarationsContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceDeclaration(JavaParser.InterfaceDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassBody(JavaParser.ClassBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceBody(JavaParser.InterfaceBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassBodyDeclaration(JavaParser.ClassBodyDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitMemberDeclaration(JavaParser.MemberDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitMethodDeclaration(JavaParser.MethodDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitMethodBody(JavaParser.MethodBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeTypeOrVoid(JavaParser.TypeTypeOrVoidContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitGenericMethodDeclaration(JavaParser.GenericMethodDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitGenericConstructorDeclaration(JavaParser.GenericConstructorDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitCompactConstructorDeclaration(JavaParser.CompactConstructorDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFieldDeclaration(JavaParser.FieldDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceBodyDeclaration(JavaParser.InterfaceBodyDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceMemberDeclaration(JavaParser.InterfaceMemberDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitConstDeclaration(JavaParser.ConstDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitConstantDeclarator(JavaParser.ConstantDeclaratorContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceMethodDeclaration(JavaParser.InterfaceMethodDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceMethodModifier(JavaParser.InterfaceMethodModifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitGenericInterfaceMethodDeclaration(JavaParser.GenericInterfaceMethodDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInterfaceCommonBodyDeclaration(JavaParser.InterfaceCommonBodyDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitVariableDeclarators(JavaParser.VariableDeclaratorsContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitVariableDeclarator(JavaParser.VariableDeclaratorContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitVariableDeclaratorId(JavaParser.VariableDeclaratorIdContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitVariableInitializer(JavaParser.VariableInitializerContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitArrayInitializer(JavaParser.ArrayInitializerContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassOrInterfaceType(JavaParser.ClassOrInterfaceTypeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeArgument(JavaParser.TypeArgumentContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitQualifiedNameList(JavaParser.QualifiedNameListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFormalParameters(JavaParser.FormalParametersContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitReceiverParameter(JavaParser.ReceiverParameterContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFormalParameterList(JavaParser.FormalParameterListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFormalParameter(JavaParser.FormalParameterContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLastFormalParameter(JavaParser.LastFormalParameterContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLambdaLVTIList(JavaParser.LambdaLVTIListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLambdaLVTIParameter(JavaParser.LambdaLVTIParameterContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitQualifiedName(JavaParser.QualifiedNameContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLiteral(JavaParser.LiteralContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitIntegerLiteral(JavaParser.IntegerLiteralContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFloatLiteral(JavaParser.FloatLiteralContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAltAnnotationQualifiedName(JavaParser.AltAnnotationQualifiedNameContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotation(JavaParser.AnnotationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitElementValuePairs(JavaParser.ElementValuePairsContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitElementValuePair(JavaParser.ElementValuePairContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitElementValue(JavaParser.ElementValueContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitElementValueArrayInitializer(JavaParser.ElementValueArrayInitializerContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationTypeDeclaration(JavaParser.AnnotationTypeDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationTypeBody(JavaParser.AnnotationTypeBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationTypeElementDeclaration(JavaParser.AnnotationTypeElementDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationTypeElementRest(JavaParser.AnnotationTypeElementRestContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationMethodOrConstantRest(JavaParser.AnnotationMethodOrConstantRestContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationMethodRest(JavaParser.AnnotationMethodRestContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAnnotationConstantRest(JavaParser.AnnotationConstantRestContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitDefaultValue(JavaParser.DefaultValueContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitModuleDeclaration(JavaParser.ModuleDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitModuleBody(JavaParser.ModuleBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitModuleDirective(JavaParser.ModuleDirectiveContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitRequiresModifier(JavaParser.RequiresModifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitRecordDeclaration(JavaParser.RecordDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitRecordHeader(JavaParser.RecordHeaderContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitRecordComponentList(JavaParser.RecordComponentListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitRecordComponent(JavaParser.RecordComponentContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitRecordBody(JavaParser.RecordBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitBlock(JavaParser.BlockContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitBlockStatement(JavaParser.BlockStatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLocalVariableDeclaration(JavaParser.LocalVariableDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitIdentifier(JavaParser.IdentifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeIdentifier(JavaParser.TypeIdentifierContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLocalTypeDeclaration(JavaParser.LocalTypeDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitStatement(JavaParser.StatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitCatchClause(JavaParser.CatchClauseContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitCatchType(JavaParser.CatchTypeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFinallyBlock(JavaParser.FinallyBlockContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitResourceSpecification(JavaParser.ResourceSpecificationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitResources(JavaParser.ResourcesContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitResource(JavaParser.ResourceContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitSwitchBlockStatementGroup(JavaParser.SwitchBlockStatementGroupContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitSwitchLabel(JavaParser.SwitchLabelContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitForControl(JavaParser.ForControlContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitForInit(JavaParser.ForInitContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitEnhancedForControl(JavaParser.EnhancedForControlContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitParExpression(JavaParser.ParExpressionContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitExpressionList(JavaParser.ExpressionListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitMethodCall(JavaParser.MethodCallContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitExpression(JavaParser.ExpressionContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitPattern(JavaParser.PatternContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLambdaExpression(JavaParser.LambdaExpressionContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLambdaParameters(JavaParser.LambdaParametersContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLambdaBody(JavaParser.LambdaBodyContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitPrimary(JavaParser.PrimaryContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitSwitchExpression(JavaParser.SwitchExpressionContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitSwitchLabeledRule(JavaParser.SwitchLabeledRuleContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitGuardedPattern(JavaParser.GuardedPatternContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitSwitchRuleOutcome(JavaParser.SwitchRuleOutcomeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassType(JavaParser.ClassTypeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitCreator(JavaParser.CreatorContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitCreatedName(JavaParser.CreatedNameContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitInnerCreator(JavaParser.InnerCreatorContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitArrayCreatorRest(JavaParser.ArrayCreatorRestContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassCreatorRest(JavaParser.ClassCreatorRestContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitExplicitGenericInvocation(JavaParser.ExplicitGenericInvocationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeArgumentsOrDiamond(JavaParser.TypeArgumentsOrDiamondContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitNonWildcardTypeArgumentsOrDiamond(JavaParser.NonWildcardTypeArgumentsOrDiamondContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitNonWildcardTypeArguments(JavaParser.NonWildcardTypeArgumentsContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeList(JavaParser.TypeListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeType(JavaParser.TypeTypeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitPrimitiveType(JavaParser.PrimitiveTypeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitTypeArguments(JavaParser.TypeArgumentsContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitSuperSuffix(JavaParser.SuperSuffixContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitExplicitGenericInvocationSuffix(JavaParser.ExplicitGenericInvocationSuffixContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitArguments(JavaParser.ArgumentsContext ctx) { return visitChildren(ctx); }
-}
\ No newline at end of file
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserListener.java b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserListener.java
deleted file mode 100644
index b6089c7..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserListener.java
+++ /dev/null
@@ -1,1271 +0,0 @@
-// Generated from C:/Users/weg20/StudioProjects/apkide/openapi/src/main/java/com/apkide/openapi/language/java\JavaParser.g4
-package com.apkide.openapi.language.java.ast;
-
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-
-/**
- * This interface defines a complete listener for a parse tree produced by
- * {@link JavaParser}.
- */
-public interface JavaParserListener extends ParseTreeListener {
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#compilationUnit}.
-	 * @param ctx the parse tree
-	 */
-	void enterCompilationUnit(JavaParser.CompilationUnitContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#compilationUnit}.
-	 * @param ctx the parse tree
-	 */
-	void exitCompilationUnit(JavaParser.CompilationUnitContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#packageDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterPackageDeclaration(JavaParser.PackageDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#packageDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitPackageDeclaration(JavaParser.PackageDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#importDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterImportDeclaration(JavaParser.ImportDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#importDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitImportDeclaration(JavaParser.ImportDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeDeclaration(JavaParser.TypeDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeDeclaration(JavaParser.TypeDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#modifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterModifier(JavaParser.ModifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#modifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitModifier(JavaParser.ModifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classOrInterfaceModifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassOrInterfaceModifier(JavaParser.ClassOrInterfaceModifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classOrInterfaceModifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassOrInterfaceModifier(JavaParser.ClassOrInterfaceModifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#variableModifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterVariableModifier(JavaParser.VariableModifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#variableModifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitVariableModifier(JavaParser.VariableModifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassDeclaration(JavaParser.ClassDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassDeclaration(JavaParser.ClassDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeParameters}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeParameters(JavaParser.TypeParametersContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeParameters}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeParameters(JavaParser.TypeParametersContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeParameter}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeParameter(JavaParser.TypeParameterContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeParameter}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeParameter(JavaParser.TypeParameterContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeBound}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeBound(JavaParser.TypeBoundContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeBound}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeBound(JavaParser.TypeBoundContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#enumDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterEnumDeclaration(JavaParser.EnumDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#enumDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitEnumDeclaration(JavaParser.EnumDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#enumConstants}.
-	 * @param ctx the parse tree
-	 */
-	void enterEnumConstants(JavaParser.EnumConstantsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#enumConstants}.
-	 * @param ctx the parse tree
-	 */
-	void exitEnumConstants(JavaParser.EnumConstantsContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#enumConstant}.
-	 * @param ctx the parse tree
-	 */
-	void enterEnumConstant(JavaParser.EnumConstantContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#enumConstant}.
-	 * @param ctx the parse tree
-	 */
-	void exitEnumConstant(JavaParser.EnumConstantContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#enumBodyDeclarations}.
-	 * @param ctx the parse tree
-	 */
-	void enterEnumBodyDeclarations(JavaParser.EnumBodyDeclarationsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#enumBodyDeclarations}.
-	 * @param ctx the parse tree
-	 */
-	void exitEnumBodyDeclarations(JavaParser.EnumBodyDeclarationsContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceDeclaration(JavaParser.InterfaceDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceDeclaration(JavaParser.InterfaceDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassBody(JavaParser.ClassBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassBody(JavaParser.ClassBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceBody(JavaParser.InterfaceBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceBody(JavaParser.InterfaceBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classBodyDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassBodyDeclaration(JavaParser.ClassBodyDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classBodyDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassBodyDeclaration(JavaParser.ClassBodyDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#memberDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterMemberDeclaration(JavaParser.MemberDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#memberDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitMemberDeclaration(JavaParser.MemberDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#methodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterMethodDeclaration(JavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#methodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitMethodDeclaration(JavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#methodBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterMethodBody(JavaParser.MethodBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#methodBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitMethodBody(JavaParser.MethodBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeTypeOrVoid}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeTypeOrVoid(JavaParser.TypeTypeOrVoidContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeTypeOrVoid}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeTypeOrVoid(JavaParser.TypeTypeOrVoidContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#genericMethodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterGenericMethodDeclaration(JavaParser.GenericMethodDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#genericMethodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitGenericMethodDeclaration(JavaParser.GenericMethodDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#genericConstructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterGenericConstructorDeclaration(JavaParser.GenericConstructorDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#genericConstructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitGenericConstructorDeclaration(JavaParser.GenericConstructorDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#constructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#constructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#compactConstructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterCompactConstructorDeclaration(JavaParser.CompactConstructorDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#compactConstructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitCompactConstructorDeclaration(JavaParser.CompactConstructorDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#fieldDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterFieldDeclaration(JavaParser.FieldDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#fieldDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitFieldDeclaration(JavaParser.FieldDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceBodyDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceBodyDeclaration(JavaParser.InterfaceBodyDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceBodyDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceBodyDeclaration(JavaParser.InterfaceBodyDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceMemberDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceMemberDeclaration(JavaParser.InterfaceMemberDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceMemberDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceMemberDeclaration(JavaParser.InterfaceMemberDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#constDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterConstDeclaration(JavaParser.ConstDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#constDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitConstDeclaration(JavaParser.ConstDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#constantDeclarator}.
-	 * @param ctx the parse tree
-	 */
-	void enterConstantDeclarator(JavaParser.ConstantDeclaratorContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#constantDeclarator}.
-	 * @param ctx the parse tree
-	 */
-	void exitConstantDeclarator(JavaParser.ConstantDeclaratorContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceMethodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceMethodDeclaration(JavaParser.InterfaceMethodDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceMethodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceMethodDeclaration(JavaParser.InterfaceMethodDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceMethodModifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceMethodModifier(JavaParser.InterfaceMethodModifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceMethodModifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceMethodModifier(JavaParser.InterfaceMethodModifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#genericInterfaceMethodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterGenericInterfaceMethodDeclaration(JavaParser.GenericInterfaceMethodDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#genericInterfaceMethodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitGenericInterfaceMethodDeclaration(JavaParser.GenericInterfaceMethodDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#interfaceCommonBodyDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterInterfaceCommonBodyDeclaration(JavaParser.InterfaceCommonBodyDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#interfaceCommonBodyDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitInterfaceCommonBodyDeclaration(JavaParser.InterfaceCommonBodyDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#variableDeclarators}.
-	 * @param ctx the parse tree
-	 */
-	void enterVariableDeclarators(JavaParser.VariableDeclaratorsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#variableDeclarators}.
-	 * @param ctx the parse tree
-	 */
-	void exitVariableDeclarators(JavaParser.VariableDeclaratorsContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#variableDeclarator}.
-	 * @param ctx the parse tree
-	 */
-	void enterVariableDeclarator(JavaParser.VariableDeclaratorContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#variableDeclarator}.
-	 * @param ctx the parse tree
-	 */
-	void exitVariableDeclarator(JavaParser.VariableDeclaratorContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#variableDeclaratorId}.
-	 * @param ctx the parse tree
-	 */
-	void enterVariableDeclaratorId(JavaParser.VariableDeclaratorIdContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#variableDeclaratorId}.
-	 * @param ctx the parse tree
-	 */
-	void exitVariableDeclaratorId(JavaParser.VariableDeclaratorIdContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#variableInitializer}.
-	 * @param ctx the parse tree
-	 */
-	void enterVariableInitializer(JavaParser.VariableInitializerContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#variableInitializer}.
-	 * @param ctx the parse tree
-	 */
-	void exitVariableInitializer(JavaParser.VariableInitializerContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#arrayInitializer}.
-	 * @param ctx the parse tree
-	 */
-	void enterArrayInitializer(JavaParser.ArrayInitializerContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#arrayInitializer}.
-	 * @param ctx the parse tree
-	 */
-	void exitArrayInitializer(JavaParser.ArrayInitializerContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classOrInterfaceType}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassOrInterfaceType(JavaParser.ClassOrInterfaceTypeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classOrInterfaceType}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassOrInterfaceType(JavaParser.ClassOrInterfaceTypeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeArgument}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeArgument(JavaParser.TypeArgumentContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeArgument}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeArgument(JavaParser.TypeArgumentContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#qualifiedNameList}.
-	 * @param ctx the parse tree
-	 */
-	void enterQualifiedNameList(JavaParser.QualifiedNameListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#qualifiedNameList}.
-	 * @param ctx the parse tree
-	 */
-	void exitQualifiedNameList(JavaParser.QualifiedNameListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#formalParameters}.
-	 * @param ctx the parse tree
-	 */
-	void enterFormalParameters(JavaParser.FormalParametersContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#formalParameters}.
-	 * @param ctx the parse tree
-	 */
-	void exitFormalParameters(JavaParser.FormalParametersContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#receiverParameter}.
-	 * @param ctx the parse tree
-	 */
-	void enterReceiverParameter(JavaParser.ReceiverParameterContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#receiverParameter}.
-	 * @param ctx the parse tree
-	 */
-	void exitReceiverParameter(JavaParser.ReceiverParameterContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#formalParameterList}.
-	 * @param ctx the parse tree
-	 */
-	void enterFormalParameterList(JavaParser.FormalParameterListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#formalParameterList}.
-	 * @param ctx the parse tree
-	 */
-	void exitFormalParameterList(JavaParser.FormalParameterListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#formalParameter}.
-	 * @param ctx the parse tree
-	 */
-	void enterFormalParameter(JavaParser.FormalParameterContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#formalParameter}.
-	 * @param ctx the parse tree
-	 */
-	void exitFormalParameter(JavaParser.FormalParameterContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#lastFormalParameter}.
-	 * @param ctx the parse tree
-	 */
-	void enterLastFormalParameter(JavaParser.LastFormalParameterContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#lastFormalParameter}.
-	 * @param ctx the parse tree
-	 */
-	void exitLastFormalParameter(JavaParser.LastFormalParameterContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#lambdaLVTIList}.
-	 * @param ctx the parse tree
-	 */
-	void enterLambdaLVTIList(JavaParser.LambdaLVTIListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#lambdaLVTIList}.
-	 * @param ctx the parse tree
-	 */
-	void exitLambdaLVTIList(JavaParser.LambdaLVTIListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#lambdaLVTIParameter}.
-	 * @param ctx the parse tree
-	 */
-	void enterLambdaLVTIParameter(JavaParser.LambdaLVTIParameterContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#lambdaLVTIParameter}.
-	 * @param ctx the parse tree
-	 */
-	void exitLambdaLVTIParameter(JavaParser.LambdaLVTIParameterContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#qualifiedName}.
-	 * @param ctx the parse tree
-	 */
-	void enterQualifiedName(JavaParser.QualifiedNameContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#qualifiedName}.
-	 * @param ctx the parse tree
-	 */
-	void exitQualifiedName(JavaParser.QualifiedNameContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#literal}.
-	 * @param ctx the parse tree
-	 */
-	void enterLiteral(JavaParser.LiteralContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#literal}.
-	 * @param ctx the parse tree
-	 */
-	void exitLiteral(JavaParser.LiteralContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#integerLiteral}.
-	 * @param ctx the parse tree
-	 */
-	void enterIntegerLiteral(JavaParser.IntegerLiteralContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#integerLiteral}.
-	 * @param ctx the parse tree
-	 */
-	void exitIntegerLiteral(JavaParser.IntegerLiteralContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#floatLiteral}.
-	 * @param ctx the parse tree
-	 */
-	void enterFloatLiteral(JavaParser.FloatLiteralContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#floatLiteral}.
-	 * @param ctx the parse tree
-	 */
-	void exitFloatLiteral(JavaParser.FloatLiteralContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#altAnnotationQualifiedName}.
-	 * @param ctx the parse tree
-	 */
-	void enterAltAnnotationQualifiedName(JavaParser.AltAnnotationQualifiedNameContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#altAnnotationQualifiedName}.
-	 * @param ctx the parse tree
-	 */
-	void exitAltAnnotationQualifiedName(JavaParser.AltAnnotationQualifiedNameContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotation}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotation(JavaParser.AnnotationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotation}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotation(JavaParser.AnnotationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#elementValuePairs}.
-	 * @param ctx the parse tree
-	 */
-	void enterElementValuePairs(JavaParser.ElementValuePairsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#elementValuePairs}.
-	 * @param ctx the parse tree
-	 */
-	void exitElementValuePairs(JavaParser.ElementValuePairsContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#elementValuePair}.
-	 * @param ctx the parse tree
-	 */
-	void enterElementValuePair(JavaParser.ElementValuePairContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#elementValuePair}.
-	 * @param ctx the parse tree
-	 */
-	void exitElementValuePair(JavaParser.ElementValuePairContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#elementValue}.
-	 * @param ctx the parse tree
-	 */
-	void enterElementValue(JavaParser.ElementValueContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#elementValue}.
-	 * @param ctx the parse tree
-	 */
-	void exitElementValue(JavaParser.ElementValueContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#elementValueArrayInitializer}.
-	 * @param ctx the parse tree
-	 */
-	void enterElementValueArrayInitializer(JavaParser.ElementValueArrayInitializerContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#elementValueArrayInitializer}.
-	 * @param ctx the parse tree
-	 */
-	void exitElementValueArrayInitializer(JavaParser.ElementValueArrayInitializerContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationTypeDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationTypeDeclaration(JavaParser.AnnotationTypeDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationTypeDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationTypeDeclaration(JavaParser.AnnotationTypeDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationTypeBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationTypeBody(JavaParser.AnnotationTypeBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationTypeBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationTypeBody(JavaParser.AnnotationTypeBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationTypeElementDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationTypeElementDeclaration(JavaParser.AnnotationTypeElementDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationTypeElementDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationTypeElementDeclaration(JavaParser.AnnotationTypeElementDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationTypeElementRest}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationTypeElementRest(JavaParser.AnnotationTypeElementRestContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationTypeElementRest}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationTypeElementRest(JavaParser.AnnotationTypeElementRestContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationMethodOrConstantRest}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationMethodOrConstantRest(JavaParser.AnnotationMethodOrConstantRestContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationMethodOrConstantRest}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationMethodOrConstantRest(JavaParser.AnnotationMethodOrConstantRestContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationMethodRest}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationMethodRest(JavaParser.AnnotationMethodRestContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationMethodRest}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationMethodRest(JavaParser.AnnotationMethodRestContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#annotationConstantRest}.
-	 * @param ctx the parse tree
-	 */
-	void enterAnnotationConstantRest(JavaParser.AnnotationConstantRestContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#annotationConstantRest}.
-	 * @param ctx the parse tree
-	 */
-	void exitAnnotationConstantRest(JavaParser.AnnotationConstantRestContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#defaultValue}.
-	 * @param ctx the parse tree
-	 */
-	void enterDefaultValue(JavaParser.DefaultValueContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#defaultValue}.
-	 * @param ctx the parse tree
-	 */
-	void exitDefaultValue(JavaParser.DefaultValueContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#moduleDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterModuleDeclaration(JavaParser.ModuleDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#moduleDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitModuleDeclaration(JavaParser.ModuleDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#moduleBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterModuleBody(JavaParser.ModuleBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#moduleBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitModuleBody(JavaParser.ModuleBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#moduleDirective}.
-	 * @param ctx the parse tree
-	 */
-	void enterModuleDirective(JavaParser.ModuleDirectiveContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#moduleDirective}.
-	 * @param ctx the parse tree
-	 */
-	void exitModuleDirective(JavaParser.ModuleDirectiveContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#requiresModifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterRequiresModifier(JavaParser.RequiresModifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#requiresModifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitRequiresModifier(JavaParser.RequiresModifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#recordDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterRecordDeclaration(JavaParser.RecordDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#recordDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitRecordDeclaration(JavaParser.RecordDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#recordHeader}.
-	 * @param ctx the parse tree
-	 */
-	void enterRecordHeader(JavaParser.RecordHeaderContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#recordHeader}.
-	 * @param ctx the parse tree
-	 */
-	void exitRecordHeader(JavaParser.RecordHeaderContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#recordComponentList}.
-	 * @param ctx the parse tree
-	 */
-	void enterRecordComponentList(JavaParser.RecordComponentListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#recordComponentList}.
-	 * @param ctx the parse tree
-	 */
-	void exitRecordComponentList(JavaParser.RecordComponentListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#recordComponent}.
-	 * @param ctx the parse tree
-	 */
-	void enterRecordComponent(JavaParser.RecordComponentContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#recordComponent}.
-	 * @param ctx the parse tree
-	 */
-	void exitRecordComponent(JavaParser.RecordComponentContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#recordBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterRecordBody(JavaParser.RecordBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#recordBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitRecordBody(JavaParser.RecordBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#block}.
-	 * @param ctx the parse tree
-	 */
-	void enterBlock(JavaParser.BlockContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#block}.
-	 * @param ctx the parse tree
-	 */
-	void exitBlock(JavaParser.BlockContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#blockStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterBlockStatement(JavaParser.BlockStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#blockStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitBlockStatement(JavaParser.BlockStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#localVariableDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterLocalVariableDeclaration(JavaParser.LocalVariableDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#localVariableDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitLocalVariableDeclaration(JavaParser.LocalVariableDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#identifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterIdentifier(JavaParser.IdentifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#identifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitIdentifier(JavaParser.IdentifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeIdentifier}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeIdentifier(JavaParser.TypeIdentifierContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeIdentifier}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeIdentifier(JavaParser.TypeIdentifierContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#localTypeDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterLocalTypeDeclaration(JavaParser.LocalTypeDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#localTypeDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitLocalTypeDeclaration(JavaParser.LocalTypeDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#statement}.
-	 * @param ctx the parse tree
-	 */
-	void enterStatement(JavaParser.StatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#statement}.
-	 * @param ctx the parse tree
-	 */
-	void exitStatement(JavaParser.StatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#catchClause}.
-	 * @param ctx the parse tree
-	 */
-	void enterCatchClause(JavaParser.CatchClauseContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#catchClause}.
-	 * @param ctx the parse tree
-	 */
-	void exitCatchClause(JavaParser.CatchClauseContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#catchType}.
-	 * @param ctx the parse tree
-	 */
-	void enterCatchType(JavaParser.CatchTypeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#catchType}.
-	 * @param ctx the parse tree
-	 */
-	void exitCatchType(JavaParser.CatchTypeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#finallyBlock}.
-	 * @param ctx the parse tree
-	 */
-	void enterFinallyBlock(JavaParser.FinallyBlockContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#finallyBlock}.
-	 * @param ctx the parse tree
-	 */
-	void exitFinallyBlock(JavaParser.FinallyBlockContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#resourceSpecification}.
-	 * @param ctx the parse tree
-	 */
-	void enterResourceSpecification(JavaParser.ResourceSpecificationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#resourceSpecification}.
-	 * @param ctx the parse tree
-	 */
-	void exitResourceSpecification(JavaParser.ResourceSpecificationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#resources}.
-	 * @param ctx the parse tree
-	 */
-	void enterResources(JavaParser.ResourcesContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#resources}.
-	 * @param ctx the parse tree
-	 */
-	void exitResources(JavaParser.ResourcesContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#resource}.
-	 * @param ctx the parse tree
-	 */
-	void enterResource(JavaParser.ResourceContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#resource}.
-	 * @param ctx the parse tree
-	 */
-	void exitResource(JavaParser.ResourceContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#switchBlockStatementGroup}.
-	 * @param ctx the parse tree
-	 */
-	void enterSwitchBlockStatementGroup(JavaParser.SwitchBlockStatementGroupContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#switchBlockStatementGroup}.
-	 * @param ctx the parse tree
-	 */
-	void exitSwitchBlockStatementGroup(JavaParser.SwitchBlockStatementGroupContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#switchLabel}.
-	 * @param ctx the parse tree
-	 */
-	void enterSwitchLabel(JavaParser.SwitchLabelContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#switchLabel}.
-	 * @param ctx the parse tree
-	 */
-	void exitSwitchLabel(JavaParser.SwitchLabelContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#forControl}.
-	 * @param ctx the parse tree
-	 */
-	void enterForControl(JavaParser.ForControlContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#forControl}.
-	 * @param ctx the parse tree
-	 */
-	void exitForControl(JavaParser.ForControlContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#forInit}.
-	 * @param ctx the parse tree
-	 */
-	void enterForInit(JavaParser.ForInitContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#forInit}.
-	 * @param ctx the parse tree
-	 */
-	void exitForInit(JavaParser.ForInitContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#enhancedForControl}.
-	 * @param ctx the parse tree
-	 */
-	void enterEnhancedForControl(JavaParser.EnhancedForControlContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#enhancedForControl}.
-	 * @param ctx the parse tree
-	 */
-	void exitEnhancedForControl(JavaParser.EnhancedForControlContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#parExpression}.
-	 * @param ctx the parse tree
-	 */
-	void enterParExpression(JavaParser.ParExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#parExpression}.
-	 * @param ctx the parse tree
-	 */
-	void exitParExpression(JavaParser.ParExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#expressionList}.
-	 * @param ctx the parse tree
-	 */
-	void enterExpressionList(JavaParser.ExpressionListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#expressionList}.
-	 * @param ctx the parse tree
-	 */
-	void exitExpressionList(JavaParser.ExpressionListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#methodCall}.
-	 * @param ctx the parse tree
-	 */
-	void enterMethodCall(JavaParser.MethodCallContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#methodCall}.
-	 * @param ctx the parse tree
-	 */
-	void exitMethodCall(JavaParser.MethodCallContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#expression}.
-	 * @param ctx the parse tree
-	 */
-	void enterExpression(JavaParser.ExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#expression}.
-	 * @param ctx the parse tree
-	 */
-	void exitExpression(JavaParser.ExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#pattern}.
-	 * @param ctx the parse tree
-	 */
-	void enterPattern(JavaParser.PatternContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#pattern}.
-	 * @param ctx the parse tree
-	 */
-	void exitPattern(JavaParser.PatternContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#lambdaExpression}.
-	 * @param ctx the parse tree
-	 */
-	void enterLambdaExpression(JavaParser.LambdaExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#lambdaExpression}.
-	 * @param ctx the parse tree
-	 */
-	void exitLambdaExpression(JavaParser.LambdaExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#lambdaParameters}.
-	 * @param ctx the parse tree
-	 */
-	void enterLambdaParameters(JavaParser.LambdaParametersContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#lambdaParameters}.
-	 * @param ctx the parse tree
-	 */
-	void exitLambdaParameters(JavaParser.LambdaParametersContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#lambdaBody}.
-	 * @param ctx the parse tree
-	 */
-	void enterLambdaBody(JavaParser.LambdaBodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#lambdaBody}.
-	 * @param ctx the parse tree
-	 */
-	void exitLambdaBody(JavaParser.LambdaBodyContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#primary}.
-	 * @param ctx the parse tree
-	 */
-	void enterPrimary(JavaParser.PrimaryContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#primary}.
-	 * @param ctx the parse tree
-	 */
-	void exitPrimary(JavaParser.PrimaryContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#switchExpression}.
-	 * @param ctx the parse tree
-	 */
-	void enterSwitchExpression(JavaParser.SwitchExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#switchExpression}.
-	 * @param ctx the parse tree
-	 */
-	void exitSwitchExpression(JavaParser.SwitchExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#switchLabeledRule}.
-	 * @param ctx the parse tree
-	 */
-	void enterSwitchLabeledRule(JavaParser.SwitchLabeledRuleContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#switchLabeledRule}.
-	 * @param ctx the parse tree
-	 */
-	void exitSwitchLabeledRule(JavaParser.SwitchLabeledRuleContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#guardedPattern}.
-	 * @param ctx the parse tree
-	 */
-	void enterGuardedPattern(JavaParser.GuardedPatternContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#guardedPattern}.
-	 * @param ctx the parse tree
-	 */
-	void exitGuardedPattern(JavaParser.GuardedPatternContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#switchRuleOutcome}.
-	 * @param ctx the parse tree
-	 */
-	void enterSwitchRuleOutcome(JavaParser.SwitchRuleOutcomeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#switchRuleOutcome}.
-	 * @param ctx the parse tree
-	 */
-	void exitSwitchRuleOutcome(JavaParser.SwitchRuleOutcomeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classType}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassType(JavaParser.ClassTypeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classType}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassType(JavaParser.ClassTypeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#creator}.
-	 * @param ctx the parse tree
-	 */
-	void enterCreator(JavaParser.CreatorContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#creator}.
-	 * @param ctx the parse tree
-	 */
-	void exitCreator(JavaParser.CreatorContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#createdName}.
-	 * @param ctx the parse tree
-	 */
-	void enterCreatedName(JavaParser.CreatedNameContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#createdName}.
-	 * @param ctx the parse tree
-	 */
-	void exitCreatedName(JavaParser.CreatedNameContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#innerCreator}.
-	 * @param ctx the parse tree
-	 */
-	void enterInnerCreator(JavaParser.InnerCreatorContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#innerCreator}.
-	 * @param ctx the parse tree
-	 */
-	void exitInnerCreator(JavaParser.InnerCreatorContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#arrayCreatorRest}.
-	 * @param ctx the parse tree
-	 */
-	void enterArrayCreatorRest(JavaParser.ArrayCreatorRestContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#arrayCreatorRest}.
-	 * @param ctx the parse tree
-	 */
-	void exitArrayCreatorRest(JavaParser.ArrayCreatorRestContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#classCreatorRest}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassCreatorRest(JavaParser.ClassCreatorRestContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#classCreatorRest}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassCreatorRest(JavaParser.ClassCreatorRestContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#explicitGenericInvocation}.
-	 * @param ctx the parse tree
-	 */
-	void enterExplicitGenericInvocation(JavaParser.ExplicitGenericInvocationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#explicitGenericInvocation}.
-	 * @param ctx the parse tree
-	 */
-	void exitExplicitGenericInvocation(JavaParser.ExplicitGenericInvocationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeArgumentsOrDiamond}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeArgumentsOrDiamond(JavaParser.TypeArgumentsOrDiamondContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeArgumentsOrDiamond}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeArgumentsOrDiamond(JavaParser.TypeArgumentsOrDiamondContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#nonWildcardTypeArgumentsOrDiamond}.
-	 * @param ctx the parse tree
-	 */
-	void enterNonWildcardTypeArgumentsOrDiamond(JavaParser.NonWildcardTypeArgumentsOrDiamondContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#nonWildcardTypeArgumentsOrDiamond}.
-	 * @param ctx the parse tree
-	 */
-	void exitNonWildcardTypeArgumentsOrDiamond(JavaParser.NonWildcardTypeArgumentsOrDiamondContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#nonWildcardTypeArguments}.
-	 * @param ctx the parse tree
-	 */
-	void enterNonWildcardTypeArguments(JavaParser.NonWildcardTypeArgumentsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#nonWildcardTypeArguments}.
-	 * @param ctx the parse tree
-	 */
-	void exitNonWildcardTypeArguments(JavaParser.NonWildcardTypeArgumentsContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeList}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeList(JavaParser.TypeListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeList}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeList(JavaParser.TypeListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeType}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeType(JavaParser.TypeTypeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeType}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeType(JavaParser.TypeTypeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#primitiveType}.
-	 * @param ctx the parse tree
-	 */
-	void enterPrimitiveType(JavaParser.PrimitiveTypeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#primitiveType}.
-	 * @param ctx the parse tree
-	 */
-	void exitPrimitiveType(JavaParser.PrimitiveTypeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#typeArguments}.
-	 * @param ctx the parse tree
-	 */
-	void enterTypeArguments(JavaParser.TypeArgumentsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#typeArguments}.
-	 * @param ctx the parse tree
-	 */
-	void exitTypeArguments(JavaParser.TypeArgumentsContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#superSuffix}.
-	 * @param ctx the parse tree
-	 */
-	void enterSuperSuffix(JavaParser.SuperSuffixContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#superSuffix}.
-	 * @param ctx the parse tree
-	 */
-	void exitSuperSuffix(JavaParser.SuperSuffixContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#explicitGenericInvocationSuffix}.
-	 * @param ctx the parse tree
-	 */
-	void enterExplicitGenericInvocationSuffix(JavaParser.ExplicitGenericInvocationSuffixContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#explicitGenericInvocationSuffix}.
-	 * @param ctx the parse tree
-	 */
-	void exitExplicitGenericInvocationSuffix(JavaParser.ExplicitGenericInvocationSuffixContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link JavaParser#arguments}.
-	 * @param ctx the parse tree
-	 */
-	void enterArguments(JavaParser.ArgumentsContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link JavaParser#arguments}.
-	 * @param ctx the parse tree
-	 */
-	void exitArguments(JavaParser.ArgumentsContext ctx);
-}
\ No newline at end of file
diff --git a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserVisitor.java b/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserVisitor.java
deleted file mode 100644
index c21b1cf..0000000
--- a/openapi/src/main/java/com/apkide/openapi/language/java/ast/JavaParserVisitor.java
+++ /dev/null
@@ -1,770 +0,0 @@
-// Generated from C:/Users/weg20/StudioProjects/apkide/openapi/src/main/java/com/apkide/openapi/language/java\JavaParser.g4
-package com.apkide.openapi.language.java.ast;
-
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-
-/**
- * This interface defines a complete generic visitor for a parse tree produced
- * by {@link JavaParser}.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-public interface JavaParserVisitor<T> extends ParseTreeVisitor<T> {
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#compilationUnit}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitCompilationUnit(JavaParser.CompilationUnitContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#packageDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitPackageDeclaration(JavaParser.PackageDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#importDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitImportDeclaration(JavaParser.ImportDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeDeclaration(JavaParser.TypeDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#modifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitModifier(JavaParser.ModifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classOrInterfaceModifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassOrInterfaceModifier(JavaParser.ClassOrInterfaceModifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#variableModifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitVariableModifier(JavaParser.VariableModifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassDeclaration(JavaParser.ClassDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeParameters}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeParameters(JavaParser.TypeParametersContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeParameter}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeParameter(JavaParser.TypeParameterContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeBound}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeBound(JavaParser.TypeBoundContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#enumDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitEnumDeclaration(JavaParser.EnumDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#enumConstants}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitEnumConstants(JavaParser.EnumConstantsContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#enumConstant}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitEnumConstant(JavaParser.EnumConstantContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#enumBodyDeclarations}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitEnumBodyDeclarations(JavaParser.EnumBodyDeclarationsContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceDeclaration(JavaParser.InterfaceDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassBody(JavaParser.ClassBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceBody(JavaParser.InterfaceBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classBodyDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassBodyDeclaration(JavaParser.ClassBodyDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#memberDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitMemberDeclaration(JavaParser.MemberDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#methodDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitMethodDeclaration(JavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#methodBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitMethodBody(JavaParser.MethodBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeTypeOrVoid}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeTypeOrVoid(JavaParser.TypeTypeOrVoidContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#genericMethodDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitGenericMethodDeclaration(JavaParser.GenericMethodDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#genericConstructorDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitGenericConstructorDeclaration(JavaParser.GenericConstructorDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#constructorDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#compactConstructorDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitCompactConstructorDeclaration(JavaParser.CompactConstructorDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#fieldDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitFieldDeclaration(JavaParser.FieldDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceBodyDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceBodyDeclaration(JavaParser.InterfaceBodyDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceMemberDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceMemberDeclaration(JavaParser.InterfaceMemberDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#constDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitConstDeclaration(JavaParser.ConstDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#constantDeclarator}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitConstantDeclarator(JavaParser.ConstantDeclaratorContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceMethodDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceMethodDeclaration(JavaParser.InterfaceMethodDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceMethodModifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceMethodModifier(JavaParser.InterfaceMethodModifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#genericInterfaceMethodDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitGenericInterfaceMethodDeclaration(JavaParser.GenericInterfaceMethodDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#interfaceCommonBodyDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInterfaceCommonBodyDeclaration(JavaParser.InterfaceCommonBodyDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#variableDeclarators}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitVariableDeclarators(JavaParser.VariableDeclaratorsContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#variableDeclarator}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitVariableDeclarator(JavaParser.VariableDeclaratorContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#variableDeclaratorId}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitVariableDeclaratorId(JavaParser.VariableDeclaratorIdContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#variableInitializer}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitVariableInitializer(JavaParser.VariableInitializerContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#arrayInitializer}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitArrayInitializer(JavaParser.ArrayInitializerContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classOrInterfaceType}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassOrInterfaceType(JavaParser.ClassOrInterfaceTypeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeArgument}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeArgument(JavaParser.TypeArgumentContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#qualifiedNameList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitQualifiedNameList(JavaParser.QualifiedNameListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#formalParameters}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitFormalParameters(JavaParser.FormalParametersContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#receiverParameter}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitReceiverParameter(JavaParser.ReceiverParameterContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#formalParameterList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitFormalParameterList(JavaParser.FormalParameterListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#formalParameter}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitFormalParameter(JavaParser.FormalParameterContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#lastFormalParameter}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLastFormalParameter(JavaParser.LastFormalParameterContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#lambdaLVTIList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLambdaLVTIList(JavaParser.LambdaLVTIListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#lambdaLVTIParameter}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLambdaLVTIParameter(JavaParser.LambdaLVTIParameterContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#qualifiedName}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitQualifiedName(JavaParser.QualifiedNameContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#literal}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLiteral(JavaParser.LiteralContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#integerLiteral}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitIntegerLiteral(JavaParser.IntegerLiteralContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#floatLiteral}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitFloatLiteral(JavaParser.FloatLiteralContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#altAnnotationQualifiedName}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAltAnnotationQualifiedName(JavaParser.AltAnnotationQualifiedNameContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotation}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotation(JavaParser.AnnotationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#elementValuePairs}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitElementValuePairs(JavaParser.ElementValuePairsContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#elementValuePair}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitElementValuePair(JavaParser.ElementValuePairContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#elementValue}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitElementValue(JavaParser.ElementValueContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#elementValueArrayInitializer}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitElementValueArrayInitializer(JavaParser.ElementValueArrayInitializerContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationTypeDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationTypeDeclaration(JavaParser.AnnotationTypeDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationTypeBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationTypeBody(JavaParser.AnnotationTypeBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationTypeElementDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationTypeElementDeclaration(JavaParser.AnnotationTypeElementDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationTypeElementRest}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationTypeElementRest(JavaParser.AnnotationTypeElementRestContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationMethodOrConstantRest}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationMethodOrConstantRest(JavaParser.AnnotationMethodOrConstantRestContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationMethodRest}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationMethodRest(JavaParser.AnnotationMethodRestContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#annotationConstantRest}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAnnotationConstantRest(JavaParser.AnnotationConstantRestContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#defaultValue}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitDefaultValue(JavaParser.DefaultValueContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#moduleDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitModuleDeclaration(JavaParser.ModuleDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#moduleBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitModuleBody(JavaParser.ModuleBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#moduleDirective}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitModuleDirective(JavaParser.ModuleDirectiveContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#requiresModifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitRequiresModifier(JavaParser.RequiresModifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#recordDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitRecordDeclaration(JavaParser.RecordDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#recordHeader}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitRecordHeader(JavaParser.RecordHeaderContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#recordComponentList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitRecordComponentList(JavaParser.RecordComponentListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#recordComponent}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitRecordComponent(JavaParser.RecordComponentContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#recordBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitRecordBody(JavaParser.RecordBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#block}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitBlock(JavaParser.BlockContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#blockStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitBlockStatement(JavaParser.BlockStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#localVariableDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLocalVariableDeclaration(JavaParser.LocalVariableDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#identifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitIdentifier(JavaParser.IdentifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeIdentifier}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeIdentifier(JavaParser.TypeIdentifierContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#localTypeDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLocalTypeDeclaration(JavaParser.LocalTypeDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#statement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitStatement(JavaParser.StatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#catchClause}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitCatchClause(JavaParser.CatchClauseContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#catchType}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitCatchType(JavaParser.CatchTypeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#finallyBlock}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitFinallyBlock(JavaParser.FinallyBlockContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#resourceSpecification}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitResourceSpecification(JavaParser.ResourceSpecificationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#resources}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitResources(JavaParser.ResourcesContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#resource}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitResource(JavaParser.ResourceContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#switchBlockStatementGroup}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitSwitchBlockStatementGroup(JavaParser.SwitchBlockStatementGroupContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#switchLabel}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitSwitchLabel(JavaParser.SwitchLabelContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#forControl}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitForControl(JavaParser.ForControlContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#forInit}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitForInit(JavaParser.ForInitContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#enhancedForControl}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitEnhancedForControl(JavaParser.EnhancedForControlContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#parExpression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitParExpression(JavaParser.ParExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#expressionList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitExpressionList(JavaParser.ExpressionListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#methodCall}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitMethodCall(JavaParser.MethodCallContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#expression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitExpression(JavaParser.ExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#pattern}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitPattern(JavaParser.PatternContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#lambdaExpression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLambdaExpression(JavaParser.LambdaExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#lambdaParameters}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLambdaParameters(JavaParser.LambdaParametersContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#lambdaBody}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLambdaBody(JavaParser.LambdaBodyContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#primary}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitPrimary(JavaParser.PrimaryContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#switchExpression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitSwitchExpression(JavaParser.SwitchExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#switchLabeledRule}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitSwitchLabeledRule(JavaParser.SwitchLabeledRuleContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#guardedPattern}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitGuardedPattern(JavaParser.GuardedPatternContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#switchRuleOutcome}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitSwitchRuleOutcome(JavaParser.SwitchRuleOutcomeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classType}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassType(JavaParser.ClassTypeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#creator}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitCreator(JavaParser.CreatorContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#createdName}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitCreatedName(JavaParser.CreatedNameContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#innerCreator}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitInnerCreator(JavaParser.InnerCreatorContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#arrayCreatorRest}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitArrayCreatorRest(JavaParser.ArrayCreatorRestContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#classCreatorRest}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassCreatorRest(JavaParser.ClassCreatorRestContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#explicitGenericInvocation}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitExplicitGenericInvocation(JavaParser.ExplicitGenericInvocationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeArgumentsOrDiamond}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeArgumentsOrDiamond(JavaParser.TypeArgumentsOrDiamondContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#nonWildcardTypeArgumentsOrDiamond}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitNonWildcardTypeArgumentsOrDiamond(JavaParser.NonWildcardTypeArgumentsOrDiamondContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#nonWildcardTypeArguments}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitNonWildcardTypeArguments(JavaParser.NonWildcardTypeArgumentsContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeList(JavaParser.TypeListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeType}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeType(JavaParser.TypeTypeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#primitiveType}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitPrimitiveType(JavaParser.PrimitiveTypeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#typeArguments}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitTypeArguments(JavaParser.TypeArgumentsContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#superSuffix}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitSuperSuffix(JavaParser.SuperSuffixContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#explicitGenericInvocationSuffix}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitExplicitGenericInvocationSuffix(JavaParser.ExplicitGenericInvocationSuffixContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link JavaParser#arguments}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitArguments(JavaParser.ArgumentsContext ctx);
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index d35c60a..d6b9132 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,5 @@
 rootProject.name = "apkide"
 include ':app'
 include ':common'
-include ':apktool'
-include ':apktool:androlib'
-include ':apktool:common'
-include ':apktool:directory'
-include ':apktool:util'
 include ':engine'
 include ':openapi'