diff --git a/app/build.gradle b/app/build.gradle
index cd343e9..ecedcea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,22 +3,19 @@ apply plugin: 'com.android.application'
 android {
     namespace 'io.vn.nguyenduck.blocktopograph'
     compileSdk 34
+
     defaultConfig {
         applicationId 'io.vn.nguyenduck.blocktopograph'
         minSdk 26
-        //noinspection OldTargetApi
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "0.0.1-dev.10032024"
-        vectorDrawables.useSupportLibrary = true
     }
 
     dataBinding {
         enabled true
     }
-    configurations {
-        implementation.exclude group: 'org.jetbrains', module: 'annotations'
-    }
+
     buildTypes {
 
         debug {
@@ -47,28 +44,9 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar', '*.so', '*.aar'], dir: 'libs')
     testImplementation 'junit:junit:4.13.2'
-    implementation project(':leveldb')
-    implementation project(':tileview')
-    implementation 'com.github.K1rakishou:Fuck-Storage-Access-Framework:v1.1.3'
-    implementation 'com.github.clans:fab:1.6.4'
-    implementation 'com.github.bmelnychuk:atv:1.2.9'
-    implementation 'com.github.woxthebox:draglistview:1.7.2'
-    implementation 'com.andreabaccega:android-edittext-validator:1.3.5'
-    implementation 'com.tomergoldst.android:tooltips:1.1.0'
-    implementation 'androidx.annotation:annotation:1.7.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'com.github.florent37:expansionpanel:1.2.4'
-    implementation 'com.github.jbvincey:nestedradiobutton:1.1'
-    implementation 'net.lingala.zip4j:zip4j:2.11.5'
-    // do NOT accidentally "up"-grade to the 2003 version
-    //noinspection GradleDependency
-    implementation 'commons-io:commons-io:2.11.0'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
-    implementation 'com.google.guava:guava:33.0.0-jre'
+    implementation 'org.jetbrains:annotations:24.0.0'
+    implementation 'androidx.annotation:annotation:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
 }
 
diff --git a/app/src/main/java/io/vn/nguyenduck/blocktopograph/MainActivity.java b/app/src/main/java/io/vn/nguyenduck/blocktopograph/MainActivity.java
index 97b679b..c35ff78 100644
--- a/app/src/main/java/io/vn/nguyenduck/blocktopograph/MainActivity.java
+++ b/app/src/main/java/io/vn/nguyenduck/blocktopograph/MainActivity.java
@@ -1,33 +1,26 @@
 package io.vn.nguyenduck.blocktopograph;
 
+import static io.vn.nguyenduck.blocktopograph.Constants.DOC_AUTHORITY;
+import static io.vn.nguyenduck.blocktopograph.Constants.DOC_DATA_PATH;
+import static io.vn.nguyenduck.blocktopograph.Constants.MINECRAFT_APP_ID;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.DocumentsContract;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-import androidx.annotation.RequiresApi;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.documentfile.provider.DocumentFile;
-import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.Objects;
 import java.util.StringJoiner;
 
-import static io.vn.nguyenduck.blocktopograph.Constants.*;
-import static io.vn.nguyenduck.blocktopograph.Logger.LOGGER;
-
 public class MainActivity extends AppCompatActivity {
     private static final int REQ_FOLDER_PERMISSION = 0x00a;
     private static final String ACCESS_URI = "access_uri";
diff --git a/app/src/main/java/io/vn/nguyenduck/blocktopograph/WorldLevelData.java b/app/src/main/java/io/vn/nguyenduck/blocktopograph/WorldLevelData.java
index 321bc22..c1e37db 100644
--- a/app/src/main/java/io/vn/nguyenduck/blocktopograph/WorldLevelData.java
+++ b/app/src/main/java/io/vn/nguyenduck/blocktopograph/WorldLevelData.java
@@ -1,24 +1,27 @@
 package io.vn.nguyenduck.blocktopograph;
 
+import static java.lang.Math.log10;
+import static java.lang.Math.pow;
+import static io.vn.nguyenduck.blocktopograph.Constants.WORLD_ICON_PREFIX;
+import static io.vn.nguyenduck.blocktopograph.Constants.WORLD_LEVELNAME_FILE;
+import static io.vn.nguyenduck.blocktopograph.Constants.WORLD_LEVEL_DATA_FILE;
+import static io.vn.nguyenduck.blocktopograph.DocumentUtils.contentResolver;
+import static io.vn.nguyenduck.blocktopograph.DocumentUtils.findFiles;
+
 import android.net.Uri;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
-import io.vn.nguyenduck.blocktopograph.nbt.NbtInputStream;
-import io.vn.nguyenduck.blocktopograph.nbt.Type;
-import io.vn.nguyenduck.blocktopograph.nbt.tag.Tag;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 
-import static io.vn.nguyenduck.blocktopograph.Constants.*;
-import static io.vn.nguyenduck.blocktopograph.DocumentUtils.*;
-import static io.vn.nguyenduck.blocktopograph.Logger.LOGGER;
-import static io.vn.nguyenduck.blocktopograph.nbt.Type.*;
-import static java.lang.Math.log10;
-import static java.lang.Math.pow;
+import io.vn.nguyenduck.blocktopograph.nbt.NbtInputStream;
+import io.vn.nguyenduck.blocktopograph.nbt.tag.Tag;
 
 public class WorldLevelData {
 
@@ -87,7 +90,6 @@ private void readAllTags() {
 
             NbtInputStream data = new NbtInputStream(dataIS);
             Tag t = data.readTag();
-//            LOGGER.info(t.toString());
             dataBundle = NbtUtils.toBundle(t);
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/IntTag.java b/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/IntTag.java
index a24b954..70870d9 100644
--- a/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/IntTag.java
+++ b/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/IntTag.java
@@ -1,10 +1,10 @@
 package io.vn.nguyenduck.blocktopograph.nbt.tag;
 
+import static io.vn.nguyenduck.blocktopograph.nbt.Type.INT;
+
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import io.vn.nguyenduck.blocktopograph.nbt.Type;
 
-import static io.vn.nguyenduck.blocktopograph.nbt.Type.INT;
+import io.vn.nguyenduck.blocktopograph.nbt.Type;
 
 public class IntTag implements Tag {
     private final String name;
diff --git a/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/ListTag.java b/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/ListTag.java
index 2d4732d..0d1e147 100644
--- a/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/ListTag.java
+++ b/app/src/main/java/io/vn/nguyenduck/blocktopograph/nbt/tag/ListTag.java
@@ -1,17 +1,13 @@
 package io.vn.nguyenduck.blocktopograph.nbt.tag;
 
+import static io.vn.nguyenduck.blocktopograph.nbt.Type.LIST;
+
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import io.vn.nguyenduck.blocktopograph.nbt.Type;
-import org.checkerframework.checker.units.qual.A;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.StringJoiner;
-import java.util.stream.Stream;
 
-import static io.vn.nguyenduck.blocktopograph.Logger.LOGGER;
-import static io.vn.nguyenduck.blocktopograph.nbt.Type.LIST;
+import io.vn.nguyenduck.blocktopograph.nbt.Type;
 
 public class ListTag implements Tag {
     private final String name;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 751291f..d2d3d07 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -96,15 +96,15 @@
 		<item name="android:textColor">@color/colorAccent</item>
 	</style>
 
-	<style name="MenuButtonsStyle">
-		<item name="fab_size">mini</item>
-		<item name="fab_showAnimation">@anim/jump_from_down</item>
-		<item name="fab_hideAnimation">@anim/jump_to_down</item>
-		<item name="fab_shadowColor">#444</item>
-		<item name="fab_colorNormal">@color/colorAccent</item>
-		<item name="fab_colorPressed">@color/colorAccentDark</item>
-		<item name="fab_colorRipple">#fff</item>
-	</style>
+<!--	<style name="MenuButtonsStyle">-->
+<!--		<item name="fab_size">mini</item>-->
+<!--		<item name="fab_showAnimation">@anim/jump_from_down</item>-->
+<!--		<item name="fab_hideAnimation">@anim/jump_to_down</item>-->
+<!--		<item name="fab_shadowColor">#444</item>-->
+<!--		<item name="fab_colorNormal">@color/colorAccent</item>-->
+<!--		<item name="fab_colorPressed">@color/colorAccentDark</item>-->
+<!--		<item name="fab_colorRipple">#fff</item>-->
+<!--	</style>-->
 
 	<style name="WaterMarkTextStyle">
 		<item name="android:paddingLeft">4dp</item>
diff --git a/build.gradle b/build.gradle
index 5c9b22b..76abad6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-//        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
+        classpath 'com.android.tools.build:gradle:8.5.0'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index cdc6d8e..ec6a4e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@ org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.unsafe.configuration-cache=true
+org.gradle.unsafe.configuration-cache=false
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9bcdbf9..f9f83f5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/leveldb/build.gradle b/leveldb/build.gradle
deleted file mode 100644
index c1d1b0a..0000000
--- a/leveldb/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 29
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 29
-        ndk {
-            abiFilters 'armeabi-v7a', 'x86_64', 'x86', 'arm64-v8a'
-        }
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    externalNativeBuild {
-        ndkBuild {
-            path "src/main/cpp/Android.mk"
-        }
-    }
-    namespace 'com.litl.leveldb'
-
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar', '*.so'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
-}
\ No newline at end of file
diff --git a/leveldb/proguard-rules.pro b/leveldb/proguard-rules.pro
deleted file mode 100644
index e3f908e..0000000
--- a/leveldb/proguard-rules.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in *android*/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# 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 *;
-#}
-
-# Keep LevelDB classes, native methods may not be obfuscated!
--keep public class com.litl.leveldb.** {
-  public private protected *;
-}
diff --git a/leveldb/src/main/AndroidManifest.xml b/leveldb/src/main/AndroidManifest.xml
deleted file mode 100644
index f1bb078..0000000
--- a/leveldb/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-
-</manifest>
\ No newline at end of file
diff --git a/leveldb/src/main/cpp/Android.mk b/leveldb/src/main/cpp/Android.mk
deleted file mode 100644
index 60619bd..0000000
--- a/leveldb/src/main/cpp/Android.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE            := leveldbjni
-
-LOCAL_C_INCLUDES        := $(LOCAL_PATH)/leveldb-mcpe\
-                            $(LOCAL_PATH)/leveldb-mcpe/include\
-                            $(LOCAL_PATH)/leveldb-mcpe/include/leveldb
-
-LOCAL_CPP_EXTENSION     := .cc
-
-LOCAL_CFLAGS            := -DLEVELDB_PLATFORM_ANDROID -std=gnu++11 -DDLLX=
-
-#Asan
-#LOCAL_CFLAGS            += -fsanitize=leak -fno-omit-frame-pointer
-#LOCAL_LDFLAGS           := -fsanitize=leak
-
-LOCAL_SRC_FILES         := com_litl_leveldb_DB.cc\
-                            com_litl_leveldb_Iterator.cc\
-                            com_litl_leveldb_WriteBatch.cc\
-                            leveldbjni.cc\
-
-LOCAL_STATIC_LIBRARIES  +=  leveldb-mcpe
-
-LOCAL_LDLIBS            +=  -llog -ldl -lz
-
-LOCAL_CPP_FEATURES      += exceptions
-
-#Asan
-#LD_PRELOAD              += libclang_rt.asan-i686-android.so
-
-include $(BUILD_SHARED_LIBRARY)
-
-####################################################################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE            := leveldb-mcpe
-
-LOCAL_CFLAGS            := -O3 -D_REENTRANT -DOS_ANDROID -DLEVELDB_PLATFORM_POSIX\
-                            -DNDEBUG -std=gnu++11 -DDLLX=
-
-LOCAL_CPP_EXTENSION     := .cc
-
-LOCAL_C_INCLUDES        := $(LOCAL_PATH)/leveldb-mcpe/include\
-                            $(LOCAL_PATH)/leveldb-mcpe/include/leveldb\
-                            $(LOCAL_PATH)/leveldb-mcpe
-
-LOCAL_SRC_FILES         := \
-        leveldb-mcpe/db/builder.cc                  leveldb-mcpe/db/c.cc\
-        leveldb-mcpe/db/dbformat.cc                 leveldb-mcpe/db/db_impl.cc\
-        leveldb-mcpe/db/db_iter.cc                  leveldb-mcpe/db/dumpfile.cc\
-        leveldb-mcpe/db/filename.cc                 leveldb-mcpe/db/log_reader.cc\
-        leveldb-mcpe/db/log_writer.cc               leveldb-mcpe/db/memtable.cc\
-        leveldb-mcpe/db/repair.cc                   leveldb-mcpe/db/table_cache.cc\
-        leveldb-mcpe/db/version_edit.cc             leveldb-mcpe/db/version_set.cc\
-        leveldb-mcpe/db/write_batch.cc              leveldb-mcpe/db/zlib_compressor.cc\
-        leveldb-mcpe/table/block_builder.cc         leveldb-mcpe/table/block.cc\
-        leveldb-mcpe/table/filter_block.cc          leveldb-mcpe/table/format.cc\
-        leveldb-mcpe/table/iterator.cc              leveldb-mcpe/table/merger.cc\
-        leveldb-mcpe/table/table_builder.cc         leveldb-mcpe/table/table.cc\
-        leveldb-mcpe/table/two_level_iterator.cc    leveldb-mcpe/util/arena.cc\
-        leveldb-mcpe/util/bloom.cc                  leveldb-mcpe/util/cache.cc\
-        leveldb-mcpe/util/coding.cc                 leveldb-mcpe/util/comparator.cc\
-        leveldb-mcpe/util/crc32c.cc                 leveldb-mcpe/util/env_boost.cc\
-        leveldb-mcpe/util/env.cc                    leveldb-mcpe/util/env_posix.cc\
-        leveldb-mcpe/util/env_win.cc                leveldb-mcpe/util/filter_policy.cc\
-        leveldb-mcpe/util/hash.cc                   leveldb-mcpe/util/histogram.cc\
-        leveldb-mcpe/util/logging.cc                leveldb-mcpe/util/options.cc\
-        leveldb-mcpe/util/status.cc                 leveldb-mcpe/util/win_logger.cc\
-        leveldb-mcpe/port/port_posix.cc             leveldb-mcpe/port/port_posix_sse.cc
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/leveldb/src/main/cpp/Application.mk b/leveldb/src/main/cpp/Application.mk
deleted file mode 100644
index 5e6279e..0000000
--- a/leveldb/src/main/cpp/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_PLATFORM=android-16
-
-APP_STL := c++_static
-
-#Asan
-#APP_STL := c++_shared
diff --git a/leveldb/src/main/cpp/com_litl_leveldb_DB.cc b/leveldb/src/main/cpp/com_litl_leveldb_DB.cc
deleted file mode 100644
index f90db56..0000000
--- a/leveldb/src/main/cpp/com_litl_leveldb_DB.cc
+++ /dev/null
@@ -1,378 +0,0 @@
-#include <string.h>
-#include <jni.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <android/log.h>
-
-#include "leveldbjni.h"
-
-#include "leveldb/db.h"
-#include "leveldb/write_batch.h"
-#include "leveldb/zlib_compressor.h"
-#include "leveldb/filter_policy.h"
-#include "leveldb/cache.h"
-#include "leveldb/options.h"
-#include "leveldb/decompress_allocator.h"
-#include "leveldb/env.h"
-
-static jmethodID gByteBuffer_isDirectMethodID;
-static jmethodID gByteBuffer_positionMethodID;
-static jmethodID gByteBuffer_limitMethodID;
-static jmethodID gByteBuffer_arrayMethodID;
-
-static leveldb::ZlibCompressor *zlibCompressorInstance;
-static leveldb::ZlibCompressorRaw *zlibCompressorRawInstance;
-static leveldb::Logger *nullLoggerInstance;
-static leveldb::DecompressAllocator *decompressAllocatorInstance;
-
-class NullLogger : public leveldb::Logger {
-public:
-    void Logv(const char *, va_list) override {
-    }
-};
-
-static void initDb(JNIEnv *env) {
-    static bool gInited;
-
-    if (!gInited) {
-        jclass byteBuffer_Clazz = env->FindClass("java/nio/ByteBuffer");
-        gByteBuffer_isDirectMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                        "isDirect", "()Z");
-        gByteBuffer_positionMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                        "position", "()I");
-        gByteBuffer_limitMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                     "limit", "()I");
-        gByteBuffer_arrayMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                     "array", "()[B");
-        gInited = true;
-    }
-}
-
-static jlong
-nativeOpen(JNIEnv *env,
-           jclass clazz,
-           jstring dbpath) {
-
-    initDb(env);
-
-    const char *path = env->GetStringUTFChars(dbpath, 0);
-    LOGI("Opening database %s", path);
-
-    leveldb::DB *db;
-    leveldb::Options options;
-    options.create_if_missing = true;
-    options.paranoid_checks = true;
-    if (zlibCompressorInstance == nullptr)
-        zlibCompressorInstance = new leveldb::ZlibCompressor();
-    if (zlibCompressorRawInstance == nullptr)
-        zlibCompressorRawInstance = new leveldb::ZlibCompressorRaw(-1);
-    if (nullLoggerInstance == nullptr)
-        nullLoggerInstance = new NullLogger();
-    if (decompressAllocatorInstance == nullptr)
-        decompressAllocatorInstance = new leveldb::DecompressAllocator();
-
-    //create a bloom filter to quickly tell if a key is in the database or not
-    options.filter_policy = leveldb::NewBloomFilterPolicy(10);
-
-    //create a 40 mb cache (we use this on ~1gb devices)
-    options.block_cache = leveldb::NewLRUCache(40 * 1024 * 1024);
-
-    //create a 4mb write buffer, to improve compression and touch the disk less
-    options.write_buffer_size = 4 * 1024 * 1024;
-
-    //disable internal logging. The default logger will still print out things to a file
-    options.info_log = nullLoggerInstance;
-
-    //use the new raw-zip compressor to write (and read)
-    options.compressors[0] = zlibCompressorRawInstance;
-
-    options.compressors[1] = zlibCompressorInstance;
-
-    leveldb::Status status = leveldb::DB::Open(options, path, &db);
-    env->ReleaseStringUTFChars(dbpath, path);
-
-    if (!status.ok()) {
-        throwException(env, status);
-    } else {
-        LOGI("Opened database");
-    }
-
-    return reinterpret_cast<jlong>(db);
-}
-
-static jstring nativeFixLdb(JNIEnv *env,
-                            jclass clazz,
-                            jstring dbpath) {
-
-    initDb(env);
-
-    const char *path = env->GetStringUTFChars(dbpath, 0);
-    LOGI("Fixing database %s", path);
-
-    leveldb::DB *db = nullptr;
-    leveldb::Options options;
-    options.create_if_missing = false;
-    options.paranoid_checks = true;
-    if (zlibCompressorInstance == nullptr)
-        zlibCompressorInstance = new leveldb::ZlibCompressor();
-    if (zlibCompressorRawInstance == nullptr)
-        zlibCompressorRawInstance = new leveldb::ZlibCompressorRaw(-1);
-    if (nullLoggerInstance == nullptr)
-        nullLoggerInstance = new NullLogger();
-    if (decompressAllocatorInstance == nullptr)
-        decompressAllocatorInstance = new leveldb::DecompressAllocator();
-
-    //create a bloom filter to quickly tell if a key is in the database or not
-    options.filter_policy = leveldb::NewBloomFilterPolicy(10);
-
-    //create a 40 mb cache (we use this on ~1gb devices)
-    options.block_cache = leveldb::NewLRUCache(40 * 1024 * 1024);
-
-    //create a 4mb write buffer, to improve compression and touch the disk less
-    options.write_buffer_size = 4 * 1024 * 1024;
-
-    //disable internal logging. The default logger will still print out things to a file
-    options.info_log = nullLoggerInstance;
-
-    //use the new raw-zip compressor to write (and read)
-    options.compressors[0] = zlibCompressorRawInstance;
-
-    options.compressors[1] = zlibCompressorInstance;
-
-    leveldb::Status status = leveldb::RepairDB(path, options);
-    env->ReleaseStringUTFChars(dbpath, path);
-
-    delete db;
-
-    return env->NewStringUTF(status.ToString().c_str());
-}
-
-static void
-nativeClose(JNIEnv *env,
-            jclass clazz,
-            jlong dbPtr) {
-    auto *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-    delete db;
-
-    LOGI("Database closed");
-}
-
-static jbyteArray
-nativeGet(JNIEnv *env,
-          jclass clazz,
-          jlong dbPtr,
-          jlong snapshotPtr,
-          jbyteArray keyObj) {
-    auto *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-    leveldb::ReadOptions options = leveldb::ReadOptions();
-    options.decompress_allocator = decompressAllocatorInstance;
-    //options.snapshot = reinterpret_cast<leveldb::Snapshot *>(snapshotPtr);
-
-    size_t keyLen = static_cast<size_t>(env->GetArrayLength(keyObj));
-    jbyte *buffer = env->GetByteArrayElements(keyObj, NULL);
-    jbyteArray result;
-
-    leveldb::Slice key = leveldb::Slice((const char *) buffer, keyLen);
-    //leveldb::Iterator *iter = db->NewIterator(options);
-    //iter->Seek(key);
-    //if (iter->Valid() && key == iter->key()) {
-    //leveldb::Slice value = iter->value();
-    std::string str;
-    leveldb::Status status = db->Get(options, key, &str);
-    env->ReleaseByteArrayElements(keyObj, buffer, JNI_ABORT);
-    if (status.ok()) {
-        size_t len = str.size();
-        result = env->NewByteArray(static_cast<jsize>(len));
-        env->SetByteArrayRegion(result, 0, static_cast<jsize>(len), (const jbyte *) str.c_str());
-    } else if (status.IsNotFound())result = NULL;
-    else {
-        throwException(env, status);
-        result = NULL;
-    }
-
-    //} else {
-    //result = NULL;
-    //}
-    //delete iter;
-
-    return result;
-}
-
-static jbyteArray
-nativeGetBB(JNIEnv *env,
-            jclass clazz,
-            jlong dbPtr,
-            jlong snapshotPtr,
-            jobject keyObj) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-    leveldb::ReadOptions options = leveldb::ReadOptions();
-    options.snapshot = reinterpret_cast<leveldb::Snapshot *>(snapshotPtr);
-
-    jint keyPos = env->CallIntMethod(keyObj, gByteBuffer_positionMethodID);
-    jint keyLimit = env->CallIntMethod(keyObj, gByteBuffer_limitMethodID);
-    jboolean keyIsDirect = env->CallBooleanMethod(keyObj, gByteBuffer_isDirectMethodID);
-    jbyteArray keyArray;
-    void *key;
-    if (keyIsDirect) {
-        key = env->GetDirectBufferAddress(keyObj);
-        keyArray = NULL;
-    } else {
-        keyArray = (jbyteArray) env->CallObjectMethod(keyObj, gByteBuffer_arrayMethodID);
-        key = (void *) env->GetByteArrayElements(keyArray, NULL);
-    }
-
-    jbyteArray result;
-    leveldb::Slice keySlice = leveldb::Slice((const char *) key + keyPos,
-                                             static_cast<size_t>(keyLimit - keyPos));
-    leveldb::Iterator *iter = db->NewIterator(options);
-    iter->Seek(keySlice);
-    if (iter->Valid() && keySlice == iter->key()) {
-        leveldb::Slice value = iter->value();
-        size_t len = value.size();
-        result = env->NewByteArray(static_cast<jsize>(len));
-        env->SetByteArrayRegion(result, 0, static_cast<jsize>(len), (const jbyte *) value.data());
-    } else {
-        result = NULL;
-    }
-
-    if (keyArray) {
-        env->ReleaseByteArrayElements(keyArray, (jbyte *) key, JNI_ABORT);
-    }
-
-    delete iter;
-
-    return result;
-}
-
-static void
-nativePut(JNIEnv *env,
-          jclass clazz,
-          jlong dbPtr,
-          jbyteArray keyObj,
-          jbyteArray valObj) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-
-    size_t keyLen = env->GetArrayLength(keyObj);
-    jbyte *keyBuf = env->GetByteArrayElements(keyObj, NULL);
-
-    size_t valLen = env->GetArrayLength(valObj);
-    jbyte *valBuf = env->GetByteArrayElements(valObj, NULL);
-
-    leveldb::Status status = db->Put(leveldb::WriteOptions(),
-                                     leveldb::Slice((const char *) keyBuf, keyLen),
-                                     leveldb::Slice((const char *) valBuf, valLen));
-
-    env->ReleaseByteArrayElements(keyObj, keyBuf, JNI_ABORT);
-    env->ReleaseByteArrayElements(valObj, valBuf, JNI_ABORT);
-
-    if (!status.ok()) {
-        throwException(env, status);
-    }
-}
-
-static void
-nativeDelete(JNIEnv *env,
-             jclass clazz,
-             jlong dbPtr,
-             jbyteArray keyObj) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-
-    size_t keyLen = env->GetArrayLength(keyObj);
-    jbyte *buffer = env->GetByteArrayElements(keyObj, NULL);
-
-    leveldb::Status status = db->Delete(leveldb::WriteOptions(),
-                                        leveldb::Slice((const char *) buffer, keyLen));
-    env->ReleaseByteArrayElements(keyObj, buffer, JNI_ABORT);
-
-    if (!status.ok()) {
-        throwException(env, status);
-    }
-}
-
-static void
-nativeWrite(JNIEnv *env,
-            jclass clazz,
-            jlong dbPtr,
-            jlong batchPtr) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-
-    leveldb::WriteBatch *batch = (leveldb::WriteBatch *) batchPtr;
-    leveldb::Status status = db->Write(leveldb::WriteOptions(), batch);
-    if (!status.ok()) {
-        throwException(env, status);
-    }
-}
-
-static jlong
-nativeIterator(JNIEnv *env,
-               jclass clazz,
-               jlong dbPtr,
-               jlong snapshotPtr) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-    leveldb::ReadOptions options = leveldb::ReadOptions();
-    options.snapshot = reinterpret_cast<leveldb::Snapshot *>(snapshotPtr);
-
-    leveldb::Iterator *iter = db->NewIterator(options);
-    return reinterpret_cast<jlong>(iter);
-}
-
-static jlong
-nativeGetSnapshot(JNIEnv *env,
-                  jclass clazz,
-                  jlong dbPtr) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-    const leveldb::Snapshot *snapshot = db->GetSnapshot();
-    return reinterpret_cast<jlong>(snapshot);
-}
-
-static void
-nativeReleaseSnapshot(JNIEnv *env,
-                      jclass clazz,
-                      jlong dbPtr,
-                      jlong snapshotPtr) {
-    leveldb::DB *db = reinterpret_cast<leveldb::DB *>(dbPtr);
-    const leveldb::Snapshot *snapshot = reinterpret_cast<leveldb::Snapshot *>(snapshotPtr);
-    db->ReleaseSnapshot(snapshot);
-}
-
-static void
-nativeDestroy(JNIEnv *env,
-              jclass clazz,
-              jstring dbpath) {
-    const char *path = env->GetStringUTFChars(dbpath, 0);
-    leveldb::Options options;
-    options.create_if_missing = true;
-    leveldb::Status status = DestroyDB(path, options);
-    if (!status.ok()) {
-        throwException(env, status);
-    }
-}
-
-static JNINativeMethod sMethods[] =
-    {
-        {"nativeOpen",   "(Ljava/lang/String;)J",       (void *) nativeOpen},
-        {"fixLdb",       "(Ljava/lang/String;)"
-                         "Ljava/lang/String;",          (void *) nativeFixLdb},
-        {"nativeClose",  "(J)V",                        (void *) nativeClose},
-        {"nativeGet",    "(JJ[B)[B",                    (void *) nativeGet},
-        {"nativeGet",    "(JJLjava/nio/ByteBuffer;)[B", (void *) nativeGetBB},
-        {"nativePut",    "(J[B[B)V",                    (void *) nativePut},
-        {"nativeDelete", "(J[B)V",                      (void *) nativeDelete},
-        {"nativeWrite",  "(JJ)V",                       (void *) nativeWrite},
-        {"nativeIterator",        "(JJ)J",                       (void *) nativeIterator},
-        {"nativeGetSnapshot",     "(J)J",                        (void *) nativeGetSnapshot},
-        {"nativeReleaseSnapshot", "(JJ)V",                       (void *) nativeReleaseSnapshot},
-        {"nativeDestroy",         "(Ljava/lang/String;)V",       (void *) nativeDestroy}
-    };
-
-int
-register_com_litl_leveldb_DB(JNIEnv *env) {
-    jclass clazz = env->FindClass("com/litl/leveldb/DB");
-    if (!clazz) {
-        LOGE("Can't find class com.litl.leveldb.DB");
-        return 0;
-    }
-
-    return env->RegisterNatives(clazz, sMethods, NELEM(sMethods));
-}
diff --git a/leveldb/src/main/cpp/com_litl_leveldb_Iterator.cc b/leveldb/src/main/cpp/com_litl_leveldb_Iterator.cc
deleted file mode 100644
index fd39b38..0000000
--- a/leveldb/src/main/cpp/com_litl_leveldb_Iterator.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <jni.h>
-#include <android/log.h>
-
-#include "leveldbjni.h"
-
-#include "leveldb/iterator.h"
-
-static void
-nativeDestroy(JNIEnv* env,
-              jclass clazz,
-              jlong ptr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(ptr);
-
-    delete iter;
-}
-
-static void
-nativeSeekToFirst(JNIEnv* env,
-                  jclass clazz,
-                  jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    iter->SeekToFirst();
-}
-
-static void
-nativeSeekToLast(JNIEnv* env,
-                  jclass clazz,
-                  jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    iter->SeekToLast();
-}
-
-static void
-nativeSeek(JNIEnv* env,
-           jclass clazz,
-           jlong iterPtr,
-           jbyteArray keyObj)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-
-    size_t keyLen = env->GetArrayLength(keyObj);
-    jbyte *buffer = env->GetByteArrayElements(keyObj, NULL);
-
-    iter->Seek(leveldb::Slice((const char *)buffer, keyLen));
-    env->ReleaseByteArrayElements(keyObj, buffer, JNI_ABORT);
-}
-
-static jboolean
-nativeValid(JNIEnv* env,
-            jclass clazz,
-            jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    return iter->Valid();
-}
-
-static void
-nativeNext(JNIEnv* env,
-           jclass clazz,
-           jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    iter->Next();
-}
-
-static void
-nativePrev(JNIEnv* env,
-           jclass clazz,
-           jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    iter->Prev();
-}
-
-static jbyteArray
-nativeKey(JNIEnv* env,
-          jclass clazz,
-          jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    leveldb::Slice key = iter->key();
-
-    size_t len = key.size();
-    jbyteArray result = env->NewByteArray(len);
-    env->SetByteArrayRegion(result, 0, len, (const jbyte *) key.data());
-    return result;
-}
-
-static jbyteArray
-nativeValue(JNIEnv* env,
-            jclass clazz,
-            jlong iterPtr)
-{
-    leveldb::Iterator* iter = reinterpret_cast<leveldb::Iterator*>(iterPtr);
-    leveldb::Slice value = iter->value();
-
-    size_t len = value.size();
-    jbyteArray result = env->NewByteArray(len);
-    env->SetByteArrayRegion(result, 0, len, (const jbyte *) value.data());
-    return result;
-}
-
-static JNINativeMethod sMethods[] =
-{
-        { "nativeDestroy", "(J)V", (void*) nativeDestroy },
-        { "nativeSeekToFirst", "(J)V", (void*) nativeSeekToFirst },
-        { "nativeSeekToLast", "(J)V", (void*) nativeSeekToLast },
-        { "nativeSeek", "(J[B)V", (void*) nativeSeek },
-        { "nativeValid", "(J)Z", (void*) nativeValid },
-        { "nativeNext", "(J)V", (void*) nativeNext },
-        { "nativePrev", "(J)V", (void*) nativePrev },
-        { "nativeKey", "(J)[B", (void*) nativeKey },
-        { "nativeValue", "(J)[B", (void*) nativeValue }
-};
-
-int
-register_com_litl_leveldb_Iterator(JNIEnv *env) {
-    jclass clazz = env->FindClass("com/litl/leveldb/Iterator");
-    if (!clazz) {
-        LOGE("Can't find class com.litl.leveldb.Iterator");
-        return 0;
-    }
-
-    return env->RegisterNatives(clazz, sMethods, NELEM(sMethods));
-}
diff --git a/leveldb/src/main/cpp/com_litl_leveldb_WriteBatch.cc b/leveldb/src/main/cpp/com_litl_leveldb_WriteBatch.cc
deleted file mode 100644
index abd23db..0000000
--- a/leveldb/src/main/cpp/com_litl_leveldb_WriteBatch.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-#include <jni.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <android/log.h>
-
-#include "leveldbjni.h"
-
-#include "leveldb/write_batch.h"
-
-static jmethodID gByteBuffer_isDirectMethodID;
-static jmethodID gByteBuffer_positionMethodID;
-static jmethodID gByteBuffer_limitMethodID;
-static jmethodID gByteBuffer_arrayMethodID;
-
-static jlong
-nativeCreate(JNIEnv* env,
-             jclass clazz)
-{
-    static bool gInited;
-
-    if (!gInited) {
-      jclass byteBuffer_Clazz = env->FindClass("java/nio/ByteBuffer");
-      gByteBuffer_isDirectMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                      "isDirect", "()Z");
-      gByteBuffer_positionMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                      "position", "()I");
-      gByteBuffer_limitMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                   "limit", "()I");
-      gByteBuffer_arrayMethodID = env->GetMethodID(byteBuffer_Clazz,
-                                                   "array", "()[B");
-      gInited = true;
-    }
-
-    leveldb::WriteBatch* batch = new leveldb::WriteBatch();
-    return reinterpret_cast<jlong>(batch);
-}
-
-static void
-nativeDestroy(JNIEnv* env,
-              jclass clazz,
-              jlong ptr)
-{
-    leveldb::WriteBatch* batch = reinterpret_cast<leveldb::WriteBatch*>(ptr);
-
-    delete batch;
-}
-
-static void
-nativeDelete(JNIEnv* env,
-             jclass clazz,
-             jlong ptr,
-             jobject buffer)
-{
-    leveldb::WriteBatch* batch = reinterpret_cast<leveldb::WriteBatch*>(ptr);
-
-    jint pos = env->CallIntMethod(buffer, gByteBuffer_positionMethodID);
-    jint limit = env->CallIntMethod(buffer, gByteBuffer_limitMethodID);
-    jboolean isDirect = env->CallBooleanMethod(buffer, gByteBuffer_isDirectMethodID);
-    if (isDirect) {
-        const char *bytes = (const char *) env->GetDirectBufferAddress(buffer);
-        batch->Delete(leveldb::Slice(bytes + pos, limit - pos));
-    } else {
-        jbyteArray array = (jbyteArray) env->CallObjectMethod(buffer, gByteBuffer_arrayMethodID);
-        jbyte *bytes = env->GetByteArrayElements(array, NULL);
-        batch->Delete(leveldb::Slice((const char *) bytes + pos, limit - pos));
-        env->ReleaseByteArrayElements(array, bytes, JNI_ABORT);
-    }
-}
-
-static void
-nativePut(JNIEnv* env,
-          jclass clazz,
-          jlong ptr,
-          jobject keyObj,
-          jobject valObj)
-{
-    leveldb::WriteBatch* batch = reinterpret_cast<leveldb::WriteBatch*>(ptr);
-
-    jint keyPos = env->CallIntMethod(keyObj, gByteBuffer_positionMethodID);
-    jint keyLimit = env->CallIntMethod(keyObj, gByteBuffer_limitMethodID);
-    jboolean keyIsDirect = env->CallBooleanMethod(keyObj, gByteBuffer_isDirectMethodID);
-    jbyteArray keyArray;
-    void* key;
-    if (keyIsDirect) {
-        key = env->GetDirectBufferAddress(keyObj);
-        keyArray = NULL;
-    } else {
-        keyArray = (jbyteArray) env->CallObjectMethod(keyObj, gByteBuffer_arrayMethodID);
-        key = (void*) env->GetByteArrayElements(keyArray, NULL);
-    }
-
-    jint valPos = env->CallIntMethod(valObj, gByteBuffer_positionMethodID);
-    jint valLimit = env->CallIntMethod(valObj, gByteBuffer_limitMethodID);
-    jboolean valIsDirect = env->CallBooleanMethod(valObj, gByteBuffer_isDirectMethodID);
-    jbyteArray valArray;
-    void* val;
-    if (valIsDirect) {
-        val = env->GetDirectBufferAddress(valObj);
-        valArray = NULL;
-    } else {
-        valArray = (jbyteArray) env->CallObjectMethod(valObj, gByteBuffer_arrayMethodID);
-        val = (void*) env->GetByteArrayElements(valArray, NULL);
-    }
-
-    batch->Put(leveldb::Slice((const char *) key + keyPos, keyLimit - keyPos),
-               leveldb::Slice((const char *) val + valPos, valLimit - valPos));
-
-    if (keyArray) {
-        env->ReleaseByteArrayElements(keyArray, (jbyte*) key, JNI_ABORT);
-    }
-    if (valArray) {
-        env->ReleaseByteArrayElements(valArray, (jbyte*) val, JNI_ABORT);
-    }
-}
-
-static void
-nativeClear(JNIEnv* env,
-            jclass clazz,
-            jlong ptr)
-{
-    leveldb::WriteBatch* batch = reinterpret_cast<leveldb::WriteBatch*>(ptr);
-    batch->Clear();
-}
-
-static JNINativeMethod sMethods[] =
-{
-        { "nativeCreate", "()J", (void*) nativeCreate },
-        { "nativeDestroy", "(J)V", (void*) nativeDestroy },
-        { "nativeDelete", "(JLjava/nio/ByteBuffer;)V", (void*) nativeDelete },
-        { "nativePut", "(JLjava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)V", (void*) nativePut },
-        { "nativeClear", "(J)V", (void*) nativeClear }
-};
-
-int
-register_com_litl_leveldb_WriteBatch(JNIEnv *env) {
-    jclass clazz = env->FindClass("com/litl/leveldb/WriteBatch");
-    if (!clazz) {
-        LOGE("Can't find class com.litl.leveldb.WriteBatch");
-        return 0;
-    }
-
-    return env->RegisterNatives(clazz, sMethods, NELEM(sMethods));
-}
diff --git a/leveldb/src/main/cpp/leveldb-mcpe b/leveldb/src/main/cpp/leveldb-mcpe
deleted file mode 160000
index 8fb637b..0000000
--- a/leveldb/src/main/cpp/leveldb-mcpe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8fb637be077c3747cae1a8aecff1a14570d39921
diff --git a/leveldb/src/main/cpp/leveldbjni.cc b/leveldb/src/main/cpp/leveldbjni.cc
deleted file mode 100644
index 70cffaa..0000000
--- a/leveldb/src/main/cpp/leveldbjni.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "leveldbjni.h"
-
-extern int register_com_litl_leveldb_DB(JNIEnv *env);
-
-extern int register_com_litl_leveldb_WriteBatch(JNIEnv *env);
-
-extern int register_com_litl_leveldb_Iterator(JNIEnv *env);
-
-jint
-throwException(JNIEnv *env, leveldb::Status status) {
-    const char *exceptionClass;
-
-    if (status.IsNotFound()) {
-        exceptionClass = "com/litl/leveldb/NotFoundException";
-    } else if (status.IsCorruption()) {
-        exceptionClass = "com/litl/leveldb/DatabaseCorruptException";
-    } else if (status.IsIOError()) {
-        exceptionClass = "java/io/IOException";
-    } else {
-        return 0;
-    }
-
-    jclass clazz = env->FindClass(exceptionClass);
-    if (!clazz) {
-        LOGE("Can't find exception class %s", exceptionClass);
-        return -1;
-    }
-
-    return env->ThrowNew(clazz, status.ToString().c_str());
-}
-
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv *env;
-    if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
-        return -1;
-    }
-
-    register_com_litl_leveldb_DB(env);
-    register_com_litl_leveldb_WriteBatch(env);
-    register_com_litl_leveldb_Iterator(env);
-
-    return JNI_VERSION_1_6;
-}
diff --git a/leveldb/src/main/cpp/leveldbjni.h b/leveldb/src/main/cpp/leveldbjni.h
deleted file mode 100644
index 4e56fd5..0000000
--- a/leveldb/src/main/cpp/leveldbjni.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef LEVELDBJNI_H_
-#define LEVELDBJNI_H_
-
-#include <jni.h>
-#include <android/log.h>
-#include "leveldb/status.h"
-
-# define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#define  LOG_TAG    "LevelDB"
-#define  LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
-#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
-
-jint throwException(JNIEnv* env, leveldb::Status status);
-
-#endif /* LEVELDBJNI_H_ */
diff --git a/leveldb/src/main/java/com/litl/leveldb/DB.java b/leveldb/src/main/java/com/litl/leveldb/DB.java
deleted file mode 100644
index ba20766..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/DB.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.litl.leveldb;
-
-import java.io.File;
-import java.nio.ByteBuffer;
-
-public class DB extends NativeObject {
-    public abstract static class Snapshot extends NativeObject {
-        Snapshot(long ptr) {
-            super(ptr);
-        }
-    }
-
-    private final File mPath;
-    private boolean mDestroyOnClose = false;
-
-    public DB(File path) {
-        super();
-
-        if (path == null) {
-            throw new NullPointerException();
-        }
-        mPath = path;
-    }
-
-    public void open() {
-        mPtr = nativeOpen(mPath.getAbsolutePath());
-    }
-
-    @Override
-    protected void closeNativeObject(long ptr) {
-        nativeClose(ptr);
-    }
-
-    public void put(byte[] key, byte[] value) {
-        assertOpen("Database is closed");
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        nativePut(mPtr, key, value);
-    }
-
-    public byte[] get(byte[] key) {
-        return get(null, key);
-    }
-
-    public byte[] get(Snapshot snapshot, byte[] key) {
-        assertOpen("Database is closed");
-        if (key == null) {
-            throw new NullPointerException();
-        }
-
-        return nativeGet(mPtr, snapshot != null ? snapshot.getPtr() : 0, key);
-    }
-
-    public byte[] get(ByteBuffer key) {
-        return get(null, key);
-    }
-
-    public byte[] get(Snapshot snapshot, ByteBuffer key) {
-        assertOpen("Database is closed");
-        if (key == null) {
-            throw new NullPointerException();
-        }
-
-        return nativeGet(mPtr, snapshot != null ? snapshot.getPtr() : 0, key);
-    }
-
-    public void delete(byte[] key) {
-        assertOpen("Database is closed");
-        if (key == null) {
-            throw new NullPointerException();
-        }
-
-        nativeDelete(mPtr, key);
-    }
-
-    public void write(WriteBatch batch) {
-        assertOpen("Database is closed");
-        if (batch == null) {
-            throw new NullPointerException();
-        }
-
-        nativeWrite(mPtr, batch.getPtr());
-    }
-
-    public Iterator iterator() {
-        return iterator(null);
-    }
-
-    public Iterator iterator(final Snapshot snapshot) {
-        assertOpen("Database is closed");
-
-        return new Iterator(nativeIterator(mPtr, snapshot != null ? snapshot.getPtr() : 0)) {
-            @Override
-            protected void closeNativeObject(long ptr) {
-                super.closeNativeObject(ptr);
-            }
-        };
-    }
-
-    public Snapshot getSnapshot() {
-        assertOpen("Database is closed");
-        return new Snapshot(nativeGetSnapshot(mPtr)) {
-            protected void closeNativeObject(long ptr) {
-                nativeReleaseSnapshot(DB.this.getPtr(), getPtr());
-            }
-        };
-    }
-
-    public static native String fixLdb(String dbpath);
-
-    public static void destroy(File path) {
-        nativeDestroy(path.getAbsolutePath());
-    }
-
-    private static native long nativeOpen(String dbpath);
-
-    public File getPath() {
-        return mPath;
-    }
-
-    private static native void nativeClose(long dbPtr);
-
-    private static native void nativePut(long dbPtr, byte[] key, byte[] value);
-
-    private static native byte[] nativeGet(long dbPtr, long snapshotPtr, byte[] key);
-
-    private static native byte[] nativeGet(long dbPtr, long snapshotPtr, ByteBuffer key);
-
-    private static native void nativeDelete(long dbPtr, byte[] key);
-
-    private static native void nativeWrite(long dbPtr, long batchPtr);
-
-    private static native void nativeDestroy(String dbpath);
-
-    private static native long nativeIterator(long dbPtr, long snapshotPtr);
-
-    private static native long nativeGetSnapshot(long dbPtr);
-
-    private static native void nativeReleaseSnapshot(long dbPtr, long snapshotPtr);
-
-    public static native String stringFromJNI();
-
-    {
-        System.loadLibrary("leveldbjni");
-    }
-}
diff --git a/leveldb/src/main/java/com/litl/leveldb/DatabaseCorruptException.java b/leveldb/src/main/java/com/litl/leveldb/DatabaseCorruptException.java
deleted file mode 100644
index 4a1c83d..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/DatabaseCorruptException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.litl.leveldb;
-
-public class DatabaseCorruptException extends LevelDBException {
-    private static final long serialVersionUID = -2110293580518875321L;
-
-    public DatabaseCorruptException() {
-    }
-
-    public DatabaseCorruptException(String error) {
-        super(error);
-    }
-}
diff --git a/leveldb/src/main/java/com/litl/leveldb/Iterator.java b/leveldb/src/main/java/com/litl/leveldb/Iterator.java
deleted file mode 100644
index b02d6b4..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/Iterator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.litl.leveldb;
-
-public class Iterator extends NativeObject {
-    Iterator(long iterPtr) {
-        super(iterPtr);
-    }
-
-    @Override
-    protected void closeNativeObject(long ptr) {
-        nativeDestroy(ptr);
-    }
-
-    public void seekToFirst() {
-        assertOpen("Iterator is closed");
-        nativeSeekToFirst(mPtr);
-    }
-
-    public void seekToLast() {
-        assertOpen("Iterator is closed");
-        nativeSeekToLast(mPtr);
-    }
-
-    public void seek(byte[] target) {
-        assertOpen("Iterator is closed");
-        if (target == null) {
-            throw new IllegalArgumentException();
-        }
-        nativeSeek(mPtr, target);
-    }
-
-    public boolean isValid() {
-        assertOpen("Iterator is closed");
-        return nativeValid(mPtr);
-    }
-
-    public void next() {
-        assertOpen("Iterator is closed");
-        nativeNext(mPtr);
-    }
-
-    public void prev() {
-        assertOpen("Iterator is closed");
-        nativePrev(mPtr);
-    }
-
-    public byte[] getKey() {
-        assertOpen("Iterator is closed");
-        return nativeKey(mPtr);
-    }
-
-    public byte[] getValue() {
-        assertOpen("Iterator is closed");
-        return nativeValue(mPtr);
-    }
-
-    private static native void nativeDestroy(long ptr);
-
-    private static native void nativeSeekToFirst(long ptr);
-
-    private static native void nativeSeekToLast(long ptr);
-
-    private static native void nativeSeek(long ptr, byte[] key);
-
-    private static native boolean nativeValid(long ptr);
-
-    private static native void nativeNext(long ptr);
-
-    private static native void nativePrev(long ptr);
-
-    private static native byte[] nativeKey(long dbPtr);
-
-    private static native byte[] nativeValue(long dbPtr);
-}
diff --git a/leveldb/src/main/java/com/litl/leveldb/LevelDBException.java b/leveldb/src/main/java/com/litl/leveldb/LevelDBException.java
deleted file mode 100644
index d576a25..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/LevelDBException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.litl.leveldb;
-
-public class LevelDBException extends RuntimeException {
-    private static final long serialVersionUID = 2903013251786326801L;
-
-    public LevelDBException() {
-    }
-
-    public LevelDBException(String error) {
-        super(error);
-    }
-
-    public LevelDBException(String error, Throwable cause) {
-        super(error, cause);
-    }
-}
diff --git a/leveldb/src/main/java/com/litl/leveldb/NativeObject.java b/leveldb/src/main/java/com/litl/leveldb/NativeObject.java
deleted file mode 100644
index f9575dc..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/NativeObject.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.litl.leveldb;
-
-import java.io.Closeable;
-
-abstract class NativeObject implements Closeable {
-
-    protected long mPtr;
-
-    protected NativeObject() {
-    }
-
-    protected NativeObject(long ptr) {
-        this();
-
-        if (ptr == 0) {
-            throw new OutOfMemoryError("Failed to allocate native object");
-        }
-
-        mPtr = ptr;
-    }
-
-    synchronized protected long getPtr() {
-        return mPtr;
-    }
-
-    synchronized public boolean isClosed() {
-        return getPtr() == 0;
-    }
-
-    protected void assertOpen(String message) {
-        if (getPtr() == 0) {
-            throw new IllegalStateException(message);
-        }
-    }
-
-    protected abstract void closeNativeObject(long ptr);
-
-    @Override
-    public synchronized void close() {
-        closeNativeObject(mPtr);
-        mPtr = 0;
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        if (mPtr != 0) closeNativeObject(mPtr);
-        mPtr = 0;
-
-        super.finalize();
-    }
-}
diff --git a/leveldb/src/main/java/com/litl/leveldb/NotFoundException.java b/leveldb/src/main/java/com/litl/leveldb/NotFoundException.java
deleted file mode 100644
index ccd20e0..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/NotFoundException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.litl.leveldb;
-
-public class NotFoundException extends LevelDBException {
-    private static final long serialVersionUID = 6207999645579440001L;
-
-    public NotFoundException() {
-    }
-
-    public NotFoundException(String error) {
-        super(error);
-    }
-}
diff --git a/leveldb/src/main/java/com/litl/leveldb/WriteBatch.java b/leveldb/src/main/java/com/litl/leveldb/WriteBatch.java
deleted file mode 100644
index 674ca7d..0000000
--- a/leveldb/src/main/java/com/litl/leveldb/WriteBatch.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.litl.leveldb;
-
-import java.nio.ByteBuffer;
-
-public class WriteBatch extends NativeObject {
-    public WriteBatch() {
-        super(nativeCreate());
-    }
-
-    @Override
-    protected void closeNativeObject(long ptr) {
-        nativeDestroy(ptr);
-    }
-
-    public void delete(ByteBuffer key) {
-        assertOpen("WriteBatch is closed");
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-
-        nativeDelete(mPtr, key);
-    }
-
-    public void put(ByteBuffer key, ByteBuffer value) {
-        assertOpen("WriteBatch is closed");
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        nativePut(mPtr, key, value);
-    }
-
-    public void clear() {
-        assertOpen("WriteBatch is closed");
-        nativeClear(mPtr);
-    }
-
-    private static native long nativeCreate();
-
-    private static native void nativeDestroy(long ptr);
-
-    private static native void nativeDelete(long ptr, ByteBuffer key);
-
-    private static native void nativePut(long ptr, ByteBuffer key, ByteBuffer val);
-
-    private static native void nativeClear(long ptr);
-}
diff --git a/settings.gradle b/settings.gradle
index 9c3cd7f..e7b4def 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1 @@
 include ':app'
-include ':leveldb'
-include ':tileview'
diff --git a/tileview/.gitignore b/tileview/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/tileview/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/tileview/build.gradle b/tileview/build.gradle
deleted file mode 100644
index 88418c2..0000000
--- a/tileview/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 29
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 29
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    namespace 'com.qozix.tileview'
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.annotation:annotation:1.0.2'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    testImplementation 'junit:junit:4.12'
-}
diff --git a/tileview/proguard-rules.pro b/tileview/proguard-rules.pro
deleted file mode 100644
index fdc20d6..0000000
--- a/tileview/proguard-rules.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/q/Desktop/android/android-sdk-macosx/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# 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 *;
-#}
--keep class com.qozix** {*;}
--keepattributes InnerClasses
--keepattributes EnclosingMethod
\ No newline at end of file
diff --git a/tileview/src/main/AndroidManifest.xml b/tileview/src/main/AndroidManifest.xml
deleted file mode 100644
index 1558741..0000000
--- a/tileview/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
->
-
-  <application />
-
-</manifest>
diff --git a/tileview/src/main/java/com/qozix/tileview/TileView.java b/tileview/src/main/java/com/qozix/tileview/TileView.java
deleted file mode 100644
index b2bbf05..0000000
--- a/tileview/src/main/java/com/qozix/tileview/TileView.java
+++ /dev/null
@@ -1,999 +0,0 @@
-package com.qozix.tileview;
-
-import android.content.Context;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Region;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.qozix.tileview.detail.DetailLevel;
-import com.qozix.tileview.detail.DetailLevelManager;
-import com.qozix.tileview.geom.CoordinateTranslater;
-import com.qozix.tileview.geom.FloatMathHelper;
-import com.qozix.tileview.graphics.BitmapProvider;
-import com.qozix.tileview.hotspots.HotSpot;
-import com.qozix.tileview.hotspots.HotSpotManager;
-import com.qozix.tileview.markers.CalloutLayout;
-import com.qozix.tileview.markers.MarkerLayout;
-import com.qozix.tileview.paths.CompositePathView;
-import com.qozix.tileview.tiles.TileCanvasViewGroup;
-import com.qozix.tileview.widgets.ScalingLayout;
-import com.qozix.tileview.widgets.ZoomPanLayout;
-
-import java.lang.ref.WeakReference;
-import java.util.List;
-
-/**
- * The TileView widget is a subclass of ViewGroup that supports:
- * 1. Memory-managed tiled images with multiple levels of detail.
- * 2. Panning by drag and fling.
- * 3. Zooming by pinch and double-tap.
- * 4. Markers and info windows.
- * 5. Arbitrary coordinate systems.
- * 6. Tappable hot spots.
- * 7. Path drawing.
- * <p>
- * A minimal implementation might look like this:
- *
- * <pre>{@code
- * TileView tileView = new TileView( this );
- * tileView.setSize( 3000, 5000 );
- * tileView.addDetailLevel( 1.0f, "path/to/tiles/%d-%d.jpg" );
- * }</pre>
- * <p>
- * A more advanced implementation might look like:
- *
- * <pre>{@code
- * TileView tileView = new TileView( this );
- * tileView.setSize( 3000, 5000 );
- * tileView.defineBounds( 42.379676, -71.094919, 42.346550, -71.040280 );
- * tileView.addDetailLevel( 1.000f, "path/to/tiles/1000/%d-%d.jpg", 256, 256 );
- * tileView.addDetailLevel( 0.500f, "path/to/tiles/500/%d-%d.jpg", 256, 256 );
- * tileView.addDetailLevel( 0.250f, "path/to/tiles/250/%d-%d.jpg", 256, 256 );
- * tileView.addDetailLevel( 0.125f, "path/to/tiles/125/%d-%d.jpg", 128, 128 );
- * tileView.addMarker( someView, 42.35848, -71.063736, null, null );
- * tileView.addMarker( anotherView, 42.3665, -71.05224, -1.0f, -0.5f );
- * tileView.setMarkerTapListener( someMarkerTapListenerImplementation );
- * }</pre>
- */
-public class TileView extends ZoomPanLayout implements
-        ZoomPanLayout.ZoomPanListener,
-        TileCanvasViewGroup.TileRenderListener,
-        DetailLevelManager.DetailLevelChangeListener {
-
-    protected static final int DEFAULT_TILE_SIZE = 256;
-
-    private DetailLevelManager mDetailLevelManager = new DetailLevelManager();
-    private CoordinateTranslater mCoordinateTranslater = new CoordinateTranslater();
-    private HotSpotManager mHotSpotManager = new HotSpotManager();
-
-    private TileCanvasViewGroup mTileCanvasViewGroup;
-    private CompositePathView mCompositePathView;
-    private ScalingLayout mScalingLayout;
-    private MarkerLayout mMarkerLayout;
-    private CalloutLayout mCalloutLayout;
-
-    private RenderThrottleHandler mRenderThrottleHandler;
-
-    private boolean mShouldRenderWhilePanning = false;
-    private boolean mShouldUpdateDetailLevelWhileZooming = false;
-
-    /**
-     * Constructor to use when creating a TileView from code.
-     *
-     * @param context The Context the TileView is running in, through which it can access the current theme, resources, etc.
-     */
-    public TileView(Context context) {
-        this(context, null);
-    }
-
-    public TileView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public TileView(Context context, AttributeSet attrs, int defStyleAttr) {
-
-        super(context, attrs, defStyleAttr);
-
-        mTileCanvasViewGroup = new TileCanvasViewGroup(context);
-        addView(mTileCanvasViewGroup);
-
-        mCompositePathView = new CompositePathView(context);
-        addView(mCompositePathView);
-
-        mScalingLayout = new ScalingLayout(context);
-        addView(mScalingLayout);
-
-        mMarkerLayout = new MarkerLayout(context);
-        addView(mMarkerLayout);
-
-        mCalloutLayout = new CalloutLayout(context);
-        addView(mCalloutLayout);
-
-        mDetailLevelManager.setDetailLevelChangeListener(this);
-        mTileCanvasViewGroup.setTileRenderListener(this);
-        addZoomPanListener(this);
-
-        mRenderThrottleHandler = new RenderThrottleHandler(this);
-
-        requestRender();
-
-    }
-
-    /**
-     * Returns the DetailLevelManager instance used by the TileView to coordinate DetailLevels.
-     *
-     * @return The DetailLevelManager instance.
-     */
-    public DetailLevelManager getDetailLevelManager() {
-        return mDetailLevelManager;
-    }
-
-    /**
-     * Allows the use of a custom {@link DetailLevelManager}.
-     * <p>
-     * For example, to change the logic of {@link DetailLevel} choice for a given scale, you
-     * declare your own {@code DetailLevelMangerCustom} that extends {@link DetailLevelManager} :
-     * <pre>{@code
-     * private class DetailLevelManagerCustom extends DetailLevelManager{
-     *  @literal @Override
-     *   public DetailLevel getDetailLevelForScale(){
-     *     // your logic here
-     *   }
-     * }
-     * }
-     * </pre>
-     * Then you should use {@code TileView.setDetailLevelManager} before other method calls, especially
-     * {@code TileView.setSize} and {@code TileView.addDetailLevel}.
-     * </p>
-     *
-     * @param manager The DetailLevelManager instance used.
-     */
-    public void setDetailLevelManager(DetailLevelManager manager) {
-        mDetailLevelManager = manager;
-        mDetailLevelManager.setDetailLevelChangeListener(this);
-    }
-
-    /**
-     * Returns the CoordinateTranslater instance used by the TileView to manage abritrary coordinate
-     * systems.
-     *
-     * @return The CoordinateTranslater instance.
-     */
-    public CoordinateTranslater getCoordinateTranslater() {
-        return mCoordinateTranslater;
-    }
-
-    /**
-     * Returns the HotSpotManager instance used by the TileView to detect and react to touch events
-     * that intersect a user-defined region.
-     *
-     * @return The HotSpotManager instance.
-     */
-    public HotSpotManager getHotSpotManager() {
-        return mHotSpotManager;
-    }
-
-    /**
-     * Returns the CompositePathView instance used by the TileView to draw and scale paths.
-     *
-     * @return The CompositePathView instance.
-     */
-    public CompositePathView getCompositePathView() {
-        return mCompositePathView;
-    }
-
-    /**
-     * Returns the TileCanvasViewGroup instance used by the TileView to manage tile bitmap rendering.
-     *
-     * @return The TileCanvasViewGroup instance.
-     */
-    public TileCanvasViewGroup getTileCanvasViewGroup() {
-        return mTileCanvasViewGroup;
-    }
-
-    /**
-     * Returns the MakerLayout instance used by the TileView to position and display Views used
-     * as markers.
-     *
-     * @return The MarkerLayout instance.
-     */
-    public MarkerLayout getMarkerLayout() {
-        return mMarkerLayout;
-    }
-
-    /**
-     * Returns the CalloutLayout instance used by the TileView to position and display Views used
-     * as callouts.
-     *
-     * @return The CalloutLayout instance.
-     */
-    public CalloutLayout getCalloutLayout() {
-        return mCalloutLayout;
-    }
-
-    /**
-     * Returns the ScalingLayout instance used by the TileView to allow insertion of arbitrary
-     * Views and ViewGroups that will scale visually with the TileView.
-     *
-     * @return The ScalingLayout instance.
-     */
-    public ScalingLayout getScalingLayout() {
-        return mScalingLayout;
-    }
-
-    /**
-     * Add a ViewGroup to the TileView at a z-index above tiles and paths but beneath
-     * markers and callouts.  The ViewGroup will be laid out to the full dimensions of the largest
-     * detail level, and will scale with the TileView.
-     * Note that only the drawing surface of the view is scaled, other operations that depend
-     * on dimensions are not (e.g., hit areas, invalidation tests).
-     *
-     * @param viewGroup The ViewGroup to be added to the TileView, that will scale visually.
-     */
-    public void addScalingViewGroup(ViewGroup viewGroup) {
-        mScalingLayout.addView(viewGroup);
-    }
-
-    /**
-     * Request that the current tile set is re-examined and re-drawn.
-     * The request is added to a queue and is not guaranteed to be processed at any particular
-     * time, and will never be handled immediately.
-     */
-    public void requestRender() {
-        mTileCanvasViewGroup.requestRender();
-    }
-
-    /**
-     * While all render operation requests are queued and batched, this method provides an additional
-     * throttle layer, so that any subsequent invocations cancel and pending invocations.
-     * <p>
-     * This is useful when requesting in a stream fashion, either in a loop or in response to a
-     * progressive action like an animation or touch move.
-     */
-    public void requestThrottledRender() {
-        mRenderThrottleHandler.submit();
-    }
-
-    /**
-     * If flinging, defer render, otherwise request now.
-     * If a render operation starts at the beginning of a fling, a stutter can occur.
-     */
-    protected void requestSafeRender() {
-        if (isFlinging()) {
-            requestThrottledRender();
-        } else {
-            requestRender();
-        }
-    }
-
-    /**
-     * Notify the TileView that it may stop rendering tiles.  The rendering thread will be
-     * sent an interrupt request, but no guarantee is provided when the request will be responded to.
-     */
-    public void cancelRender() {
-        mTileCanvasViewGroup.cancelRender();
-    }
-
-    /**
-     * Notify the TileView that it should continue to render any pending tiles, but should not
-     * accept new render tasks.
-     */
-    public void suppressRender() {
-        mTileCanvasViewGroup.suppressRender();
-    }
-
-    /**
-     * Notify the TileView that it should resume tiles rendering.
-     */
-    public void resumeRender() {
-        mTileCanvasViewGroup.resumeRender();
-    }
-
-    /**
-     * Sets a custom class to perform the getBitmap operation when tile bitmaps are requested for
-     * tile images only.
-     * By default, a BitmapDecoder implementation is provided that renders bitmaps from the context's
-     * Assets, but alternative implementations could be used that fetch images via HTTP, or from the
-     * SD card, or resources, SVG, etc.
-     *
-     * @param bitmapProvider A class instance that implements BitmapProvider, and must define a getBitmap method, which accepts a String file name and a Context object, and returns a Bitmap
-     */
-    public void setBitmapProvider(BitmapProvider bitmapProvider) {
-        mTileCanvasViewGroup.setBitmapProvider(bitmapProvider);
-    }
-
-    /**
-     * Defines whether tile bitmaps should be rendered using an AlphaAnimation
-     *
-     * @param enabled True if the TileView should render tiles with fade transitions
-     */
-    public void setTransitionsEnabled(boolean enabled) {
-        mTileCanvasViewGroup.setTransitionsEnabled(enabled);
-    }
-
-    /**
-     * Instructs Tile instances to recycle (or not).  This can be useful if using a caching system
-     * that re-uses bitmaps and expects them to not have been recycled.
-     * <p>
-     * The default value is true.
-     *
-     * @param shouldRecycleBitmaps True if bitmaps should call Bitmap.recycle when they are removed from view.
-     * @deprecated This value is no longer considered - bitmaps are always recycled when they're no longer used.
-     */
-    public void setShouldRecycleBitmaps(boolean shouldRecycleBitmaps) {
-        mTileCanvasViewGroup.setShouldRecycleBitmaps(shouldRecycleBitmaps);
-    }
-
-    /**
-     * Defines the total size, in pixels, of the tile set at 100% scale.
-     * The TileView wills pan within it's layout dimensions, with the content (scrollable)
-     * size defined by this method.
-     *
-     * @param width  Total width of the tiled set.
-     * @param height Total height of the tiled set.
-     */
-    @Override
-    public void setSize(int width, int height) {
-        super.setSize(width, height);
-        mDetailLevelManager.setSize(width, height);
-        mCoordinateTranslater.setSize(width, height);
-    }
-
-    /**
-     * Register a tile set to be used for a particular detail level.
-     * Each tile set to be used must be registered using this method,
-     * and at least one tile set must be registered for the TileView to render any tiles.
-     *
-     * @param detailScale Scale at which the TileView should use the tiles in this set.
-     * @param data        An arbitrary object of any type that is passed to the BitmapProvider for each tile on this level.
-     */
-    public void addDetailLevel(float detailScale, Object data) {
-        addDetailLevel(detailScale, data, DEFAULT_TILE_SIZE, DEFAULT_TILE_SIZE);
-    }
-
-    /**
-     * Register a tile set to be used for a particular detail level.
-     * Each tile set to be used must be registered using this method,
-     * and at least one tile set must be registered for the TileView to render any tiles.
-     *
-     * @param detailScale Scale at which the TileView should use the tiles in this set.
-     * @param data        An arbitrary object of any type that is passed to the (Adapter|Decoder) for each tile on this level.
-     * @param tileWidth   Size of each tiled column.
-     * @param tileHeight  Size of each tiled row.
-     */
-    public void addDetailLevel(float detailScale, Object data, int tileWidth, int tileHeight) {
-        mDetailLevelManager.addDetailLevel(detailScale, data, tileWidth, tileHeight);
-    }
-
-    /**
-     * Register a tile set to be used for a particular detail level.
-     * Each tile set to be used must be registered using this method,
-     * and at least one tile set must be registered for the TileView to render any tiles.
-     *
-     * @param detailScale Scale at which the TileView should use the tiles in this set.
-     * @param data        An arbitrary object of any type that is passed to the (Adapter|Decoder) for each tile on this level.
-     * @param tileWidth   Size of each tiled column.
-     * @param tileHeight  Size of each tiled row.
-     * @param levelType   Type of level, detail-levels can have the same scale but different looks.
-     */
-    public void addDetailLevel(float detailScale, Object data, int tileWidth, int tileHeight, DetailLevelManager.LevelType levelType) {
-        mDetailLevelManager.addDetailLevel(detailScale, data, tileWidth, tileHeight, levelType);
-    }
-
-    /**
-     * Pads the viewport by the number of pixels passed.  e.g., setViewportPadding( 100 ) instructs the
-     * TileView to interpret it's actual viewport offset by 100 pixels in each direction (top, left,
-     * right, bottom), so more tiles will qualify for "visible" status when intersections are calculated.
-     *
-     * @param padding The number of pixels to pad the viewport by
-     */
-    public void setViewportPadding(int padding) {
-        mDetailLevelManager.setViewportPadding(padding);
-    }
-
-    /**
-     * Register a set of offset points to use when calculating position within the TileView.
-     * Any type of coordinate system can be used (any type of lat/lng, percentile-based, etc),
-     * and all positioned are calculated relatively.  If relative bounds are defined, position parameters
-     * received by TileView methods will be translated to the the appropriate pixel value.
-     * To remove this process, use undefineBounds.
-     *
-     * @param left   The left edge of the rectangle used when calculating position.
-     * @param top    The top edge of the rectangle used when calculating position.
-     * @param right  The right edge of the rectangle used when calculating position.
-     * @param bottom The bottom edge of the rectangle used when calculating position.
-     */
-    public void defineBounds(double left, double top, double right, double bottom) {
-        mCoordinateTranslater.setBounds(left, top, right, bottom);
-    }
-
-    /**
-     * Unregisters arbitrary bounds and coordinate system.  After invoking this method,
-     * TileView methods that receive position method parameters will use pixel values,
-     * relative to the TileView's registered size (at 1.0f scale).
-     */
-    public void undefineBounds() {
-        mCoordinateTranslater.unsetBounds();
-    }
-
-    /**
-     * Scrolls (instantly) the TileView to the x and y positions provided.  The is an overload
-     * of scrollTo( int x, int y ) that accepts doubles; if the TileView has relative bounds defined,
-     * those relative doubles will be converted to absolute pixel positions.
-     *
-     * @param x The relative x position to move to.
-     * @param y The relative y position to move to.
-     */
-    public void scrollTo(double x, double y) {
-        scrollTo(
-                mCoordinateTranslater.translateAndScaleX(x, getScale()),
-                mCoordinateTranslater.translateAndScaleY(y, getScale())
-        );
-    }
-
-    /**
-     * Scrolls (instantly) the TileView to the x and y positions provided,
-     * then centers the viewport to the position.
-     *
-     * @param x The relative x position to move to.
-     * @param y The relative y position to move to.
-     */
-    public void scrollToAndCenter(double x, double y) {
-        scrollToAndCenter(
-                mCoordinateTranslater.translateAndScaleX(x, getScale()),
-                mCoordinateTranslater.translateAndScaleY(y, getScale())
-        );
-    }
-
-    /**
-     * Scrolls (with animation) the TileView to the relative x and y positions provided.
-     *
-     * @param x The relative x position to move to.
-     * @param y The relative y position to move to.
-     */
-    public void slideTo(double x, double y) {
-        slideTo(
-                mCoordinateTranslater.translateAndScaleX(x, getScale()),
-                mCoordinateTranslater.translateAndScaleY(y, getScale())
-        );
-    }
-
-    /**
-     * Scrolls (with animation) the TileView to the x and y positions provided,
-     * then centers the viewport to the position.
-     *
-     * @param x The relative x position to move to.
-     * @param y The relative y position to move to.
-     */
-    public void slideToAndCenter(double x, double y) {
-        slideToAndCenter(
-                mCoordinateTranslater.translateAndScaleX(x, getScale()),
-                mCoordinateTranslater.translateAndScaleY(y, getScale())
-        );
-    }
-
-    /**
-     * Scrolls and scales (with animation) the TileView to the specified x, y and scale provided.
-     * The TileView will be centered to the coordinates passed.
-     *
-     * @param x     The relative x position to move to.
-     * @param y     The relative y position to move to.
-     * @param scale The scale the TileView should be at when the animation is complete.
-     */
-    public void slideToAndCenterWithScale(double x, double y, float scale) {
-        slideToAndCenterWithScale(
-                mCoordinateTranslater.translateAndScaleX(x, scale),
-                mCoordinateTranslater.translateAndScaleY(y, scale),
-                scale
-        );
-    }
-
-    /**
-     * Markers added to this TileView will have anchor logic applied on the values provided here.
-     * E.g., setMarkerAnchorPoints(-0.5f, -1.0f) will have markers centered horizontally, and aligned
-     * along the bottom edge to the y value supplied.
-     * <p>
-     * Anchor values assigned to individual markers will override these default values.
-     *
-     * @param anchorX The x-axis position of a marker will be offset by a number equal to the width of the marker multiplied by this value.
-     * @param anchorY The y-axis position of a marker will be offset by a number equal to the height of the marker multiplied by this value.
-     */
-    public void setMarkerAnchorPoints(Float anchorX, Float anchorY) {
-        mMarkerLayout.setAnchors(anchorX, anchorY);
-    }
-
-    /**
-     * Add a marker to the the TileView.  The marker can be any View.
-     * No LayoutParams are required; the View will be laid out using WRAP_CONTENT for both width and height, and positioned based on the parameters.
-     *
-     * @param view    View instance to be added to the TileView.
-     * @param x       Relative x position the View instance should be positioned at.
-     * @param y       Relative y position the View instance should be positioned at.
-     * @param anchorX The x-axis position of a marker will be offset by a number equal to the width of the marker multiplied by this value.
-     * @param anchorY The y-axis position of a marker will be offset by a number equal to the height of the marker multiplied by this value.
-     * @return The View instance added to the TileView.
-     */
-    public View addMarker(View view, double x, double y, Float anchorX, Float anchorY) {
-        return mMarkerLayout.addMarker(view,
-                mCoordinateTranslater.translateX(x),
-                mCoordinateTranslater.translateY(y),
-                anchorX, anchorY
-        );
-    }
-
-    /**
-     * Removes a marker View from the TileView's view tree.
-     *
-     * @param view The marker View to be removed.
-     */
-    public void removeMarker(View view) {
-        mMarkerLayout.removeMarker(view);
-    }
-
-    /**
-     * Moves an existing marker to another position.
-     *
-     * @param view The marker View to be repositioned.
-     * @param x    Relative x position the View instance should be positioned at.
-     * @param y    Relative y position the View instance should be positioned at.
-     */
-    public void moveMarker(View view, double x, double y) {
-        mMarkerLayout.moveMarker(view,
-                mCoordinateTranslater.translateX(x),
-                mCoordinateTranslater.translateY(y));
-    }
-
-    /**
-     * Scroll the TileView so that the View passed is centered in the viewport.
-     *
-     * @param view          The View marker that the TileView should center on.
-     * @param shouldAnimate True if the movement should use a transition effect.
-     */
-    public void moveToMarker(View view, boolean shouldAnimate) {
-        if (mMarkerLayout.indexOfChild(view) == -1) {
-            throw new IllegalStateException("The view passed is not an existing marker");
-        }
-        ViewGroup.LayoutParams params = view.getLayoutParams();
-        if (params instanceof MarkerLayout.LayoutParams) {
-            MarkerLayout.LayoutParams anchorLayoutParams = (MarkerLayout.LayoutParams) params;
-            int scaledX = FloatMathHelper.scale(anchorLayoutParams.x, getScale());
-            int scaledY = FloatMathHelper.scale(anchorLayoutParams.y, getScale());
-            if (shouldAnimate) {
-                slideToAndCenter(scaledX, scaledY);
-            } else {
-                scrollToAndCenter(scaledX, scaledY);
-            }
-        }
-    }
-
-    /**
-     * Register a MarkerTapListener for the TileView instance (rather than on a single marker view).
-     * Unlike standard touch events attached to marker View's (e.g., View.OnClickListener),
-     * MarkerTapListener.onMarkerTapEvent does not consume the touch event, so will not interfere
-     * with scrolling.
-     *
-     * @param markerTapListener Listener to be added to the TileView's list of MarkerTapListener.
-     */
-    public void setMarkerTapListener(MarkerLayout.MarkerTapListener markerTapListener) {
-        mMarkerLayout.setMarkerTapListener(markerTapListener);
-    }
-
-    /**
-     * Add a callout to the the TileView.  The callout can be any View.
-     * No LayoutParams are required; the View will be laid out using WRAP_CONTENT for both
-     * width and height, and positioned according to the x and y values supplied.
-     * Callout views will always be positioned at the top of the view tree (at the highest z-index),
-     * and will always be removed during any touch event that is not consumed by the callout View.
-     *
-     * @param view    View instance to be added to the TileView.
-     * @param x       Relative x position the View instance should be positioned at.
-     * @param y       Relative y position the View instance should be positioned at.
-     * @param anchorX The x-axis position of a callout view will be offset by a number equal to the width of the callout view multiplied by this value.
-     * @param anchorY The y-axis position of a callout view will be offset by a number equal to the height of the callout view multiplied by this value.
-     * @return The View instance added to the TileView.
-     */
-    public View addCallout(View view, double x, double y, Float anchorX, Float anchorY) {
-        return mCalloutLayout.addMarker(view,
-                mCoordinateTranslater.translateX(x),
-                mCoordinateTranslater.translateY(y),
-                anchorX, anchorY
-        );
-    }
-
-    /**
-     * Removes a callout View from the TileView.
-     *
-     * @param view The callout View to be removed.
-     */
-    public void removeCallout(View view) {
-        mCalloutLayout.removeMarker(view);
-    }
-
-    /**
-     * Register a HotSpot that should fire a listener when a touch event occurs that intersects the
-     * Region defined by the HotSpot.
-     * <p>
-     * The HotSpot virtually moves and scales with the TileView.
-     *
-     * @param hotSpot The hotspot that is tested against touch events that occur on the TileView.
-     * @return The HotSpot instance added.
-     */
-    public HotSpot addHotSpot(HotSpot hotSpot) {
-        mHotSpotManager.addHotSpot(hotSpot);
-        return hotSpot;
-    }
-
-    /**
-     * Register a HotSpot that should fire a listener when a touch event occurs that intersects the
-     * Region defined by the HotSpot.
-     * <p>
-     * The HotSpot virtually moves and scales with the TileView.
-     *
-     * @param positions (List<double[]>) List of paired doubles that represents the region.
-     * @return HotSpot the hotspot created with this method.
-     */
-    public HotSpot addHotSpot(List<double[]> positions, HotSpot.HotSpotTapListener listener) {
-        Path path = mCoordinateTranslater.pathFromPositions(positions, true);
-        RectF bounds = new RectF();
-        path.computeBounds(bounds, true);
-        Rect rect = new Rect();
-        bounds.round(rect);
-        Region clip = new Region(rect);
-        HotSpot hotSpot = new HotSpot();
-        hotSpot.setPath(path, clip);
-        hotSpot.setHotSpotTapListener(listener);
-        return addHotSpot(hotSpot);
-    }
-
-    /**
-     * Remove a HotSpot registered with addHotSpot.
-     *
-     * @param hotSpot The HotSpot instance to remove.
-     */
-    public void removeHotSpot(HotSpot hotSpot) {
-        mHotSpotManager.removeHotSpot(hotSpot);
-    }
-
-    /**
-     * Register a HotSpotTapListener with the TileView.  This listener will fire if any registered
-     * HotSpot's region intersects a Tap event.
-     *
-     * @param hotSpotTapListener The listener to be added.
-     */
-    public void setHotSpotTapListener(HotSpot.HotSpotTapListener hotSpotTapListener) {
-        mHotSpotManager.setHotSpotTapListener(hotSpotTapListener);
-    }
-
-    /**
-     * Register a DrawablePath that will be drawn on a layer above the tiles, but below markers.
-     * The Path will be scaled with the TileView, but will always be as wide as the stroke set
-     * for the Paint instance associated with the DrawablePath.
-     *
-     * @param drawablePath DrawablePath instance to be drawn by the TileView.
-     * @return The DrawablePath instance passed to the TileView.
-     */
-    public CompositePathView.DrawablePath drawPath(CompositePathView.DrawablePath drawablePath) {
-        return mCompositePathView.addPath(drawablePath);
-    }
-
-    /**
-     * Register a Path and Paint that will be drawn on a layer above the tiles, but below markers.
-     * The Path will be scaled with the TileView, but will always be as wide as the stroke set
-     * for the Paint.
-     *
-     * @param positions List of doubles that represent the points of the Path.
-     * @param paint     The Paint instance that defines the style of the drawn path.
-     * @return The DrawablePath instance passed to the TileView.
-     */
-    public CompositePathView.DrawablePath drawPath(List<double[]> positions, Paint paint) {
-        Path path = mCoordinateTranslater.pathFromPositions(positions, false);
-        return mCompositePathView.addPath(path, paint);
-    }
-
-    /**
-     * Removes a DrawablePath from the TileView's registry.  This path will no longer be drawn by the
-     * TileView.
-     *
-     * @param drawablePath The DrawablePath instance to be removed.
-     */
-    public void removePath(CompositePathView.DrawablePath drawablePath) {
-        mCompositePathView.removePath(drawablePath);
-    }
-
-    /**
-     * Returns the Paint instance used by the CompositePathView by default.  This can be modified for
-     * future Path paint operations.
-     *
-     * @return The Paint instance used by default.
-     */
-    public Paint getDefaultPathPaint() {
-        return mCompositePathView.getDefaultPaint();
-    }
-
-    /**
-     * Recycles bitmap image files, prevents path drawing, and clears pending Handler messages,
-     * appropriate for Activity.onPause.
-     */
-    public void pause() {
-        mRenderThrottleHandler.clear();
-        mDetailLevelManager.invalidateAll();
-        setWillNotDraw(true);
-    }
-
-    /**
-     * Clear tile image files and remove all views, appropriate for Activity.onDestroy.
-     * After invoking this method, the TileView instance should be removed from any view trees,
-     * and references to it should be set to null.
-     */
-    public void destroy() {
-        pause();
-        mTileCanvasViewGroup.destroy();
-        mCompositePathView.clear();
-        removeAllViews();
-    }
-
-    /**
-     * Restore visible state (generally after a call to pause).
-     * Appropriate for Activity.onResume.
-     */
-    public void resume() {
-        setWillNotDraw(false);
-        updateViewport();
-        mTileCanvasViewGroup.updateTileSet(mDetailLevelManager.getCurrentDetailLevel());
-        requestRender();
-        requestLayout();
-    }
-
-    /**
-     * Allows the TileView to render tiles while panning.
-     *
-     * @param shouldRender True if it should render while panning.
-     */
-    public void setShouldRenderWhilePanning(boolean shouldRender) {
-        mShouldRenderWhilePanning = shouldRender;
-        int buffer = shouldRender ? TileCanvasViewGroup.FAST_RENDER_BUFFER : TileCanvasViewGroup.DEFAULT_RENDER_BUFFER;
-        mTileCanvasViewGroup.setRenderBuffer(buffer);
-    }
-
-    /**
-     * By default, when a zoom begins, the current {@link DetailLevel} is locked so it is used to
-     * provide tiles until the zoom ends. This ensures that the {@link TileView} is updated
-     * consistently.
-     * <p>
-     * However, a zoom out may require a lot of tiles of the locked {@code DetailLevel} to be rendered.
-     * In worst case, it can cause {@link OutOfMemoryError}.
-     * Then, disabling the {@code DetailLevel} lock is a bandage to that issue. Using
-     * {@code setShouldUpdateDetailLevelWhileZooming( true )} is not advised unless you have that issue.
-     * </p>
-     *
-     * @param shouldUpdate True if it should lock {@link DetailLevel} when a zoom begins.
-     */
-    public void setShouldUpdateDetailLevelWhileZooming(boolean shouldUpdate) {
-        mShouldUpdateDetailLevelWhileZooming = shouldUpdate;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        mCalloutLayout.removeAllViews();
-        return super.onTouchEvent(event);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
-        updateViewport();
-        requestRender();
-    }
-
-    protected void updateViewport() {
-        int left = getScrollX();
-        int top = getScrollY();
-        int right = left + getWidth();
-        int bottom = top + getHeight();
-        mDetailLevelManager.updateViewport(left, top, right, bottom);
-    }
-
-    @Override
-    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
-        super.onScrollChanged(l, t, oldl, oldt);
-        updateViewport();
-        if (mShouldRenderWhilePanning) {
-            requestRender();
-        } else {
-            requestThrottledRender();
-        }
-    }
-
-    @Override
-    public void onScaleChanged(float scale, float previous) {
-        super.onScaleChanged(scale, previous);
-        mDetailLevelManager.setScale(scale);
-        mHotSpotManager.setScale(scale);
-        mTileCanvasViewGroup.setScale(scale);
-        mScalingLayout.setScale(scale);
-        mCompositePathView.setScale(scale);
-        mMarkerLayout.setScale(scale);
-        mCalloutLayout.setScale(scale);
-    }
-
-    @Override
-    public void onPanBegin(int x, int y, Origination origin) {
-
-    }
-
-    @Override
-    public void onPanUpdate(int x, int y, Origination origin) {
-
-    }
-
-    @Override
-    public void onPanEnd(int x, int y, Origination origin) {
-        requestRender();
-    }
-
-    @Override
-    public void onZoomBegin(float scale, Origination origin) {
-        if (origin == null) {
-            mTileCanvasViewGroup.suppressRender();
-        }
-        mDetailLevelManager.setScale(scale);
-    }
-
-    @Override
-    public void onZoomUpdate(float scale, Origination origin) {
-
-    }
-
-    @Override
-    public void onZoomEnd(float scale, Origination origin) {
-        if (origin == null) {
-            mTileCanvasViewGroup.resumeRender();
-        }
-        mDetailLevelManager.setScale(scale);
-        requestRender();
-    }
-
-    @Override
-    public void onDetailLevelChanged(DetailLevel detailLevel) {
-        requestRender();
-        mTileCanvasViewGroup.updateTileSet(detailLevel);
-    }
-
-    @Override
-    public boolean onSingleTapConfirmed(MotionEvent event) {
-        int x = getScrollX() + (int) event.getX() - getOffsetX();
-        int y = getScrollY() + (int) event.getY() - getOffsetY();
-        if (mMarkerLayout.processHit(x, y)) return true;
-        if (mHotSpotManager.processHit(x, y)) return true;
-        return super.onSingleTapConfirmed(event);
-    }
-
-    @Override
-    public void onRenderStart() {
-
-    }
-
-    @Override
-    public void onRenderCancelled() {
-
-    }
-
-    @Override
-    public void onRenderComplete() {
-
-    }
-
-    /**
-     * The default {@code super.onSaveInstanceState} and {@code onRestoreInstanceState} don't
-     * restore the position on the map as expected (if the instance of {@link TileView} remains the
-     * same). For this reason and if a new {@link TileView} instance is created, we have to save
-     * the current scale and position on the map, to restore them later when the {@link TileView} is
-     * recreated.
-     */
-    @Override
-    public Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        SavedState ss = new SavedState(superState);
-        ss.mScale = getScale();
-        ss.mSavedCenterX = getScrollX() + getHalfWidth();
-        ss.mSavedCenterY = getScrollY() + getHalfHeight();
-        return ss;
-    }
-
-    @Override
-    public void onRestoreInstanceState(Parcelable state) {
-        final SavedState ss = (SavedState) state;
-        super.onRestoreInstanceState(ss.getSuperState());
-        setScale(ss.mScale);
-        post(new Runnable() {
-            @Override
-            public void run() {
-                scrollToAndCenter(ss.mSavedCenterX, ss.mSavedCenterY);
-            }
-        });
-    }
-
-    private static class RenderThrottleHandler extends Handler {
-
-        private static final int MESSAGE = 0;
-        private static final int RENDER_THROTTLE_TIMEOUT = 100;
-
-        private final WeakReference<TileView> mTileViewWeakReference;
-
-        public RenderThrottleHandler(TileView tileView) {
-            super();
-            mTileViewWeakReference = new WeakReference<TileView>(tileView);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            TileView tileView = mTileViewWeakReference.get();
-            if (tileView != null) {
-                tileView.requestSafeRender();
-            }
-        }
-
-        public void clear() {
-            if (hasMessages(MESSAGE)) {
-                removeMessages(MESSAGE);
-            }
-        }
-
-        public void submit() {
-            clear();
-            sendEmptyMessageDelayed(MESSAGE, RENDER_THROTTLE_TIMEOUT);
-        }
-    }
-
-    /**
-     * Object used to keep some data when a configuration change happens and the activity is
-     * re-created.
-     * It's boiler-plate but this is how to save View state.
-     */
-    private static class SavedState extends BaseSavedState {
-        public static final Parcelable.Creator<SavedState> CREATOR
-                = new Parcelable.Creator<SavedState>() {
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-        /* This will store the current scale and position */
-        float mScale;
-        int mSavedCenterX;
-        int mSavedCenterY;
-
-        SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        private SavedState(Parcel in) {
-            super(in);
-            mScale = in.readFloat();
-            mSavedCenterX = in.readInt();
-            mSavedCenterY = in.readInt();
-        }
-
-        @Override
-        public void writeToParcel(Parcel out, int flags) {
-            super.writeToParcel(out, flags);
-            out.writeFloat(mScale);
-            out.writeInt(mSavedCenterX);
-            out.writeInt(mSavedCenterY);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java b/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java
deleted file mode 100644
index bdfd493..0000000
--- a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.qozix.tileview.detail;
-
-import android.graphics.Rect;
-
-import com.qozix.tileview.tiles.Tile;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import androidx.annotation.NonNull;
-
-public class DetailLevel implements Comparable<DetailLevel> {
-
-    private float mScale;
-    private int mTileWidth;
-    private int mTileHeight;
-    private Object mData;
-    private DetailLevelManager.LevelType mLevelType;
-
-    private DetailLevelManager mDetailLevelManager;
-
-    private StateSnapshot mLastStateSnapshot;
-
-    private Set<Tile> mTilesVisibleInViewport = new HashSet<>();
-
-    public DetailLevel(DetailLevelManager detailLevelManager, float scale, Object data, int tileWidth, int tileHeight, DetailLevelManager.LevelType levelType) {
-        mDetailLevelManager = detailLevelManager;
-        mScale = scale;
-        mData = data;
-        mTileWidth = tileWidth;
-        mTileHeight = tileHeight;
-        mLevelType = levelType;
-    }
-
-    public DetailLevel(DetailLevelManager detailLevelManager, float scale, Object data, int tileWidth, int tileHeight) {
-        mDetailLevelManager = detailLevelManager;
-        mScale = scale;
-        mData = data;
-        mTileWidth = tileWidth;
-        mTileHeight = tileHeight;
-    }
-
-    public DetailLevelManager getDetailLevelManager() {
-        return mDetailLevelManager;
-    }
-
-    /**
-     * Returns true if there has been a change, false otherwise.
-     *
-     * @return True if there has been a change, false otherwise.
-     */
-    public boolean computeCurrentState() {
-        float relativeScale = getRelativeScale();
-        int drawableWidth = mDetailLevelManager.getScaledWidth();
-        int drawableHeight = mDetailLevelManager.getScaledHeight();
-        float offsetWidth = mTileWidth * relativeScale;
-        float offsetHeight = mTileHeight * relativeScale;
-        Rect viewport = new Rect(mDetailLevelManager.getComputedViewport());
-        viewport.top = Math.max(viewport.top, 0);
-        viewport.left = Math.max(viewport.left, 0);
-        viewport.right = Math.min(viewport.right, drawableWidth);
-        viewport.bottom = Math.min(viewport.bottom, drawableHeight);
-        int rowStart = (int) Math.floor(viewport.top / offsetHeight);
-        int rowEnd = (int) Math.ceil(viewport.bottom / offsetHeight);
-        int columnStart = (int) Math.floor(viewport.left / offsetWidth);
-        int columnEnd = (int) Math.ceil(viewport.right / offsetWidth);
-        StateSnapshot stateSnapshot = new StateSnapshot(this, rowStart, rowEnd, columnStart, columnEnd);
-        boolean sameState = stateSnapshot.equals(mLastStateSnapshot);
-        mLastStateSnapshot = stateSnapshot;
-        return !sameState;
-    }
-
-    /**
-     * Returns a list of Tile instances describing the currently visible viewport.
-     *
-     * @return List of Tile instances describing the currently visible viewport.
-     */
-    public Set<Tile> getVisibleTilesFromLastViewportComputation() {
-        if (mLastStateSnapshot == null) {
-            throw new StateNotComputedException();
-        }
-        return mTilesVisibleInViewport;
-    }
-
-    public boolean hasComputedState() {
-        return mLastStateSnapshot != null;
-    }
-
-    public void computeVisibleTilesFromViewport() {
-        mTilesVisibleInViewport.clear();
-        for (int rowCurrent = mLastStateSnapshot.rowStart; rowCurrent < mLastStateSnapshot.rowEnd; rowCurrent++) {
-            for (int columnCurrent = mLastStateSnapshot.columnStart; columnCurrent < mLastStateSnapshot.columnEnd; columnCurrent++) {
-                Tile tile = new Tile(columnCurrent, rowCurrent, mTileWidth, mTileHeight, mData, this);
-                mTilesVisibleInViewport.add(tile);
-            }
-        }
-    }
-
-    /**
-     * Ensures that computeCurrentState will return true, indicating a change has occurred.
-     */
-    public void invalidate() {
-        mLastStateSnapshot = null;
-    }
-
-    public float getScale() {
-        return mScale;
-    }
-
-    public float getRelativeScale() {
-        return mDetailLevelManager.getScale() / mScale;
-    }
-
-    public int getTileWidth() {
-        return mTileWidth;
-    }
-
-    public int getTileHeight() {
-        return mTileHeight;
-    }
-
-    public Object getData() {
-        return mData;
-    }
-
-    public DetailLevelManager.LevelType getLevelType() {
-        return mLevelType;
-    }
-
-    @Override
-    public int compareTo(@NonNull DetailLevel detailLevel) {
-        return (int) Math.signum(getScale() - detailLevel.getScale());
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object instanceof DetailLevel) {
-            DetailLevel detailLevel = (DetailLevel) object;
-            return mScale == detailLevel.getScale()
-                    && mData != null && mData.equals(detailLevel.getData())
-                    && mLevelType != null && mLevelType.equals(detailLevel.getLevelType());
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        //TODO should this hashCode mix with the mLevelType hashcode?
-        long bits = (Double.doubleToLongBits(getScale()) * 43);
-        return (((int) bits) ^ ((int) (bits >> 32)));
-    }
-
-    public static class StateNotComputedException extends IllegalStateException {
-        public StateNotComputedException() {
-            super("Grid has not been computed; " +
-                    "you must call computeCurrentState at some point prior to calling " +
-                    "getVisibleTilesFromLastViewportComputation.");
-        }
-    }
-
-    private static class StateSnapshot {
-        public int rowStart;
-        public int rowEnd;
-        public int columnStart;
-        public int columnEnd;
-        public DetailLevel detailLevel;
-
-        public StateSnapshot(DetailLevel detailLevel, int rowStart, int rowEnd, int columnStart, int columnEnd) {
-            this.detailLevel = detailLevel;
-            this.rowStart = rowStart;
-            this.rowEnd = rowEnd;
-            this.columnStart = columnStart;
-            this.columnEnd = columnEnd;
-        }
-
-        public boolean equals(Object o) {
-            if (o == this) {
-                return true;
-            }
-            if (o instanceof StateSnapshot) {
-                StateSnapshot stateSnapshot = (StateSnapshot) o;
-                return detailLevel.equals(stateSnapshot.detailLevel)
-                        && rowStart == stateSnapshot.rowStart
-                        && columnStart == stateSnapshot.columnStart
-                        && rowEnd == stateSnapshot.rowEnd
-                        && columnEnd == stateSnapshot.columnEnd;
-            }
-            return false;
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevelManager.java b/tileview/src/main/java/com/qozix/tileview/detail/DetailLevelManager.java
deleted file mode 100644
index 99bf070..0000000
--- a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevelManager.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.qozix.tileview.detail;
-
-import android.graphics.Rect;
-
-import com.qozix.tileview.geom.FloatMathHelper;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-public class DetailLevelManager {
-
-  public interface LevelType {
-
-  }
-
-  private Map<LevelType, LinkedList<DetailLevel>> mDetailLevelLinkedList = new HashMap<>();
-
-  private DetailLevelChangeListener mDetailLevelChangeListener;
-
-  protected float mScale = 1;
-
-  private int mBaseWidth;
-  private int mBaseHeight;
-  private int mScaledWidth;
-  private int mScaledHeight;
-
-  private boolean mDetailLevelLocked;
-
-  private int mPadding;
-
-  private Rect mViewport = new Rect();
-  private Rect mComputedViewport = new Rect();
-  private Rect mComputedScaledViewport = new Rect();
-
-  private boolean dirty;
-  private LevelType mCurrentLevelType;
-
-  private DetailLevel mCurrentDetailLevel;
-
-  public DetailLevelManager() {
-    update();
-  }
-
-  public float getScale() {
-    return mScale;
-  }
-
-  public void setScale( float scale ) {
-    mScale = scale;
-    update();
-  }
-
-  public int getBaseWidth() {
-    return mBaseWidth;
-  }
-
-  public int getBaseHeight() {
-    return mBaseHeight;
-  }
-
-  public int getScaledWidth() {
-    return mScaledWidth;
-  }
-
-  public int getScaledHeight() {
-    return mScaledHeight;
-  }
-
-  public void setSize( int width, int height ) {
-    mBaseWidth = width;
-    mBaseHeight = height;
-    update();
-  }
-
-  public void setLevelType(LevelType levelType) {
-    if( this.mCurrentLevelType == levelType ) return;
-    this.mCurrentLevelType = levelType;
-    this.dirty = true;
-    this.update();
-  }
-
-  public void setDetailLevelChangeListener( DetailLevelChangeListener detailLevelChangeListener ) {
-    mDetailLevelChangeListener = detailLevelChangeListener;
-  }
-
-  /**
-   * "pads" the viewport by the number of pixels passed.  e.g., setViewportPadding( 100 ) instructs the
-   * DetailManager to interpret it's actual viewport offset by 100 pixels in each direction (top, left,
-   * right, bottom), so more tiles will qualify for "visible" status when intersections are calculated.
-   *
-   * @param pixels The number of pixels to pad the viewport by.
-   */
-  public void setViewportPadding( int pixels ) {
-    mPadding = pixels;
-    updateComputedViewport();
-  }
-
-  public void updateViewport( int left, int top, int right, int bottom ) {
-    mViewport.set( left, top, right, bottom );
-    updateComputedViewport();
-  }
-
-  private void updateComputedViewport() {
-    mComputedViewport.set( mViewport );
-    mComputedViewport.top -= mPadding;
-    mComputedViewport.left -= mPadding;
-    mComputedViewport.bottom += mPadding;
-    mComputedViewport.right += mPadding;
-  }
-
-  public Rect getViewport() {
-    return mViewport;
-  }
-
-  public Rect getComputedViewport() {
-    return mComputedViewport;
-  }
-
-  public Rect getComputedScaledViewport(float scale){
-    mComputedScaledViewport.set(
-      (int) (mComputedViewport.left * scale),
-      (int) (mComputedViewport.top * scale),
-      (int) (mComputedViewport.right * scale),
-      (int) (mComputedViewport.bottom * scale)
-    );
-    return mComputedScaledViewport;
-  }
-
-  /**
-   * While the detail level is locked (after this method is invoked, and before unlockDetailLevel is invoked),
-   * the DetailLevel will not change, and the current DetailLevel will be scaled beyond the normal
-   * bounds.  Normally, during any scale change the DetailManager searches for the DetailLevel with
-   * a registered scale closest to the defined mScale.  While locked, this does not occur.
-   */
-  public void lockDetailLevel() {
-    mDetailLevelLocked = true;
-  }
-
-  /**
-   * Unlocks a DetailLevel locked with lockDetailLevel.
-   */
-  public void unlockDetailLevel() {
-    mDetailLevelLocked = false;
-  }
-
-  public boolean getIsLocked() {
-    return mDetailLevelLocked;
-  }
-
-  public void resetDetailLevels() {
-    mDetailLevelLinkedList.clear();
-    update();
-  }
-
-  public DetailLevel getCurrentDetailLevel() {
-    return mCurrentDetailLevel;
-  }
-
-  protected void update() {
-    if(this.dirty || !mDetailLevelLocked ) {
-      DetailLevel matchingLevel = getDetailLevelForScale();
-      if( matchingLevel != null ) {
-        this.dirty = !matchingLevel.equals( mCurrentDetailLevel );
-        mCurrentDetailLevel = matchingLevel;
-      }
-    }
-    mScaledWidth = FloatMathHelper.scale( mBaseWidth, mScale );
-    mScaledHeight = FloatMathHelper.scale( mBaseHeight, mScale );
-    if( this.dirty ) {
-      if( mDetailLevelChangeListener != null ) {
-        mDetailLevelChangeListener.onDetailLevelChanged( mCurrentDetailLevel );
-      }
-      this.dirty = false;
-    }
-  }
-
-  public void addDetailLevel( float scale, Object data, int tileWidth, int tileHeight) {
-    this.addDetailLevel(scale, data, tileWidth, tileHeight, null);
-  }
-
-  public void addDetailLevel( float scale, Object data, int tileWidth, int tileHeight, LevelType levelType) {
-    DetailLevel detailLevel = new DetailLevel( this, scale, data, tileWidth, tileHeight, levelType);
-    LinkedList<DetailLevel> levels = mDetailLevelLinkedList.get(levelType);
-    if( levels != null){
-      if(levels.contains( detailLevel ) ) {
-        return;
-      } else {
-        levels.add( detailLevel );
-        Collections.sort( levels );
-      }
-    } else {
-      //a list with one item does not need to be sorted, just add the new list to the map
-      levels = new LinkedList<>();
-      levels.add(detailLevel);
-      mDetailLevelLinkedList.put(levelType, levels);
-    }
-    update();
-  }
-
-  public DetailLevel getDetailLevelForScale() {
-    LinkedList<DetailLevel> levels = mDetailLevelLinkedList.get(mCurrentLevelType);
-    if( levels == null || levels.size() == 0 ) {
-      return null;
-    }
-    if( levels.size() == 1 ) {
-      return levels.get( 0 );
-    }
-    DetailLevel match = null;
-    int index = levels.size() - 1;
-    for( int i = index; i >= 0; i-- ) {
-      match = levels.get( i );
-      if( match.getScale() < mScale ) {
-        if( i < index ) {
-          match = levels.get( i + 1 );
-        }
-        break;
-      }
-    }
-    return match;
-  }
-
-  public void invalidateAll(){
-    for( LinkedList<DetailLevel> levels : mDetailLevelLinkedList.values() ) {
-      for (DetailLevel detailLevel : levels) {
-        detailLevel.invalidate();
-      }
-    }
-  }
-
-  public interface DetailLevelChangeListener {
-    void onDetailLevelChanged( DetailLevel detailLevel );
-  }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/geom/CoordinateTranslater.java b/tileview/src/main/java/com/qozix/tileview/geom/CoordinateTranslater.java
deleted file mode 100644
index c8563b6..0000000
--- a/tileview/src/main/java/com/qozix/tileview/geom/CoordinateTranslater.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.qozix.tileview.geom;
-
-import android.graphics.Path;
-
-import java.util.List;
-
-/**
- * Helper class to translate relative coordinates into absolute pixels.
- * Note that these methods always take arguments x and y in that order;
- * this may be counter-intuitive since coordinates are often expressed as lat (y), lng (x).
- * When using translation methods of this class, pass latitude and longitude in the reverse
- * order: translationMethod( longitude, latitude )
- */
-public class CoordinateTranslater {
-
-  private double mLeft;
-  private double mTop;
-  private double mRight;
-  private double mBottom;
-
-  private double mDiffX;
-  private double mDiffY;
-
-  private int mWidth;
-  private int mHeight;
-
-  private boolean mHasDefinedBounds;
-
-  /**
-   * Set size in pixels of the image at 100% scale.
-   *
-   * @param width  Width of the tiled image in pixels.
-   * @param height Height of the tiled image in pixels.
-   */
-  public void setSize( int width, int height ) {
-    mWidth = width;
-    mHeight = height;
-  }
-
-  /**
-   * Define arbitrary bound coordinates to the edges of the tiled image (e.g., latitude and longitude).
-   *
-   * @param left   The left boundary (e.g., west longitude).
-   * @param top    The top boundary (e.g., north latitude).
-   * @param right  The right boundary (e.g., east longitude).
-   * @param bottom The bottom boundary (e.g., south latitude).
-   */
-  public void setBounds( double left, double top, double right, double bottom ) {
-    mHasDefinedBounds = true;
-    mLeft = left;
-    mTop = top;
-    mRight = right;
-    mBottom = bottom;
-    mDiffX = mRight - mLeft;
-    mDiffY = mBottom - mTop;
-  }
-
-  public void unsetBounds() {
-    mHasDefinedBounds = false;
-    mLeft = 0;
-    mTop = 0;
-    mRight = mWidth;
-    mBottom = mHeight;
-    mDiffX = mWidth;
-    mDiffY = mHeight;
-  }
-
-  /**
-   * Translate a relative X position to an absolute pixel value.
-   *
-   * @param x The relative X position (e.g., longitude) to translate to absolute pixels.
-   * @return The translated position as a pixel value.
-   */
-  public int translateX( double x ) {
-    if( !mHasDefinedBounds ) {
-      return (int) x;
-    }
-    double factor = (x - mLeft) / mDiffX;
-    return FloatMathHelper.scale( mWidth, (float) factor );
-  }
-
-  /**
-   * Translate a relative X position to an absolute pixel value, considering a scale value as well.
-   *
-   * @param x The relative X position (e.g., longitude) to translate to absolute pixels.
-   * @return The translated position as a pixel value.
-   */
-  public int translateAndScaleX( double x, float scale ) {
-    return FloatMathHelper.scale( translateX( x ), scale );
-  }
-
-  /**
-   * Translate a relative Y position to an absolute pixel value.
-   *
-   * @param y The relative Y position (e.g., latitude) to translate to absolute pixels.
-   * @return The translated position as a pixel value.
-   */
-  public int translateY( double y ) {
-    if( !mHasDefinedBounds ) {
-      return (int) y;
-    }
-    double factor = (y - mTop) / mDiffY;
-    return FloatMathHelper.scale( mHeight, (float) factor );
-  }
-
-  /**
-   * Translate a relative Y position to an absolute pixel value, considering a scale value as well.
-   *
-   * @param y The relative Y position (e.g., latitude) to translate to absolute pixels.
-   * @return The translated position as a pixel value.
-   */
-  public int translateAndScaleY( double y, float scale ) {
-    return FloatMathHelper.scale( translateY( y ), scale );
-  }
-
-  /**
-   * Translate an absolute pixel value to a relative coordinate.
-   *
-   * @param x The x value to be translated.
-   * @return The relative value of the x coordinate supplied.
-   */
-  public double translateAbsoluteToRelativeX( float x ) {
-    return mLeft + ( x * mDiffX / mWidth );
-  }
-
-  /**
-   * Pipes to {@link #translateAbsoluteToRelativeX( float )}
-   */
-  public double translateAbsoluteToRelativeX( int x ) {
-    return translateAbsoluteToRelativeX( (float) x );
-  }
-
-  /**
-   * Convenience method to translate an absolute pixel value to a relative coordinate, while considering a scale value.
-   *
-   * @param x     The x value to be translated.
-   * @param scale The scale to apply.
-   * @return The relative value of the x coordinate supplied.
-   */
-  public double translateAndScaleAbsoluteToRelativeX( float x, float scale ) {
-    return translateAbsoluteToRelativeX( x / scale );
-  }
-
-  /**
-   * @see #translateAndScaleAbsoluteToRelativeX(float, float)
-   */
-  public double translateAndScaleAbsoluteToRelativeX( int x, float scale ) {
-    return translateAbsoluteToRelativeX( x / scale );
-  }
-
-  /**
-   * Translate an absolute pixel value to a relative coordinate.
-   *
-   * @param y The y value to be translated.
-   * @return The relative value of the y coordinate supplied.
-   */
-  public double translateAbsoluteToRelativeY( float y ) {
-    return mTop + ( y * mDiffY / mHeight );
-  }
-
-  /**
-   * Pipes to {@link #translateAbsoluteToRelativeY( float )}
-   */
-  public double translateAbsoluteToRelativeY( int y ) {
-    return translateAbsoluteToRelativeY( (float) y );
-  }
-
-  /**
-   * Convenience method to translate an absolute pixel value to a relative coordinate, while considering a scale value.
-   *
-   * @param y     The y value to be translated.
-   * @param scale The scale to apply.
-   * @return The relative value of the y coordinate supplied.
-   */
-  public double translateAndScaleAbsoluteToRelativeY( float y, float scale ) {
-    return translateAbsoluteToRelativeY( y / scale );
-  }
-
-  /**
-   * @see #translateAndScaleAbsoluteToRelativeY(float, float)
-   */
-  public double translateAndScaleAbsoluteToRelativeY( int y, float scale ) {
-    return translateAbsoluteToRelativeY( y / scale );
-  }
-
-  /**
-   * Determines if a given position (x, y) falls within the bounds defined, or the absolute pixel size of the image, if arbitrary bounds are nor supplied.
-   *
-   * @param x The x value of the coordinate to test.
-   * @param y The y value of the coordinate to test.
-   * @return True if the point falls within the defined area; false if not.
-   */
-  public boolean contains( double x, double y ) {
-    double top = mTop;
-    double bottom = mBottom;
-    double left = mLeft;
-    double right = mRight;
-    if( mTop > mBottom ) {
-      top = mBottom;
-      bottom = mTop;
-    }
-    if( mLeft > mRight ) {
-      left = mRight;
-      right = mLeft;
-    }
-    return y >= top
-      && y <= bottom
-      && x >= left
-      && x <= right;
-  }
-
-  /**
-   * Convenience method to convert a List of coordinates (pairs of doubles) to a Path instance.
-   *
-   * @param positions   List of coordinates (pairs of doubles).
-   * @param shouldClose True if the path should be closed at the end of this operation.
-   * @return The Path instance created from the positions supplied.
-   */
-  public Path pathFromPositions( List<double[]> positions, boolean shouldClose ) {
-    Path path = new Path();
-    double[] start = positions.get( 0 );
-    path.moveTo( translateX( start[0] ), translateY( start[1] ) );
-    for( int i = 1; i < positions.size(); i++ ) {
-      double[] position = positions.get( i );
-      path.lineTo( translateX( position[0] ), translateY( position[1] ) );
-    }
-    if( shouldClose ) {
-      path.close();
-    }
-    return path;
-  }
-
-}
\ No newline at end of file
diff --git a/tileview/src/main/java/com/qozix/tileview/geom/FloatMathHelper.java b/tileview/src/main/java/com/qozix/tileview/geom/FloatMathHelper.java
deleted file mode 100644
index 4de4264..0000000
--- a/tileview/src/main/java/com/qozix/tileview/geom/FloatMathHelper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.qozix.tileview.geom;
-
-/**
- * @author Mike Dunn, 10/23/15.
- */
-public class FloatMathHelper {
-  public static int scale( int base, float multiplier ) {
-    return (int) ((base * multiplier) + 0.5);
-  }
-  public static int unscale( int base, float multiplier ) {
-    return (int) ((base / multiplier) + 0.5);
-  }
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/graphics/BitmapProvider.java b/tileview/src/main/java/com/qozix/tileview/graphics/BitmapProvider.java
deleted file mode 100644
index 9c6ca63..0000000
--- a/tileview/src/main/java/com/qozix/tileview/graphics/BitmapProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.qozix.tileview.graphics;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-
-import com.qozix.tileview.tiles.Tile;
-
-/**
- * This interface provides the bitmap data necessary to draw each tile.  It will be run
- * in a worker (non-UI) thread, so network operations are safe here.  How the bitmap is generated
- * is entirely up to you - assets, resources, file system, network access, SVG, drawn dynamically
- * with Canvas instances, it doesn't matter - the method is passed a Tile instance (with information
- * like column and row numbers, including the arbitrary data object passed for the detail level),
- * and a Context instance to help with things like file i/o - as long as the
- * getBitmap method returns a bitmap, everything will run along nicely.
- */
-public interface BitmapProvider {
-  Bitmap getBitmap( Tile tile, Context context );
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/graphics/BitmapProviderAssets.java b/tileview/src/main/java/com/qozix/tileview/graphics/BitmapProviderAssets.java
deleted file mode 100644
index 479cf9a..0000000
--- a/tileview/src/main/java/com/qozix/tileview/graphics/BitmapProviderAssets.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.qozix.tileview.graphics;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import com.qozix.tileview.tiles.Tile;
-
-import java.io.InputStream;
-
-/**
- * This is a very simple implementation of BitmapProvider, using a formatted string to find
- * an asset by filename, and built-in methods to decode the bitmap data.
- *
- * Feel free to use your own implementation here, where you might implement a favorite library like
- * Picasso, or add your own disk-caching scheme, etc.
- */
-
-public class BitmapProviderAssets implements BitmapProvider {
-
-  private static final BitmapFactory.Options OPTIONS = new BitmapFactory.Options();
-
-  static {
-    OPTIONS.inPreferredConfig = Bitmap.Config.RGB_565;
-  }
-
-  @Override
-  public Bitmap getBitmap( Tile tile, Context context ) {
-    Object data = tile.getData();
-    if( data instanceof String ) {
-      String unformattedFileName = (String) tile.getData();
-      String formattedFileName = String.format( unformattedFileName, tile.getColumn(), tile.getRow() );
-      AssetManager assetManager = context.getAssets();
-      try {
-        InputStream inputStream = assetManager.open( formattedFileName );
-        if( inputStream != null ) {
-          try {
-            return BitmapFactory.decodeStream( inputStream, null, OPTIONS );
-          } catch( OutOfMemoryError | Exception e ) {
-            // this is probably an out of memory error - you can try sleeping (this method won't be called in the UI thread) or try again (or give up)
-          }
-        }
-      } catch( Exception e ) {
-        // this is probably an IOException, meaning the file can't be found
-      }
-    }
-    return null;
-  }
-
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/hotspots/HotSpot.java b/tileview/src/main/java/com/qozix/tileview/hotspots/HotSpot.java
deleted file mode 100644
index de5dec5..0000000
--- a/tileview/src/main/java/com/qozix/tileview/hotspots/HotSpot.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.qozix.tileview.hotspots;
-
-import android.graphics.Region;
-
-public class HotSpot extends Region {
-
-  private Object mTag;
-  private HotSpotTapListener mHotSpotTapListener;
-
-  public Object getTag() {
-    return mTag;
-  }
-
-  public void setTag( Object object ) {
-    mTag = object;
-  }
-
-  public void setHotSpotTapListener( HotSpotTapListener hotSpotTapListener ) {
-    mHotSpotTapListener = hotSpotTapListener;
-  }
-
-  public HotSpotTapListener getHotSpotTapListener() {
-    return mHotSpotTapListener;
-  }
-
-  public interface HotSpotTapListener {
-    void onHotSpotTap( HotSpot hotSpot, int x, int y );
-  }
-
-  @Override
-  public boolean equals( Object obj ) {
-    if( obj instanceof HotSpot ) {
-      HotSpot hotSpot = (HotSpot) obj;
-      return super.equals( hotSpot ) && hotSpot.mHotSpotTapListener == mHotSpotTapListener;
-    }
-    return false;
-  }
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/hotspots/HotSpotManager.java b/tileview/src/main/java/com/qozix/tileview/hotspots/HotSpotManager.java
deleted file mode 100644
index b275a98..0000000
--- a/tileview/src/main/java/com/qozix/tileview/hotspots/HotSpotManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.qozix.tileview.hotspots;
-
-import com.qozix.tileview.geom.FloatMathHelper;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-public class HotSpotManager {
-
-    private float mScale = 1;
-
-    private HotSpot.HotSpotTapListener mHotSpotTapListener;
-    private LinkedList<HotSpot> mHotSpots = new LinkedList<HotSpot>();
-
-    public float getScale() {
-        return mScale;
-    }
-
-    public void setScale(float scale) {
-        mScale = scale;
-    }
-
-    public void addHotSpot(HotSpot hotSpot) {
-        mHotSpots.add(hotSpot);
-    }
-
-    public void removeHotSpot(HotSpot hotSpot) {
-        mHotSpots.remove(hotSpot);
-    }
-
-    public void setHotSpotTapListener(HotSpot.HotSpotTapListener hotSpotTapListener) {
-        mHotSpotTapListener = hotSpotTapListener;
-    }
-
-    public void clear() {
-        mHotSpots.clear();
-    }
-
-    private HotSpot getMatch(int x, int y) {
-        int scaledX = FloatMathHelper.unscale(x, mScale);
-        int scaledY = FloatMathHelper.unscale(y, mScale);
-        Iterator<HotSpot> iterator = mHotSpots.descendingIterator();
-        while (iterator.hasNext()) {
-            HotSpot hotSpot = iterator.next();
-            if (hotSpot.contains(scaledX, scaledY)) {
-                return hotSpot;
-            }
-        }
-        return null;
-    }
-
-    public boolean processHit(int x, int y) {
-        boolean ret = false;
-        HotSpot hotSpot = getMatch(x, y);
-        if (hotSpot != null) {
-            HotSpot.HotSpotTapListener spotListener = hotSpot.getHotSpotTapListener();
-            if (spotListener != null) {
-                spotListener.onHotSpotTap(hotSpot, x, y);
-                ret = true;
-            }
-            if (mHotSpotTapListener != null) {
-                mHotSpotTapListener.onHotSpotTap(hotSpot, x, y);
-                ret = true;
-            }
-        }
-        return ret;
-    }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/markers/CalloutLayout.java b/tileview/src/main/java/com/qozix/tileview/markers/CalloutLayout.java
deleted file mode 100644
index 4b52a5c..0000000
--- a/tileview/src/main/java/com/qozix/tileview/markers/CalloutLayout.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.qozix.tileview.markers;
-
-import android.content.Context;
-
-/**
- * @deprecated In the next major version, instances of this class will be replaced
- * by instances of MarkerLayout
- */
-public class CalloutLayout extends MarkerLayout {
-
-  public CalloutLayout( Context context ) {
-    super( context );
-  }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/markers/MarkerLayout.java b/tileview/src/main/java/com/qozix/tileview/markers/MarkerLayout.java
deleted file mode 100644
index 3b9ac4a..0000000
--- a/tileview/src/main/java/com/qozix/tileview/markers/MarkerLayout.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package com.qozix.tileview.markers;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.qozix.tileview.geom.FloatMathHelper;
-
-public class MarkerLayout extends ViewGroup {
-
-    private float mScale = 1;
-
-    private float mAnchorX;
-    private float mAnchorY;
-
-    private MarkerTapListener mMarkerTapListener;
-
-    public MarkerLayout(Context context) {
-        super(context);
-        setClipChildren(false);
-    }
-
-    /**
-     * Sets the anchor values used by this ViewGroup if it's children do not
-     * have anchor values supplied directly (via individual LayoutParams).
-     *
-     * @param aX x-axis anchor value (offset computed by multiplying this value by the child's width).
-     * @param aY y-axis anchor value (offset computed by multiplying this value by the child's height).
-     */
-    public void setAnchors(float aX, float aY) {
-        mAnchorX = aX;
-        mAnchorY = aY;
-        requestLayout();
-    }
-
-    /**
-     * Retrieves the current scale of the MarkerLayout.
-     *
-     * @return The current scale of the MarkerLayout.
-     */
-    public float getScale() {
-        return mScale;
-    }
-
-    /**
-     * Sets the scale (0-1) of the MarkerLayout.
-     *
-     * @param scale The new value of the MarkerLayout scale.
-     */
-    public void setScale(float scale) {
-        mScale = scale;
-        requestLayout();
-    }
-
-    public View addMarker(View view, int x, int y, Float aX, Float aY) {
-        LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, x, y, aX, aY);
-        return addMarker(view, layoutParams);
-    }
-
-    public View addMarker(View view, LayoutParams params) {
-        addView(view, params);
-        return view;
-    }
-
-    public void moveMarker(View view, int x, int y) {
-        LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
-        layoutParams.x = x;
-        layoutParams.y = y;
-        moveMarker(view, layoutParams);
-    }
-
-    public void moveMarker(View view, LayoutParams params) {
-        if (indexOfChild(view) > -1) {
-            view.setLayoutParams(params);
-            requestLayout();
-        }
-    }
-
-    public void removeMarker(View view) {
-        removeView(view);
-    }
-
-    public void setMarkerTapListener(MarkerTapListener markerTapListener) {
-        mMarkerTapListener = markerTapListener;
-    }
-
-    private View getViewFromTap(int x, int y) {
-        for (int i = getChildCount() - 1; i >= 0; i--) {
-            View child = getChildAt(i);
-            LayoutParams layoutParams = (LayoutParams) child.getLayoutParams();
-            Rect hitRect = layoutParams.getHitRect();
-            if (hitRect.contains(x, y)) {
-                return child;
-            }
-        }
-        return null;
-    }
-
-    public boolean processHit(int x, int y) {
-        if (mMarkerTapListener != null) {
-            View view = getViewFromTap(x, y);
-            if (view != null) {
-                mMarkerTapListener.onMarkerTap(view, x, y);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        measureChildren(widthMeasureSpec, heightMeasureSpec);
-        for (int i = 0; i < getChildCount(); i++) {
-            View child = getChildAt(i);
-            if (child.getVisibility() != GONE) {
-                MarkerLayout.LayoutParams layoutParams = (MarkerLayout.LayoutParams) child.getLayoutParams();
-                // get anchor offsets
-                float widthMultiplier = (layoutParams.anchorX == null) ? mAnchorX : layoutParams.anchorX;
-                float heightMultiplier = (layoutParams.anchorY == null) ? mAnchorY : layoutParams.anchorY;
-                // actual sizes of children
-                int actualWidth = child.getMeasuredWidth();
-                int actualHeight = child.getMeasuredHeight();
-                // offset dimensions by anchor values
-                float widthOffset = actualWidth * widthMultiplier;
-                float heightOffset = actualHeight * heightMultiplier;
-                // get offset position
-                int scaledX = FloatMathHelper.scale(layoutParams.x, mScale);
-                int scaledY = FloatMathHelper.scale(layoutParams.y, mScale);
-                // save computed values
-                layoutParams.mLeft = (int) (scaledX + widthOffset);
-                layoutParams.mTop = (int) (scaledY + heightOffset);
-                layoutParams.mRight = layoutParams.mLeft + actualWidth;
-                layoutParams.mBottom = layoutParams.mTop + actualHeight;
-            }
-        }
-        int availableWidth = MeasureSpec.getSize(widthMeasureSpec);
-        int availableHeight = MeasureSpec.getSize(heightMeasureSpec);
-        setMeasuredDimension(availableWidth, availableHeight);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        for (int i = 0; i < getChildCount(); i++) {
-            View child = getChildAt(i);
-            if (child.getVisibility() != GONE) {
-                LayoutParams layoutParams = (LayoutParams) child.getLayoutParams();
-                child.layout(layoutParams.mLeft, layoutParams.mTop, layoutParams.mRight, layoutParams.mBottom);
-            }
-        }
-    }
-
-    @Override
-    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
-        return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0, 0);
-    }
-
-    @Override
-    protected boolean checkLayoutParams(ViewGroup.LayoutParams layoutParams) {
-        return layoutParams instanceof LayoutParams;
-    }
-
-    @Override
-    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams layoutParams) {
-        return new LayoutParams(layoutParams);
-    }
-
-    public interface MarkerTapListener {
-        void onMarkerTap(View view, int x, int y);
-    }
-
-    /**
-     * Per-child layout information associated with AnchorLayout.
-     */
-    public static class LayoutParams extends ViewGroup.LayoutParams {
-
-        /**
-         * The absolute left position of the child in pixels.
-         */
-        public int x = 0;
-
-        /**
-         * The absolute right position of the child in pixels.
-         */
-        public int y = 0;
-
-        /**
-         * Float value to determine the child's horizontal offset.
-         * This float is multiplied by the child's width.
-         * If null, the containing AnchorLayout's anchor values will be used.
-         */
-        public Float anchorX = null;
-
-        /**
-         * Float value to determine the child's vertical offset.
-         * This float is multiplied by the child's height.
-         * If null, the containing AnchorLayout's anchor values will be used.
-         */
-        public Float anchorY = null;
-
-        private int mTop;
-        private int mLeft;
-        private int mBottom;
-        private int mRight;
-
-        private Rect mHitRect;
-
-        /**
-         * Copy constructor.
-         *
-         * @param source LayoutParams instance to copy properties from.
-         */
-        public LayoutParams(ViewGroup.LayoutParams source) {
-            super(source);
-        }
-
-        /**
-         * Creates a new set of layout parameters with the specified values.
-         *
-         * @param width  Information about how wide the view wants to be.  This should generally be WRAP_CONTENT or a fixed value.
-         * @param height Information about how tall the view wants to be.  This should generally be WRAP_CONTENT or a fixed value.
-         */
-        public LayoutParams(int width, int height) {
-            super(width, height);
-        }
-
-        /**
-         * Creates a new set of layout parameters with the specified values.
-         *
-         * @param width  Information about how wide the view wants to be.  This should generally be WRAP_CONTENT or a fixed value.
-         * @param height Information about how tall the view wants to be.  This should generally be WRAP_CONTENT or a fixed value.
-         * @param left   Sets the absolute x value of the view's position in pixels.
-         * @param top    Sets the absolute y value of the view's position in pixels.
-         */
-        public LayoutParams(int width, int height, int left, int top) {
-            super(width, height);
-            x = left;
-            y = top;
-        }
-
-        /**
-         * Creates a new set of layout parameters with the specified values.
-         *
-         * @param width      Information about how wide the view wants to be.  This should generally be WRAP_CONTENT or a fixed value.
-         * @param height     Information about how tall the view wants to be.  This should generally be WRAP_CONTENT or a fixed value.
-         * @param left       Sets the absolute x value of the view's position in pixels.
-         * @param top        Sets the absolute y value of the view's position in pixels.
-         * @param anchorLeft Sets the relative horizontal offset of the view (multiplied by the view's width).
-         * @param anchorTop  Sets the relative vertical offset of the view (multiplied by the view's height).
-         */
-        public LayoutParams(int width, int height, int left, int top, Float anchorLeft, Float anchorTop) {
-            super(width, height);
-            x = left;
-            y = top;
-            anchorX = anchorLeft;
-            anchorY = anchorTop;
-        }
-
-        private Rect getHitRect() {
-            if (mHitRect == null) {
-                mHitRect = new Rect();
-            }
-            mHitRect.left = mLeft;
-            mHitRect.top = mTop;
-            mHitRect.right = mRight;
-            mHitRect.bottom = mBottom;
-            return mHitRect;
-        }
-
-    }
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/paths/CompositePathView.java b/tileview/src/main/java/com/qozix/tileview/paths/CompositePathView.java
deleted file mode 100644
index 3fe0625..0000000
--- a/tileview/src/main/java/com/qozix/tileview/paths/CompositePathView.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.qozix.tileview.paths;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.view.View;
-
-import java.util.HashSet;
-
-public class CompositePathView extends View {
-
-  private static final int DEFAULT_STROKE_COLOR = 0xFF000000;
-  private static final int DEFAULT_STROKE_WIDTH = 10;
-
-  private float mScale = 1;
-
-  private boolean mShouldDraw = true;
-
-  private Path mRecyclerPath = new Path();
-  private Matrix mMatrix = new Matrix();
-
-  private HashSet<DrawablePath> mDrawablePaths = new HashSet<DrawablePath>();
-
-  private Paint mDefaultPaint = new Paint();
-
-  {
-    mDefaultPaint.setStyle( Paint.Style.STROKE );
-    mDefaultPaint.setColor( DEFAULT_STROKE_COLOR );
-    mDefaultPaint.setStrokeWidth( DEFAULT_STROKE_WIDTH );
-    mDefaultPaint.setAntiAlias( true );
-  }
-
-  public CompositePathView( Context context ) {
-    super( context );
-    setWillNotDraw( false );
-  }
-
-  public float getScale() {
-    return mScale;
-  }
-
-  public void setScale( float scale ) {
-    mScale = scale;
-    mMatrix.setScale( mScale, mScale );
-    invalidate();
-  }
-
-  public Paint getDefaultPaint() {
-    return mDefaultPaint;
-  }
-
-  public DrawablePath addPath( Path path, Paint paint ) {
-    if( paint == null ) {
-      paint = mDefaultPaint;
-    }
-    DrawablePath DrawablePath = new DrawablePath();
-    DrawablePath.path = path;
-    DrawablePath.paint = paint;
-    return addPath( DrawablePath );
-  }
-
-  public DrawablePath addPath( DrawablePath DrawablePath ) {
-    mDrawablePaths.add( DrawablePath );
-    invalidate();
-    return DrawablePath;
-  }
-
-  public void removePath( DrawablePath path ) {
-    mDrawablePaths.remove( path );
-    invalidate();
-  }
-
-  public void clear() {
-    mDrawablePaths.clear();
-    invalidate();
-  }
-
-  public void setShouldDraw( boolean shouldDraw ) {
-    mShouldDraw = shouldDraw;
-    invalidate();
-  }
-
-  @Override
-  public void onDraw( Canvas canvas ) {
-    if( mShouldDraw ) {
-      for( DrawablePath drawablePath : mDrawablePaths ) {
-        mRecyclerPath.set( drawablePath.path );
-        mRecyclerPath.transform( mMatrix );
-        canvas.drawPath( mRecyclerPath, drawablePath.paint );
-      }
-    }
-    super.onDraw( canvas );
-  }
-
-  public static class DrawablePath {
-
-    /**
-     * The path that this drawable will follow.
-     */
-    public Path path;
-
-    /**
-     * The paint to be used for this path.
-     */
-    public Paint paint;
-
-  }
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/Tile.java b/tileview/src/main/java/com/qozix/tileview/tiles/Tile.java
deleted file mode 100644
index 7c2a651..0000000
--- a/tileview/src/main/java/com/qozix/tileview/tiles/Tile.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package com.qozix.tileview.tiles;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.view.animation.AnimationUtils;
-
-import com.qozix.tileview.detail.DetailLevel;
-import com.qozix.tileview.detail.DetailLevelManager;
-import com.qozix.tileview.geom.FloatMathHelper;
-import com.qozix.tileview.graphics.BitmapProvider;
-
-import java.lang.ref.WeakReference;
-import java.util.Objects;
-
-public class Tile {
-
-  public enum State {
-    UNASSIGNED,
-    PENDING_DECODE,
-    DECODED
-  }
-
-  private static final int DEFAULT_TRANSITION_DURATION = 200;
-
-  private State mState = State.UNASSIGNED;
-
-  private int mWidth;
-  private int mHeight;
-  private int mLeft;
-  private int mTop;
-  private int mRight;
-  private int mBottom;
-
-  private float mProgress;
-
-  private int mRow;
-  private int mColumn;
-
-  private float mDetailLevelScale;
-
-  private Object mData;
-  private Bitmap mBitmap;
-
-  private Rect mIntrinsicRect = new Rect();
-  private Rect mBaseRect = new Rect();
-  private Rect mRelativeRect = new Rect();
-  private Rect mScaledRect = new Rect();
-
-  public Long mRenderTimeStamp;
-
-  private boolean mTransitionsEnabled;
-
-  private int mTransitionDuration = DEFAULT_TRANSITION_DURATION;
-
-  private Paint mPaint;
-
-  private DetailLevel mDetailLevel;
-
-  private WeakReference<TileRenderRunnable> mTileRenderRunnableWeakReference;
-
-  public Tile( int column, int row, int width, int height, Object data, DetailLevel detailLevel ) {
-    mRow = row;
-    mColumn = column;
-    mWidth = width;
-    mHeight = height;
-    mLeft = column * width;
-    mTop = row * height;
-    mRight = mLeft + mWidth;
-    mBottom = mTop + mHeight;
-    mData = data;
-    mDetailLevel = detailLevel;
-    mDetailLevelScale = mDetailLevel.getScale();
-    mIntrinsicRect.set( 0, 0, mWidth, mHeight );
-    mBaseRect.set( mLeft, mTop, mRight, mBottom );
-    mRelativeRect.set(
-      FloatMathHelper.unscale( mLeft, mDetailLevelScale ),
-      FloatMathHelper.unscale( mTop, mDetailLevelScale ),
-      FloatMathHelper.unscale( mRight, mDetailLevelScale ),
-      FloatMathHelper.unscale( mBottom, mDetailLevelScale )
-    );
-    mScaledRect.set( mRelativeRect );
-  }
-
-  public int getWidth() {
-    return mWidth;
-  }
-
-  public int getHeight() {
-    return mHeight;
-  }
-
-  public int getLeft() {
-    return mLeft;
-  }
-
-  public int getTop() {
-    return mTop;
-  }
-
-  public int getRow() {
-    return mRow;
-  }
-
-  public int getColumn() {
-    return mColumn;
-  }
-
-  public Object getData() {
-    return mData;
-  }
-
-  public Bitmap getBitmap() {
-    return mBitmap;
-  }
-
-  public boolean hasBitmap() {
-    return mBitmap != null;
-  }
-
-  public Rect getBaseRect() {
-    return mBaseRect;
-  }
-
-  public Rect getRelativeRect() {
-    return mRelativeRect;
-  }
-
-  /**
-   * @deprecated
-   * @return
-   */
-  public float getRendered() {
-    return mProgress;
-  }
-
-  /**
-   * @deprecated
-   */
-  public void stampTime() {
-    // no op
-  }
-
-  public Rect getScaledRect( float scale ) {
-    mScaledRect.set(
-      (int) (mRelativeRect.left * scale),
-      (int) (mRelativeRect.top * scale),
-      (int) (mRelativeRect.right * scale),
-      (int) (mRelativeRect.bottom * scale)
-    );
-    return mScaledRect;
-  }
-
-  public void setTransitionDuration( int transitionDuration ) {
-    mTransitionDuration = transitionDuration;
-  }
-
-  public State getState() {
-    return mState;
-  }
-
-  public void setState( State state ) {
-    mState = state;
-  }
-
-  public void execute( TileRenderPoolExecutor tileRenderPoolExecutor ) {
-    if(mState != State.UNASSIGNED){
-      return;
-    }
-    mState = State.PENDING_DECODE;
-    TileRenderRunnable runnable = new TileRenderRunnable();
-    mTileRenderRunnableWeakReference = new WeakReference<>( runnable );
-    runnable.setTile( this );
-    runnable.setTileRenderPoolExecutor( tileRenderPoolExecutor );
-    tileRenderPoolExecutor.execute( runnable );
-  }
-
-  public void computeProgress(){
-    if( !mTransitionsEnabled ) {
-      return;
-    }
-    if( mRenderTimeStamp == null ) {
-      mRenderTimeStamp = AnimationUtils.currentAnimationTimeMillis();
-      mProgress = 0;
-      return;
-    }
-    double elapsed = AnimationUtils.currentAnimationTimeMillis() - mRenderTimeStamp;
-    mProgress = (float) Math.min( 1, elapsed / mTransitionDuration );
-    if( mProgress == 1f ) {
-      mRenderTimeStamp = null;
-      mTransitionsEnabled = false;
-    }
-  }
-
-  public void setTransitionsEnabled( boolean enabled ) {
-    mTransitionsEnabled = enabled;
-    if( enabled ) {
-      mProgress = 0f;
-    }
-  }
-
-  public DetailLevel getDetailLevel() {
-    return mDetailLevel;
-  }
-
-  public boolean getIsDirty() {
-    return mTransitionsEnabled && mProgress < 1f;
-  }
-
-  public Paint getPaint() {
-    if( !mTransitionsEnabled ) {
-      return mPaint = null;
-    }
-    if( mPaint == null ) {
-      mPaint = new Paint();
-    }
-    mPaint.setAlpha( (int) (255 * mProgress) );
-    return mPaint;
-  }
-
-  void generateBitmap( Context context, BitmapProvider bitmapProvider ) {
-    if( mBitmap != null ) {
-      return;
-    }
-    mBitmap = bitmapProvider.getBitmap( this, context );
-    mState = State.DECODED;
-  }
-
-  /**
-   * Deprecated
-   * @param b
-   */
-  void destroy( boolean b ) {
-    reset();
-  }
-
-  void reset() {
-    if( mState == State.PENDING_DECODE ) {
-      if ( mTileRenderRunnableWeakReference != null ) {
-        TileRenderRunnable runnable = mTileRenderRunnableWeakReference.get();
-        if( runnable != null ) {
-          runnable.cancel( true );
-        }
-      }
-    }
-    mState = State.UNASSIGNED;
-    mRenderTimeStamp = null;
-    if( mBitmap != null && !mBitmap.isRecycled() ) {
-      mBitmap.recycle();
-    }
-    mBitmap = null;
-  }
-
-  /**
-   * @param canvas The canvas the tile's bitmap should be drawn into
-   */
-  public void draw( Canvas canvas ) {
-    if( mBitmap != null ) {
-      canvas.drawBitmap( mBitmap, mIntrinsicRect, mRelativeRect, getPaint() );
-    }
-  }
-
-  @Override
-  public int hashCode() {
-    int hash = 17;
-    hash = hash * 31 + getColumn();
-    hash = hash * 31 + getRow();
-    hash = hash * 31 + (int) ( 1000 * getDetailLevel().getScale() );
-    DetailLevelManager.LevelType levelType = getDetailLevel().getLevelType();
-    if( levelType != null ) hash = hash * 31 + levelType.hashCode();
-    return hash;
-  }
-
-  @Override
-  public boolean equals( Object o ) {
-    if( this == o ) {
-      return true;
-    }
-    if( o instanceof Tile ) {
-      Tile m = (Tile) o;
-      return m.getRow() == getRow()
-        && m.getColumn() == getColumn()
-        && m.getDetailLevel().getScale() == getDetailLevel().getScale()
-        && ( m.getDetailLevel().getLevelType() == null
-              ? getDetailLevel().getLevelType() == null
-              : m.getDetailLevel().getLevelType().equals( getDetailLevel().getLevelType() ) );
-    }
-    return false;
-  }
-
-  public String toShortString(){
-    return mColumn + ":" + mRow;
-  }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java b/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java
deleted file mode 100644
index 7fd3d71..0000000
--- a/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java
+++ /dev/null
@@ -1,492 +0,0 @@
-package com.qozix.tileview.tiles;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.view.ViewGroup;
-
-import com.qozix.tileview.detail.DetailLevel;
-import com.qozix.tileview.graphics.BitmapProvider;
-import com.qozix.tileview.graphics.BitmapProviderAssets;
-
-import java.lang.ref.WeakReference;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * This class extends ViewGroup for legacy reasons, and may be changed to extend View at
- * some future point; consider all ViewGroup methods deprecated.
- */
-public class TileCanvasViewGroup extends ViewGroup {
-
-    public static final int DEFAULT_RENDER_BUFFER = 250;
-    public static final int FAST_RENDER_BUFFER = 15;
-    private static final int RENDER_FLAG = 1;
-    private static final int DEFAULT_TRANSITION_DURATION = 200;
-
-    private float mScale = 1;
-
-    private BitmapProvider mBitmapProvider;
-
-    private DetailLevel mDetailLevelToRender;
-    private DetailLevel mLastRenderedDetailLevel;
-
-
-    private boolean mRenderIsCancelled = false;
-    private boolean mRenderIsSuppressed = false;
-    private boolean mIsRendering = false;
-
-    private boolean mShouldRecycleBitmaps = true;
-
-    private boolean mTransitionsEnabled = true;
-    private int mTransitionDuration = DEFAULT_TRANSITION_DURATION;
-
-    private TileRenderThrottleHandler mTileRenderThrottleHandler;
-    private TileRenderListener mTileRenderListener;
-    private TileRenderThrowableListener mTileRenderThrowableListener;
-
-    private int mRenderBuffer = DEFAULT_RENDER_BUFFER;
-
-    private TileRenderPoolExecutor mTileRenderPoolExecutor;
-
-    private Set<Tile> mTilesInCurrentViewport = new HashSet<>();
-    private Set<Tile> mPreviouslyDrawnTiles = new HashSet<>();
-    private Set<Tile> mDecodedTilesInCurrentViewport = new HashSet<>();
-
-    private Region mDirtyRegion = new Region();
-
-    private boolean mHasInvalidatedOnCleanOnce;
-    // This runnable is required to run on UI thread
-    private Runnable mRenderPostExecuteRunnable = new Runnable() {
-        @Override
-        public void run() {
-            cleanup();
-            if (mTileRenderListener != null) {
-                mTileRenderListener.onRenderComplete();
-            }
-            mLastRenderedDetailLevel = mDetailLevelToRender;
-            requestRender();
-        }
-    };
-
-    public TileCanvasViewGroup(Context context) {
-        super(context);
-        setWillNotDraw(false);
-        mTileRenderThrottleHandler = new TileRenderThrottleHandler(this);
-        mTileRenderPoolExecutor = new TileRenderPoolExecutor();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-
-    }
-
-    public float getScale() {
-        return mScale;
-    }
-
-    public void setScale(float factor) {
-        mScale = factor;
-        invalidate();
-    }
-
-    public float getInvertedScale() {
-        return 1f / mScale;
-    }
-
-    public boolean getTransitionsEnabled() {
-        return mTransitionsEnabled;
-    }
-
-    public void setTransitionsEnabled(boolean enabled) {
-        mTransitionsEnabled = enabled;
-    }
-
-    public int getTransitionDuration() {
-        return mTransitionDuration;
-    }
-
-    public void setTransitionDuration(int duration) {
-        mTransitionDuration = duration;
-    }
-
-    public BitmapProvider getBitmapProvider() {
-        if (mBitmapProvider == null) {
-            mBitmapProvider = new BitmapProviderAssets();
-        }
-        return mBitmapProvider;
-    }
-
-    public void setBitmapProvider(BitmapProvider bitmapProvider) {
-        mBitmapProvider = bitmapProvider;
-    }
-
-    public void setTileRenderListener(TileRenderListener tileRenderListener) {
-        mTileRenderListener = tileRenderListener;
-    }
-
-    public int getRenderBuffer() {
-        return mRenderBuffer;
-    }
-
-    public void setRenderBuffer(int renderBuffer) {
-        mRenderBuffer = renderBuffer;
-    }
-
-    /**
-     * @return True if tile bitmaps should be recycled.
-     * @deprecated This value is no longer considered - bitmaps are always recycled when they're no longer used.
-     */
-    public boolean getShouldRecycleBitmaps() {
-        return mShouldRecycleBitmaps;
-    }
-
-    /**
-     * @param shouldRecycleBitmaps True if tile bitmaps should be recycled.
-     * @deprecated This value is no longer considered - bitmaps are always recycled when they're no longer used.
-     */
-    public void setShouldRecycleBitmaps(boolean shouldRecycleBitmaps) {
-        mShouldRecycleBitmaps = shouldRecycleBitmaps;
-    }
-
-    public void setTileRenderThrowableListener(TileRenderThrowableListener tileRenderThrowableListener) {
-        mTileRenderThrowableListener = tileRenderThrowableListener;
-    }
-
-    /**
-     * The layout dimensions supplied to this ViewGroup will be exactly as large as the scaled
-     * width and height of the containing ZoomPanLayout (or TileView).  However, when the canvas
-     * is scaled, it's clip area is also scaled - offset this by providing dimensions scaled as
-     * large as the smallest size the TileCanvasView might be.
-     */
-
-    public void requestRender() {
-        mRenderIsCancelled = false;
-        if (mDetailLevelToRender == null) {
-            return;
-        }
-        if (!mTileRenderThrottleHandler.hasMessages(RENDER_FLAG)) {
-            mTileRenderThrottleHandler.sendEmptyMessageDelayed(RENDER_FLAG, mRenderBuffer);
-        }
-    }
-
-    /**
-     * Prevent new render tasks from starting, attempts to interrupt ongoing tasks, and will
-     * prevent queued tiles from begin decoded or rendered.
-     */
-    public void cancelRender() {
-        mRenderIsCancelled = true;
-        if (mTileRenderPoolExecutor != null) {
-            mTileRenderPoolExecutor.cancel();
-        }
-    }
-
-    /**
-     * Prevent new render tasks from starting, but does not cancel any ongoing operations.
-     */
-    public void suppressRender() {
-        mRenderIsSuppressed = true;
-    }
-
-    /**
-     * Enables new render tasks to start.
-     */
-    public void resumeRender() {
-        mRenderIsSuppressed = false;
-    }
-
-    /**
-     * Returns true if the TileView has threads currently decoding tile Bitmaps.
-     *
-     * @return True if the TileView has threads currently decoding tile Bitmaps.
-     */
-    public boolean getIsRendering() {
-        return mIsRendering;
-    }
-
-    /**
-     * Clears existing tiles and cancels any existing render tasks.
-     */
-    public void clear() {
-        cancelRender();
-        mTilesInCurrentViewport.clear();
-        mPreviouslyDrawnTiles.clear();
-        invalidate();
-    }
-
-    /**
-     * This function is now a no-op
-     *
-     * @param recentlyComputedVisibleTileSet
-     * @deprecated
-     */
-    public void reconcile(Set<Tile> recentlyComputedVisibleTileSet) {
-        // noop
-    }
-
-    void renderTiles() {
-        if (!mRenderIsCancelled && !mRenderIsSuppressed && mDetailLevelToRender != null) {
-            beginRenderTask();
-        }
-    }
-
-    private Rect getComputedViewport() {
-        if (mDetailLevelToRender == null) {
-            return null;
-        }
-        return mDetailLevelToRender.getDetailLevelManager().getComputedScaledViewport(getInvertedScale());
-    }
-
-    private boolean establishDirtyRegion() {
-        boolean shouldInvalidate = false;
-        mDirtyRegion.set(getComputedViewport());
-        for (Tile tile : mTilesInCurrentViewport) {
-            if (tile.getState() == Tile.State.DECODED) {
-                tile.computeProgress();
-                mDecodedTilesInCurrentViewport.add(tile);
-                if (tile.getIsDirty()) {
-                    shouldInvalidate = true;
-                } else {
-                    mDirtyRegion.op(tile.getRelativeRect(), Region.Op.DIFFERENCE);
-                }
-            }
-        }
-        return shouldInvalidate;
-    }
-
-    private boolean drawPreviousTiles(Canvas canvas) {
-        boolean shouldInvalidate = false;
-        Iterator<Tile> tilesFromLastDetailLevelIterator = mPreviouslyDrawnTiles.iterator();
-        while (tilesFromLastDetailLevelIterator.hasNext()) {
-            Tile tile = tilesFromLastDetailLevelIterator.next();
-            Rect rect = tile.getRelativeRect();
-            if (mDirtyRegion.quickReject(rect)) {
-                tilesFromLastDetailLevelIterator.remove();
-            } else {
-                tile.computeProgress();
-                tile.draw(canvas);
-                shouldInvalidate |= tile.getIsDirty();
-            }
-        }
-        return shouldInvalidate;
-    }
-
-    private boolean drawAndClearCurrentDecodedTiles(Canvas canvas) {
-        boolean shouldInvalidate = false;
-        for (Tile tile : mDecodedTilesInCurrentViewport) {
-            // these tiles should already have progress computed by the time they get here
-            tile.draw(canvas);
-            shouldInvalidate |= tile.getIsDirty();
-        }
-        mDecodedTilesInCurrentViewport.clear();
-        return shouldInvalidate;
-    }
-
-    private void handleInvalidation(boolean shouldInvalidate) {
-        if (shouldInvalidate) {
-            // there's more work to do, partially opaque tiles were drawn
-            mHasInvalidatedOnCleanOnce = false;
-            invalidate();
-        } else {
-            // if all tiles were fully opaque, we need another pass to clear our tiles from last level
-            if (!mHasInvalidatedOnCleanOnce) {
-                mHasInvalidatedOnCleanOnce = true;
-                invalidate();
-            }
-        }
-    }
-
-    private void drawTilesWithoutConsideringPreviouslyDrawnLevel(Canvas canvas) {
-        boolean shouldInvalidate = false;
-        for (Tile tile : mTilesInCurrentViewport) {
-            if (tile.getState() == Tile.State.DECODED) {
-                tile.computeProgress();
-                tile.draw(canvas);
-                shouldInvalidate |= tile.getIsDirty();
-            }
-        }
-        handleInvalidation(shouldInvalidate);
-    }
-
-    private void drawTilesConsideringPreviouslyDrawnLevel(Canvas canvas) {
-        // compute states, populate opaque region
-        boolean shouldInvalidate = establishDirtyRegion();
-        // draw any previous tiles that are in viewport and not under full opaque current tiles
-        shouldInvalidate |= drawPreviousTiles(canvas);
-        // draw the current tile set
-        shouldInvalidate |= drawAndClearCurrentDecodedTiles(canvas);
-        // depending on transition states and previous tile draw ops, add'l invalidation might be needed
-        handleInvalidation(shouldInvalidate);
-    }
-
-    /**
-     * Draw tile bitmaps into the surface canvas displayed by this View.
-     *
-     * @param canvas The Canvas instance to draw tile bitmaps into.
-     */
-    private void drawTiles(Canvas canvas) {
-        if (mPreviouslyDrawnTiles.size() > 0) {
-            drawTilesConsideringPreviouslyDrawnLevel(canvas);
-        } else {
-            drawTilesWithoutConsideringPreviouslyDrawnLevel(canvas);
-        }
-    }
-
-    public void updateTileSet(DetailLevel detailLevel) {
-        if (detailLevel == null) {
-            return;
-        }
-        if (detailLevel.equals(mDetailLevelToRender)) {
-            return;
-        }
-        cancelRender();
-        markTilesAsPrevious();
-        mDetailLevelToRender = detailLevel;
-        requestRender();
-    }
-
-    private void markTilesAsPrevious() {
-        for (Tile tile : mTilesInCurrentViewport) {
-            if (tile.getState() == Tile.State.DECODED) {
-                mPreviouslyDrawnTiles.add(tile);
-            }
-        }
-        mTilesInCurrentViewport.clear();
-    }
-
-    private void beginRenderTask() {
-        // if visible columns and rows are same as previously computed, fast-fail
-        boolean changed = mDetailLevelToRender.computeCurrentState();
-        if (!changed && mDetailLevelToRender.equals(mLastRenderedDetailLevel)) {
-            return;
-        }
-        requiredBeginRenderTask();
-    }
-
-    public void requiredBeginRenderTask() {
-        // determine tiles are mathematically within the current viewport; force re-computation
-        mDetailLevelToRender.computeVisibleTilesFromViewport();
-        // get rid of anything outside, use previously computed intersections
-        cleanup();
-        // are there any new tiles the Executor isn't already aware of?
-        boolean wereTilesAdded = mTilesInCurrentViewport.addAll(mDetailLevelToRender.getVisibleTilesFromLastViewportComputation());
-        // if so, start up a new batch
-        if (wereTilesAdded) {
-            mTileRenderPoolExecutor.queue(this, mTilesInCurrentViewport);
-        }
-    }
-
-    /**
-     * This should seldom be necessary, as it's built into beginRenderTask
-     */
-    public void cleanup() {
-        if (mDetailLevelToRender == null || !mDetailLevelToRender.hasComputedState()) {
-            return;
-        }
-        // these tiles are mathematically within the current viewport, and should be already computed
-        Set<Tile> recentlyComputedVisibleTileSet = mDetailLevelToRender.getVisibleTilesFromLastViewportComputation();
-        // use an iterator to avoid concurrent modification
-        Iterator<Tile> tilesInCurrentViewportIterator = mTilesInCurrentViewport.iterator();
-        while (tilesInCurrentViewportIterator.hasNext()) {
-            Tile tile = tilesInCurrentViewportIterator.next();
-            // this tile was visible previously, but is no longer, destroy and de-list it
-            if (!recentlyComputedVisibleTileSet.contains(tile)) {
-                tile.reset();
-                tilesInCurrentViewportIterator.remove();
-            }
-        }
-    }
-
-    // this tile has been decoded by the time it gets passed here
-    void addTileToCanvas(final Tile tile) {
-        if (mTilesInCurrentViewport.contains(tile)) {
-            invalidate();
-        }
-    }
-
-    void onRenderTaskPreExecute() {
-        mIsRendering = true;
-        if (mTileRenderListener != null) {
-            mTileRenderListener.onRenderStart();
-        }
-    }
-
-    void onRenderTaskCancelled() {
-        if (mTileRenderListener != null) {
-            mTileRenderListener.onRenderCancelled();
-        }
-        mIsRendering = false;
-    }
-
-    void onRenderTaskPostExecute() {
-        mIsRendering = false;
-        mTileRenderThrottleHandler.post(mRenderPostExecuteRunnable);
-    }
-
-    void handleTileRenderException(Throwable throwable) {
-        if (mTileRenderThrowableListener != null) {
-            mTileRenderThrowableListener.onRenderThrow(throwable);
-        }
-    }
-
-    boolean getRenderIsCancelled() {
-        return mRenderIsCancelled;
-    }
-
-    public void destroy() {
-        mTileRenderPoolExecutor.shutdownNow();
-        clear();
-        if (!mTileRenderThrottleHandler.hasMessages(RENDER_FLAG)) {
-            mTileRenderThrottleHandler.removeMessages(RENDER_FLAG);
-        }
-    }
-
-    @Override
-    public void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        canvas.save();
-        canvas.scale(mScale, mScale);
-        drawTiles(canvas);
-        canvas.restore();
-    }
-
-    /**
-     * Interface definition for callbacks to be invoked after render operations.
-     */
-    public interface TileRenderListener {
-        void onRenderStart();
-
-        void onRenderCancelled();
-
-        void onRenderComplete();
-    }
-
-    // ideally this would be part of TileRenderListener, but that's a breaking change
-    public interface TileRenderThrowableListener {
-        void onRenderThrow(Throwable throwable);
-    }
-
-    private static class TileRenderThrottleHandler extends Handler {
-
-        private final WeakReference<TileCanvasViewGroup> mTileCanvasViewGroupWeakReference;
-
-        public TileRenderThrottleHandler(TileCanvasViewGroup tileCanvasViewGroup) {
-            super(Looper.getMainLooper());
-            mTileCanvasViewGroupWeakReference = new WeakReference<>(tileCanvasViewGroup);
-        }
-
-        @Override
-        public final void handleMessage(Message message) {
-            final TileCanvasViewGroup tileCanvasViewGroup = mTileCanvasViewGroupWeakReference.get();
-            if (tileCanvasViewGroup != null) {
-                tileCanvasViewGroup.renderTiles();
-            }
-        }
-    }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderHandler.java b/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderHandler.java
deleted file mode 100644
index c71b562..0000000
--- a/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.qozix.tileview.tiles;
-
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-
-import java.lang.ref.WeakReference;
-
-/**
- * @author Mike Dunn, 3/10/16.
- */
-class TileRenderHandler extends Handler {
-
-  public static final int RENDER_ERROR = -1;
-  public static final int RENDER_INCOMPLETE = 0;
-  public static final int RENDER_COMPLETE = 1;
-
-  public enum Status {
-
-    ERROR( RENDER_ERROR ),
-    INCOMPLETE( RENDER_INCOMPLETE ),
-    COMPLETE( RENDER_COMPLETE );
-
-    private int mMessageCode;
-
-    Status( int messageCode ) {
-      mMessageCode = messageCode;
-    }
-
-    int getMessageCode() {
-      return mMessageCode;
-    }
-
-  }
-
-  private WeakReference<TileCanvasViewGroup> mTileCanvasViewGroupWeakReference;
-
-  public TileRenderHandler() {
-    this( Looper.getMainLooper() );
-  }
-
-  public TileRenderHandler( Looper looper ) {
-    super( looper );
-  }
-
-  public void setTileCanvasViewGroup( TileCanvasViewGroup tileCanvasViewGroup ) {
-    mTileCanvasViewGroupWeakReference = new WeakReference<>( tileCanvasViewGroup );
-  }
-
-  public TileCanvasViewGroup getTileCanvasViewGroup() {
-    if( mTileCanvasViewGroupWeakReference == null ) {
-      return null;
-    }
-    return mTileCanvasViewGroupWeakReference.get();
-  }
-
-  @Override
-  public void handleMessage( Message message ) {
-    TileRenderRunnable tileRenderRunnable = (TileRenderRunnable) message.obj;
-    TileCanvasViewGroup tileCanvasViewGroup = getTileCanvasViewGroup();
-    if( tileCanvasViewGroup == null ) {
-      return;
-    }
-    Tile tile = tileRenderRunnable.getTile();
-    if( tile == null ) {
-      return;
-    }
-    switch( message.what ) {
-      case RENDER_ERROR:
-        tileCanvasViewGroup.handleTileRenderException( tileRenderRunnable.getThrowable() );
-        break;
-      case RENDER_COMPLETE:
-        tileCanvasViewGroup.addTileToCanvas( tile );
-        break;
-    }
-  }
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderPoolExecutor.java b/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderPoolExecutor.java
deleted file mode 100644
index 51a85ed..0000000
--- a/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderPoolExecutor.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.qozix.tileview.tiles;
-
-import android.os.Handler;
-
-import java.lang.ref.WeakReference;
-import java.util.Set;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-public class TileRenderPoolExecutor extends ThreadPoolExecutor {
-
-  private static final int KEEP_ALIVE_TIME = 1;
-  private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
-
-  private static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();
-  private static final int INITIAL_POOL_SIZE = AVAILABLE_PROCESSORS >> 1;
-  private static final int MAXIMUM_POOL_SIZE = AVAILABLE_PROCESSORS;
-
-  private WeakReference<TileCanvasViewGroup> mTileCanvasViewGroupWeakReference;
-
-  private TileRenderHandler mHandler = new TileRenderHandler();
-
-  public TileRenderPoolExecutor() {
-    super(
-      INITIAL_POOL_SIZE,
-      MAXIMUM_POOL_SIZE,
-      KEEP_ALIVE_TIME,
-      KEEP_ALIVE_TIME_UNIT,
-      new LinkedBlockingDeque<Runnable>()
-    );
-  }
-
-  public void queue( TileCanvasViewGroup tileCanvasViewGroup, Set<Tile> renderSet ) {
-    mTileCanvasViewGroupWeakReference = new WeakReference<>( tileCanvasViewGroup );
-    mHandler.setTileCanvasViewGroup( tileCanvasViewGroup );
-    tileCanvasViewGroup.onRenderTaskPreExecute();
-    for( Runnable runnable : getQueue() ) {
-      if( runnable instanceof TileRenderRunnable ) {
-        TileRenderRunnable tileRenderRunnable = (TileRenderRunnable) runnable;
-        if( tileRenderRunnable.isDone() || tileRenderRunnable.isCancelled() ) {
-          continue;
-        }
-        Tile tile = tileRenderRunnable.getTile();
-        if( tile != null &&  !renderSet.contains( tile ) ) {
-          tile.reset();
-        }
-      }
-    }
-    for( Tile tile : renderSet ) {
-      if( isShutdownOrTerminating() ) {
-        return;
-      }
-      tile.execute( this );
-    }
-  }
-
-  public Handler getHandler(){
-    return mHandler;
-  }
-
-  public TileCanvasViewGroup getTileCanvasViewGroup(){
-    if( mTileCanvasViewGroupWeakReference == null ) {
-      return null;
-    }
-    return mTileCanvasViewGroupWeakReference.get();
-  }
-
-  private void broadcastCancel() {
-    if( mTileCanvasViewGroupWeakReference != null ) {
-      TileCanvasViewGroup tileCanvasViewGroup = mTileCanvasViewGroupWeakReference.get();
-      if( tileCanvasViewGroup != null ) {
-        tileCanvasViewGroup.onRenderTaskCancelled();
-      }
-    }
-  }
-
-  public void cancel() {
-    for( Runnable runnable : getQueue() ) {
-      if( runnable instanceof TileRenderRunnable ) {
-        TileRenderRunnable tileRenderRunnable = (TileRenderRunnable) runnable;
-        tileRenderRunnable.cancel( true );
-        Tile tile = tileRenderRunnable.getTile();
-        if( tile != null ) {
-          tile.reset();
-        }
-      }
-    }
-    getQueue().clear();
-    broadcastCancel();
-  }
-
-  public boolean isShutdownOrTerminating() {
-    return isShutdown() || isTerminating() || isTerminated();
-  }
-
-  @Override
-  protected void afterExecute( Runnable runnable, Throwable throwable ) {
-    synchronized( this ) {
-      super.afterExecute( runnable, throwable );
-      if( getQueue().size() == 0 && getActiveCount() == 1 ) {
-        TileCanvasViewGroup tileCanvasViewGroup = mTileCanvasViewGroupWeakReference.get();
-        if( tileCanvasViewGroup != null ) {
-          tileCanvasViewGroup.onRenderTaskPostExecute();
-        }
-      }
-    }
-  }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderRunnable.java b/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderRunnable.java
deleted file mode 100644
index 92a629e..0000000
--- a/tileview/src/main/java/com/qozix/tileview/tiles/TileRenderRunnable.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.qozix.tileview.tiles;
-
-import android.os.Handler;
-import android.os.Message;
-import android.os.Process;
-
-import java.lang.ref.WeakReference;
-
-/**
- * @author Mike Dunn, 3/10/16.
- */
-class TileRenderRunnable implements Runnable {
-
-  private WeakReference<Tile> mTileWeakReference;
-  private WeakReference<TileRenderPoolExecutor> mTileRenderPoolExecutorWeakReference;
-
-  private boolean mCancelled = false;
-  private boolean mComplete = false;
-
-  private volatile Thread mThread;
-
-  private Throwable mThrowable;
-
-  public boolean cancel( boolean mayInterrupt ) {
-    if( mayInterrupt && mThread != null ) {
-      mThread.interrupt();
-    }
-    boolean cancelled = mCancelled;
-    mCancelled = true;
-    if( mTileRenderPoolExecutorWeakReference != null ) {
-      TileRenderPoolExecutor tileRenderPoolExecutor = mTileRenderPoolExecutorWeakReference.get();
-      if(tileRenderPoolExecutor != null){
-        tileRenderPoolExecutor.remove( this );
-      }
-    }
-    return !cancelled;
-  }
-
-  public boolean isCancelled() {
-    return mCancelled;
-  }
-
-  public boolean isDone() {
-    return mComplete;
-  }
-
-  public void setTileRenderPoolExecutor(TileRenderPoolExecutor tileRenderPoolExecutor ) {
-    mTileRenderPoolExecutorWeakReference = new WeakReference<>(tileRenderPoolExecutor);
-  }
-
-  public void setTile( Tile tile ) {
-    mTileWeakReference = new WeakReference<>( tile );
-  }
-
-  public Tile getTile() {
-    if( mTileWeakReference != null ) {
-      return mTileWeakReference.get();
-    }
-    return null;
-  }
-
-  public Throwable getThrowable() {
-    return mThrowable;
-  }
-
-  public TileRenderHandler.Status renderTile() {
-    if( mCancelled ) {
-      return TileRenderHandler.Status.INCOMPLETE;
-    }
-    android.os.Process.setThreadPriority( Process.THREAD_PRIORITY_BACKGROUND );
-    if( mThread.isInterrupted() ) {
-      return TileRenderHandler.Status.INCOMPLETE;
-    }
-    Tile tile = getTile();
-    if( tile == null ) {
-      return TileRenderHandler.Status.INCOMPLETE;
-    }
-    TileRenderPoolExecutor tileRenderPoolExecutor = mTileRenderPoolExecutorWeakReference.get();
-    if( tileRenderPoolExecutor == null ) {
-      return TileRenderHandler.Status.INCOMPLETE;
-    }
-    TileCanvasViewGroup tileCanvasViewGroup = tileRenderPoolExecutor.getTileCanvasViewGroup();
-    if(tileCanvasViewGroup == null ) {
-      return TileRenderHandler.Status.INCOMPLETE;
-    }
-    try {
-      tile.generateBitmap( tileCanvasViewGroup.getContext(), tileCanvasViewGroup.getBitmapProvider() );
-    } catch( Throwable throwable ) {
-      mThrowable = throwable;
-      return TileRenderHandler.Status.ERROR;
-    }
-    if( mCancelled || tile.getBitmap() == null || mThread.isInterrupted() ) {
-      tile.reset();
-      return TileRenderHandler.Status.INCOMPLETE;
-    }
-    return TileRenderHandler.Status.COMPLETE;
-  }
-
-  @Override
-  public void run() {
-    mThread = Thread.currentThread();
-    TileRenderHandler.Status status = renderTile();
-    if( status == TileRenderHandler.Status.INCOMPLETE ) {
-      return;
-    }
-    if( status == TileRenderHandler.Status.COMPLETE ) {
-      mComplete = true;
-    }
-    TileRenderPoolExecutor tileRenderPoolExecutor = mTileRenderPoolExecutorWeakReference.get();
-    if( tileRenderPoolExecutor != null ) {
-      TileCanvasViewGroup tileCanvasViewGroup = tileRenderPoolExecutor.getTileCanvasViewGroup();
-      if( tileCanvasViewGroup != null ) {
-        Tile tile = getTile();
-        if( tile != null ) {
-          Handler handler = tileRenderPoolExecutor.getHandler();
-          if( handler != null ) {
-            // need to stamp time now, since it'll be drawn before the handler posts
-            tile.setTransitionsEnabled( tileCanvasViewGroup.getTransitionsEnabled() );
-            tile.setTransitionDuration( tileCanvasViewGroup.getTransitionDuration() );
-            Message message = handler.obtainMessage( status.getMessageCode(), this );
-            message.sendToTarget();
-          }
-        }
-      }
-
-    }
-  }
-
-}
diff --git a/tileview/src/main/java/com/qozix/tileview/view/TouchUpGestureDetector.java b/tileview/src/main/java/com/qozix/tileview/view/TouchUpGestureDetector.java
deleted file mode 100644
index 3b2939c..0000000
--- a/tileview/src/main/java/com/qozix/tileview/view/TouchUpGestureDetector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.qozix.tileview.view;
-
-import android.view.MotionEvent;
-
-/**
- * @author Mike Dunn, 10/6/15.
- */
-public class TouchUpGestureDetector {
-
-  private OnTouchUpListener mOnTouchUpListener;
-
-  public TouchUpGestureDetector( OnTouchUpListener listener ) {
-    mOnTouchUpListener = listener;
-  }
-
-  public boolean onTouchEvent( MotionEvent event ) {
-    if( event.getActionMasked() == MotionEvent.ACTION_UP ) {
-      if( mOnTouchUpListener != null ) {
-        return mOnTouchUpListener.onTouchUp( event );
-      }
-    }
-    return true;
-  }
-
-  public interface OnTouchUpListener {
-    boolean onTouchUp( MotionEvent event );
-  }
-}
-
diff --git a/tileview/src/main/java/com/qozix/tileview/widgets/ScalingLayout.java b/tileview/src/main/java/com/qozix/tileview/widgets/ScalingLayout.java
deleted file mode 100644
index a22edf1..0000000
--- a/tileview/src/main/java/com/qozix/tileview/widgets/ScalingLayout.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.qozix.tileview.widgets;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.qozix.tileview.geom.FloatMathHelper;
-
-public class ScalingLayout extends ViewGroup {
-
-	private float mScale = 1;
-
-  /**
-   *
-   * @param context
-   */
-  public ScalingLayout( Context context ) {
-		super( context );
-		setWillNotDraw( false );
-
-
-
-	}
-
-  /**
-   *
-   * @param scale
-   */
-	public void setScale( float scale ) {
-		mScale = scale;
-    invalidate();
-	}
-
-  /**
-   *
-   * @return
-   */
-	public float getScale() {
-		return mScale;
-	}
-
-  /*
-   * When scaling a canvas, as happens in onDraw, the clip area will be reduced at a small scale,
-   * thus decreasing the drawable surface, but when scaled up, the canvas is still constrained
-   * by the original width and height of the backing bitmap, which are not scaled.  Offset those
-   * by dividing the measure and layout dimensions by the current scale.
-   */
-
-	@Override
-	protected void onMeasure( int widthMeasureSpec, int heightMeasureSpec ) {
-    int availableWidth = FloatMathHelper.unscale( MeasureSpec.getSize( widthMeasureSpec ), mScale );
-    int availableHeight = FloatMathHelper.unscale( MeasureSpec.getSize( heightMeasureSpec ), mScale );
-    // the container's children should be the size provided by setSize
-    // don't use measureChildren because that grabs the child's LayoutParams
-    int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec( availableWidth, MeasureSpec.EXACTLY );
-    int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( availableHeight, MeasureSpec.EXACTLY );
-    for( int i = 0; i < getChildCount(); i++){
-      View child = getChildAt( i );
-      child.measure( childWidthMeasureSpec, childHeightMeasureSpec );
-    }
-		setMeasuredDimension( availableWidth, availableHeight );
-	}
-
-  @Override
-  protected void onLayout( boolean changed, int l, int t, int r, int b ) {
-    int availableWidth = FloatMathHelper.unscale( r - l, mScale );
-    int availableHeight = FloatMathHelper.unscale( b - t, mScale );
-    for( int i = 0; i < getChildCount(); i++ ) {
-      View child = getChildAt( i );
-      if( child.getVisibility() != GONE ) {
-        child.layout( 0, 0, availableWidth, availableHeight );
-      }
-    }
-  }
-
-  @Override
-  public void onDraw( Canvas canvas ) {
-    canvas.scale( mScale, mScale );
-    super.onDraw( canvas );
-  }
-
-}
\ No newline at end of file
diff --git a/tileview/src/main/java/com/qozix/tileview/widgets/ZoomPanLayout.java b/tileview/src/main/java/com/qozix/tileview/widgets/ZoomPanLayout.java
deleted file mode 100644
index 84e7f2c..0000000
--- a/tileview/src/main/java/com/qozix/tileview/widgets/ZoomPanLayout.java
+++ /dev/null
@@ -1,992 +0,0 @@
-package com.qozix.tileview.widgets;
-
-import android.animation.Animator;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Interpolator;
-import android.widget.Scroller;
-
-import androidx.core.view.ViewCompat;
-
-import com.qozix.tileview.geom.FloatMathHelper;
-import com.qozix.tileview.view.TouchUpGestureDetector;
-
-import java.lang.ref.WeakReference;
-import java.util.HashSet;
-
-/**
- * ZoomPanLayout extends ViewGroup to provide support for scrolling and zooming.
- * Fling, drag, pinch and double-tap events are supported natively.
- * <p>
- * Children of ZoomPanLayout are laid out to the sizes provided by setSize,
- * and will always be positioned at 0,0.
- */
-
-public class ZoomPanLayout extends ViewGroup implements
-        GestureDetector.OnGestureListener,
-        GestureDetector.OnDoubleTapListener,
-        ScaleGestureDetector.OnScaleGestureListener,
-        TouchUpGestureDetector.OnTouchUpListener {
-
-    private static final int DEFAULT_ZOOM_PAN_ANIMATION_DURATION = 400;
-
-    private int mBaseWidth;
-    private int mBaseHeight;
-    private int mScaledWidth;
-    private int mScaledHeight;
-
-    private float mScale = 1;
-
-    private float mMinScale = 0;
-    private float mMaxScale = 1;
-
-    private int mOffsetX;
-    private int mOffsetY;
-
-    private float mEffectiveMinScale = 0;
-    private boolean mShouldLoopScale = true;
-
-    private boolean mIsFlinging;
-    private boolean mIsDragging;
-    private boolean mIsScaling;
-    private boolean mIsSliding;
-
-    private int mAnimationDuration = DEFAULT_ZOOM_PAN_ANIMATION_DURATION;
-
-    private HashSet<ZoomPanListener> mZoomPanListeners = new HashSet<ZoomPanListener>();
-
-    private Scroller mScroller;
-    private ZoomPanAnimator mZoomPanAnimator;
-
-    private ScaleGestureDetector mScaleGestureDetector;
-    private GestureDetector mGestureDetector;
-    private TouchUpGestureDetector mTouchUpGestureDetector;
-    private MinimumScaleMode mMinimumScaleMode = MinimumScaleMode.FILL;
-
-
-    /**
-     * Constructor to use when creating a ZoomPanLayout from code.
-     *
-     * @param context The Context the ZoomPanLayout is running in, through which it can access the current theme, resources, etc.
-     */
-    public ZoomPanLayout(Context context) {
-        this(context, null);
-    }
-
-    public ZoomPanLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public ZoomPanLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        setWillNotDraw(false);
-        setClipChildren(false);
-        mScroller = new Scroller(context);
-        mGestureDetector = new GestureDetector(context, this);
-        mScaleGestureDetector = new ScaleGestureDetector(context, this);
-        mTouchUpGestureDetector = new TouchUpGestureDetector(this);
-    }
-
-//    public void setOuterDoubleTapListener(GestureDetector.OnDoubleTapListener outerDoubleTapListener) {
-//        mOuterDoubleTapListener = outerDoubleTapListener;
-//    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        // the container's children should be the size provided by setSize
-        // don't use measureChildren because that grabs the child's LayoutParams
-        int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(mScaledWidth, MeasureSpec.EXACTLY);
-        int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(mScaledHeight, MeasureSpec.EXACTLY);
-        for (int i = 0; i < getChildCount(); i++) {
-            View child = getChildAt(i);
-            child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
-        }
-        // but the layout itself should report normal (on screen) dimensions
-        int width = MeasureSpec.getSize(widthMeasureSpec);
-        int height = MeasureSpec.getSize(heightMeasureSpec);
-        width = resolveSize(width, widthMeasureSpec);
-        height = resolveSize(height, heightMeasureSpec);
-        setMeasuredDimension(width, height);
-    }
-
-    /*
-    ZoomPanChildren will always be laid out with the scaled dimenions - what is visible during
-    scroll operations.  Thus, a RelativeLayout added as a child that had views within it using
-    rules like ALIGN_PARENT_RIGHT would function as expected; similarly, an ImageView would be
-    stretched between the visible edges.
-    If children further operate on scale values, that should be accounted for
-    in the child's logic (see ScalingLayout).
-     */
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = getWidth();
-        final int height = getHeight();
-
-        mOffsetX = mScaledWidth >= width ? 0 : width / 2 - mScaledWidth / 2;
-        mOffsetY = mScaledHeight >= height ? 0 : height / 2 - mScaledHeight / 2;
-
-        for (int i = 0; i < getChildCount(); i++) {
-            View child = getChildAt(i);
-            if (child.getVisibility() != GONE) {
-                child.layout(mOffsetX, mOffsetY, mScaledWidth + mOffsetX, mScaledHeight + mOffsetY);
-            }
-        }
-        calculateMinimumScaleToFit();
-        constrainScrollToLimits();
-    }
-
-    /**
-     * Determines whether the ZoomPanLayout should limit it's minimum scale to no less than what
-     * would be required to fill it's container.
-     *
-     * @param shouldScaleToFit True to limit minimum scale, false to allow arbitrary minimum scale.
-     */
-    public void setShouldScaleToFit(boolean shouldScaleToFit) {
-        setMinimumScaleMode(shouldScaleToFit ? MinimumScaleMode.FILL : MinimumScaleMode.NONE);
-    }
-
-    /**
-     * Sets the minimum scale mode
-     *
-     * @param minimumScaleMode The minimum scale mode
-     */
-    public void setMinimumScaleMode(MinimumScaleMode minimumScaleMode) {
-        mMinimumScaleMode = minimumScaleMode;
-        calculateMinimumScaleToFit();
-    }
-
-    /**
-     * Determines whether the ZoomPanLayout should go back to minimum scale after a double-tap at
-     * maximum scale.
-     *
-     * @param shouldLoopScale True to allow going back to minimum scale, false otherwise.
-     */
-    public void setShouldLoopScale(boolean shouldLoopScale) {
-        mShouldLoopScale = shouldLoopScale;
-    }
-
-    /**
-     * Set minimum and maximum mScale values for this ZoomPanLayout.
-     * Note that if minimumScaleMode is set to {@link MinimumScaleMode#FIT} or {@link MinimumScaleMode#FILL}, the minimum value set here will be ignored
-     * Default values are 0 and 1.
-     *
-     * @param min Minimum scale the ZoomPanLayout should accept.
-     * @param max Maximum scale the ZoomPanLayout should accept.
-     */
-    public void setScaleLimits(float min, float max) {
-        mMinScale = min;
-        mMaxScale = max;
-        setScale(mScale);
-    }
-
-    /**
-     * Sets the size (width and height) of the ZoomPanLayout
-     * as it should be rendered at a scale of 1f (100%).
-     *
-     * @param width  Width of the underlying image, not the view or viewport.
-     * @param height Height of the underlying image, not the view or viewport.
-     */
-    public void setSize(int width, int height) {
-        mBaseWidth = width;
-        mBaseHeight = height;
-        updateScaledDimensions();
-        calculateMinimumScaleToFit();
-        constrainScrollToLimits();
-        requestLayout();
-    }
-
-    /**
-     * Returns the base (not scaled) width of the underlying composite image.
-     *
-     * @return The base (not scaled) width of the underlying composite image.
-     */
-    public int getBaseWidth() {
-        return mBaseWidth;
-    }
-
-    /**
-     * Returns the base (not scaled) height of the underlying composite image.
-     *
-     * @return The base (not scaled) height of the underlying composite image.
-     */
-    public int getBaseHeight() {
-        return mBaseHeight;
-    }
-
-    /**
-     * Returns the scaled width of the underlying composite image.
-     *
-     * @return The scaled width of the underlying composite image.
-     */
-    public int getScaledWidth() {
-        return mScaledWidth;
-    }
-
-    /**
-     * Returns the scaled height of the underlying composite image.
-     *
-     * @return The scaled height of the underlying composite image.
-     */
-    public int getScaledHeight() {
-        return mScaledHeight;
-    }
-
-    /**
-     * Retrieves the current scale of the ZoomPanLayout.
-     *
-     * @return The current scale of the ZoomPanLayout.
-     */
-    public float getScale() {
-        return mScale;
-    }
-
-    /**
-     * Sets the scale (0-1) of the ZoomPanLayout.
-     *
-     * @param scale The new value of the ZoomPanLayout scale.
-     */
-    public void setScale(float scale) {
-        scale = getConstrainedDestinationScale(scale);
-        if (mScale != scale) {
-            float previous = mScale;
-            mScale = scale;
-            updateScaledDimensions();
-            constrainScrollToLimits();
-            onScaleChanged(scale, previous);
-            invalidate();
-        }
-    }
-
-    /**
-     * Returns the horizontal distance children are offset if the content is scaled smaller than width.
-     *
-     * @return
-     */
-    public int getOffsetX() {
-        return mOffsetX;
-    }
-
-    /**
-     * Return the vertical distance children are offset if the content is scaled smaller than height.
-     *
-     * @return
-     */
-    public int getOffsetY() {
-        return mOffsetY;
-    }
-
-    /**
-     * Returns whether the ZoomPanLayout is currently being flung.
-     *
-     * @return true if the ZoomPanLayout is currently flinging, false otherwise.
-     */
-    public boolean isFlinging() {
-        return mIsFlinging;
-    }
-
-    /**
-     * Returns whether the ZoomPanLayout is currently being dragged.
-     *
-     * @return true if the ZoomPanLayout is currently dragging, false otherwise.
-     */
-    public boolean isDragging() {
-        return mIsDragging;
-    }
-
-    /**
-     * Returns whether the ZoomPanLayout is currently operating a scroll tween.
-     *
-     * @return True if the ZoomPanLayout is currently scrolling, false otherwise.
-     */
-    public boolean isSliding() {
-        return mIsSliding;
-    }
-
-    /**
-     * Returns whether the ZoomPanLayout is currently operating a scale tween.
-     *
-     * @return True if the ZoomPanLayout is currently scaling, false otherwise.
-     */
-    public boolean isScaling() {
-        return mIsScaling;
-    }
-
-    /**
-     * Returns the Scroller instance used to manage dragging and flinging.
-     *
-     * @return The Scroller instance use to manage dragging and flinging.
-     */
-    public Scroller getScroller() {
-        return mScroller;
-    }
-
-    /**
-     * Returns the duration zoom and pan animations will use.
-     *
-     * @return The duration zoom and pan animations will use.
-     */
-    public int getAnimationDuration() {
-        return mAnimationDuration;
-    }
-
-    /**
-     * Set the duration zoom and pan animation will use.
-     *
-     * @param animationDuration The duration animations will use.
-     */
-    public void setAnimationDuration(int animationDuration) {
-        mAnimationDuration = animationDuration;
-        if (mZoomPanAnimator != null) {
-            mZoomPanAnimator.setDuration(mAnimationDuration);
-        }
-    }
-
-    /**
-     * Adds a ZoomPanListener to the ZoomPanLayout, which will receive notification of actions
-     * relating to zoom and pan events.
-     *
-     * @param zoomPanListener ZoomPanListener implementation to add.
-     * @return True when the listener set did not already contain the Listener, false otherwise.
-     */
-    public boolean addZoomPanListener(ZoomPanListener zoomPanListener) {
-        return mZoomPanListeners.add(zoomPanListener);
-    }
-
-    /**
-     * Removes a ZoomPanListener from the ZoomPanLayout
-     *
-     * @param listener ZoomPanListener to remove.
-     * @return True if the Listener was removed, false otherwise.
-     */
-    public boolean removeZoomPanListener(ZoomPanListener listener) {
-        return mZoomPanListeners.remove(listener);
-    }
-
-    /**
-     * Scrolls and centers the ZoomPanLayout to the x and y values provided.
-     *
-     * @param x Horizontal destination point.
-     * @param y Vertical destination point.
-     */
-    public void scrollToAndCenter(int x, int y) {
-        scrollTo(x - getHalfWidth(), y - getHalfHeight());
-    }
-
-    /**
-     * Set the scale of the ZoomPanLayout while maintaining the current center point.
-     *
-     * @param scale The new value of the ZoomPanLayout scale.
-     */
-    public void setScaleFromCenter(float scale) {
-        setScaleFromPosition(getHalfWidth(), getHalfHeight(), scale);
-    }
-
-    /**
-     * Scrolls the ZoomPanLayout to the x and y values provided using scrolling animation.
-     *
-     * @param x Horizontal destination point.
-     * @param y Vertical destination point.
-     */
-    public void slideTo(int x, int y) {
-        getAnimator().animatePan(x, y);
-    }
-
-    /**
-     * Scrolls and centers the ZoomPanLayout to the x and y values provided using scrolling animation.
-     *
-     * @param x Horizontal destination point.
-     * @param y Vertical destination point.
-     */
-    public void slideToAndCenter(int x, int y) {
-        slideTo(x - getHalfWidth(), y - getHalfHeight());
-    }
-
-    /**
-     * Animates the ZoomPanLayout to the scale provided, and centers the viewport to the position
-     * supplied.
-     *
-     * @param x     Horizontal destination point.
-     * @param y     Vertical destination point.
-     * @param scale The final scale value the ZoomPanLayout should animate to.
-     */
-    public void slideToAndCenterWithScale(int x, int y, float scale) {
-        getAnimator().animateZoomPan(x - getHalfWidth(), y - getHalfHeight(), scale);
-    }
-
-    /**
-     * Scales the ZoomPanLayout with animated progress, without maintaining scroll position.
-     *
-     * @param destination The final scale value the ZoomPanLayout should animate to.
-     */
-    public void smoothScaleTo(float destination) {
-        getAnimator().animateZoom(destination);
-    }
-
-    /**
-     * Animates the ZoomPanLayout to the scale provided, while maintaining position determined by
-     * the focal point provided.
-     *
-     * @param focusX The horizontal focal point to maintain, relative to the screen (as supplied by MotionEvent.getX).
-     * @param focusY The vertical focal point to maintain, relative to the screen (as supplied by MotionEvent.getY).
-     * @param scale  The final scale value the ZoomPanLayout should animate to.
-     */
-    public void smoothScaleFromFocalPoint(int focusX, int focusY, float scale) {
-        scale = getConstrainedDestinationScale(scale);
-        if (scale == mScale) {
-            return;
-        }
-        int x = getOffsetScrollXFromScale(focusX, scale, mScale);
-        int y = getOffsetScrollYFromScale(focusY, scale, mScale);
-        getAnimator().animateZoomPan(x, y, scale);
-    }
-
-    /**
-     * Animate the scale of the ZoomPanLayout while maintaining the current center point.
-     *
-     * @param scale The final scale value the ZoomPanLayout should animate to.
-     */
-    public void smoothScaleFromCenter(float scale) {
-        smoothScaleFromFocalPoint(getHalfWidth(), getHalfHeight(), scale);
-    }
-
-    /**
-     * Provide this method to be overriden by subclasses, e.g., onScrollChanged.
-     */
-    public void onScaleChanged(float currentScale, float previousScale) {
-        // noop
-    }
-
-    private float getConstrainedDestinationScale(float scale) {
-        scale = Math.max(scale, mEffectiveMinScale);
-        scale = Math.min(scale, mMaxScale);
-        return scale;
-    }
-
-    private void constrainScrollToLimits() {
-        int x = getScrollX();
-        int y = getScrollY();
-        int constrainedX = getConstrainedScrollX(x);
-        int constrainedY = getConstrainedScrollY(y);
-        if (x != constrainedX || y != constrainedY) {
-            scrollTo(constrainedX, constrainedY);
-        }
-    }
-
-    private void updateScaledDimensions() {
-        mScaledWidth = FloatMathHelper.scale(mBaseWidth, mScale);
-        mScaledHeight = FloatMathHelper.scale(mBaseHeight, mScale);
-    }
-
-    protected ZoomPanAnimator getAnimator() {
-        if (mZoomPanAnimator == null) {
-            mZoomPanAnimator = new ZoomPanAnimator(this);
-            mZoomPanAnimator.setDuration(mAnimationDuration);
-        }
-        return mZoomPanAnimator;
-    }
-
-    private int getOffsetScrollXFromScale(int offsetX, float destinationScale, float currentScale) {
-        int scrollX = getScrollX() + offsetX;
-        float deltaScale = destinationScale / currentScale;
-        return (int) (scrollX * deltaScale) - offsetX;
-    }
-
-    private int getOffsetScrollYFromScale(int offsetY, float destinationScale, float currentScale) {
-        int scrollY = getScrollY() + offsetY;
-        float deltaScale = destinationScale / currentScale;
-        return (int) (scrollY * deltaScale) - offsetY;
-    }
-
-    public void setScaleFromPosition(int offsetX, int offsetY, float scale) {
-        scale = getConstrainedDestinationScale(scale);
-        if (scale == mScale) {
-            return;
-        }
-        int x = getOffsetScrollXFromScale(offsetX, scale, mScale);
-        int y = getOffsetScrollYFromScale(offsetY, scale, mScale);
-
-        setScale(scale);
-
-        x = getConstrainedScrollX(x);
-        y = getConstrainedScrollY(y);
-
-        scrollTo(x, y);
-    }
-
-    @Override
-    public boolean canScrollHorizontally(int direction) {
-        int position = getScrollX();
-        return direction > 0 ? position < getScrollLimitX() : direction < 0 && position > 0;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        boolean gestureIntercept = mGestureDetector.onTouchEvent(event);
-        boolean scaleIntercept = mScaleGestureDetector.onTouchEvent(event);
-        boolean touchIntercept = mTouchUpGestureDetector.onTouchEvent(event);
-        return gestureIntercept || scaleIntercept || touchIntercept || super.onTouchEvent(event);
-    }
-
-    @Override
-    public void scrollTo(int x, int y) {
-        x = getConstrainedScrollX(x);
-        y = getConstrainedScrollY(y);
-        super.scrollTo(x, y);
-    }
-
-    private void calculateMinimumScaleToFit() {
-        float minimumScaleX = getWidth() / (float) mBaseWidth;
-        float minimumScaleY = getHeight() / (float) mBaseHeight;
-        float recalculatedMinScale = calculatedMinScale(minimumScaleX, minimumScaleY);
-        if (recalculatedMinScale != mEffectiveMinScale) {
-            mEffectiveMinScale = recalculatedMinScale;
-            if (mScale < mEffectiveMinScale) {
-                setScale(mEffectiveMinScale);
-            }
-        }
-    }
-
-    private float calculatedMinScale(float minimumScaleX, float minimumScaleY) {
-        switch (mMinimumScaleMode) {
-            case FILL:
-                return Math.max(minimumScaleX, minimumScaleY);
-            case FIT:
-                return Math.min(minimumScaleX, minimumScaleY);
-        }
-
-        return mMinScale;
-    }
-
-    protected int getHalfWidth() {
-        return FloatMathHelper.scale(getWidth(), 0.5f);
-    }
-
-    protected int getHalfHeight() {
-        return FloatMathHelper.scale(getHeight(), 0.5f);
-    }
-
-    private int getConstrainedScrollX(int x) {
-        return Math.max(0, Math.min(x, getScrollLimitX()));
-    }
-
-    private int getConstrainedScrollY(int y) {
-        return Math.max(0, Math.min(y, getScrollLimitY()));
-    }
-
-    private int getScrollLimitX() {
-        return mScaledWidth - getWidth();
-    }
-
-    private int getScrollLimitY() {
-        return mScaledHeight - getHeight();
-    }
-
-    @Override
-    public void computeScroll() {
-        if (mScroller.computeScrollOffset()) {
-            int startX = getScrollX();
-            int startY = getScrollY();
-            int endX = getConstrainedScrollX(mScroller.getCurrX());
-            int endY = getConstrainedScrollY(mScroller.getCurrY());
-            if (startX != endX || startY != endY) {
-                scrollTo(endX, endY);
-                if (mIsFlinging) {
-                    broadcastFlingUpdate();
-                }
-            }
-            if (mScroller.isFinished()) {
-                if (mIsFlinging) {
-                    mIsFlinging = false;
-                    broadcastFlingEnd();
-                }
-            } else {
-                ViewCompat.postInvalidateOnAnimation(this);
-            }
-        }
-    }
-
-    private void broadcastDragBegin() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanBegin(getScrollX(), getScrollY(), ZoomPanListener.Origination.DRAG);
-        }
-    }
-
-    private void broadcastDragUpdate() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanUpdate(getScrollX(), getScrollY(), ZoomPanListener.Origination.DRAG);
-        }
-    }
-
-    private void broadcastDragEnd() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanEnd(getScrollX(), getScrollY(), ZoomPanListener.Origination.DRAG);
-        }
-    }
-
-    private void broadcastFlingBegin() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanBegin(mScroller.getStartX(), mScroller.getStartY(), ZoomPanListener.Origination.FLING);
-        }
-    }
-
-    private void broadcastFlingUpdate() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanUpdate(mScroller.getCurrX(), mScroller.getCurrY(), ZoomPanListener.Origination.FLING);
-        }
-    }
-
-    private void broadcastFlingEnd() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanEnd(mScroller.getFinalX(), mScroller.getFinalY(), ZoomPanListener.Origination.FLING);
-        }
-    }
-
-    private void broadcastProgrammaticPanBegin() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanBegin(getScrollX(), getScrollY(), null);
-        }
-    }
-
-    private void broadcastProgrammaticPanUpdate() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanUpdate(getScrollX(), getScrollY(), null);
-        }
-    }
-
-    private void broadcastProgrammaticPanEnd() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onPanEnd(getScrollX(), getScrollY(), null);
-        }
-    }
-
-    private void broadcastPinchBegin() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onZoomBegin(mScale, ZoomPanListener.Origination.PINCH);
-        }
-    }
-
-    private void broadcastPinchUpdate() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onZoomUpdate(mScale, ZoomPanListener.Origination.PINCH);
-        }
-    }
-
-    private void broadcastPinchEnd() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onZoomEnd(mScale, ZoomPanListener.Origination.PINCH);
-        }
-    }
-
-    private void broadcastProgrammaticZoomBegin() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onZoomBegin(mScale, null);
-        }
-    }
-
-    private void broadcastProgrammaticZoomUpdate() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onZoomUpdate(mScale, null);
-        }
-    }
-
-    private void broadcastProgrammaticZoomEnd() {
-        for (ZoomPanListener listener : mZoomPanListeners) {
-            listener.onZoomEnd(mScale, null);
-        }
-    }
-
-    @Override
-    public boolean onDown(MotionEvent event) {
-        if (mIsFlinging && !mScroller.isFinished()) {
-            mScroller.forceFinished(true);
-            mIsFlinging = false;
-            broadcastFlingEnd();
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onFling(MotionEvent event1, MotionEvent event2, float velocityX, float velocityY) {
-        mScroller.fling(getScrollX(), getScrollY(), (int) -velocityX, (int) -velocityY, 0, getScrollLimitX(), 0, getScrollLimitY());
-        mIsFlinging = true;
-        ViewCompat.postInvalidateOnAnimation(this);
-        broadcastFlingBegin();
-        return true;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent event) {
-
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        int scrollEndX = getScrollX() + (int) distanceX;
-        int scrollEndY = getScrollY() + (int) distanceY;
-        scrollTo(scrollEndX, scrollEndY);
-        if (!mIsDragging) {
-            mIsDragging = true;
-            broadcastDragBegin();
-        } else {
-            broadcastDragUpdate();
-        }
-        return true;
-    }
-
-    @Override
-    public void onShowPress(MotionEvent event) {
-
-    }
-
-    @Override
-    public boolean onSingleTapUp(MotionEvent event) {
-        return true;
-    }
-
-    @Override
-    public boolean onSingleTapConfirmed(MotionEvent event) {
-        return false;
-    }
-
-    @Override
-    public boolean onDoubleTap(MotionEvent event) {
-//        float destination = (float) (Math.pow(2, Math.floor(Math.log(mScale * 2) / Math.log(2))));
-//        float effectiveDestination = mShouldLoopScale && mScale >= mMaxScale ? mMinScale : destination;
-//        destination = getConstrainedDestinationScale(effectiveDestination);
-//        smoothScaleFromFocalPoint((int) event.getX(), (int) event.getY(), destination);
-        //if (mOuterDoubleTapListener != null) mOuterDoubleTapListener.onDoubleTap(event);
-        return true;
-    }
-
-    @Override
-    public boolean onDoubleTapEvent(MotionEvent event) {
-        return true;
-    }
-
-    @Override
-    public boolean onTouchUp(MotionEvent event) {
-        if (mIsDragging) {
-            mIsDragging = false;
-            if (!mIsFlinging) {
-                broadcastDragEnd();
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
-        mIsScaling = true;
-        broadcastPinchBegin();
-        return true;
-    }
-
-    @Override
-    public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
-        mIsScaling = false;
-        broadcastPinchEnd();
-    }
-
-    @Override
-    public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
-        float currentScale = mScale * mScaleGestureDetector.getScaleFactor();
-        setScaleFromPosition(
-                (int) scaleGestureDetector.getFocusX(),
-                (int) scaleGestureDetector.getFocusY(),
-                currentScale);
-        broadcastPinchUpdate();
-        return true;
-    }
-
-    public enum MinimumScaleMode {
-        /**
-         * Limit the minimum scale to no less than what
-         * would be required to fill the container
-         */
-        FILL,
-
-        /**
-         * Limit the minimum scale to no less than what
-         * would be required to fit inside the container
-         */
-        FIT,
-
-        /**
-         * Allow arbitrary minimum scale.
-         */
-        NONE
-    }
-
-    public interface ZoomPanListener {
-        void onPanBegin(int x, int y, Origination origin);
-
-        void onPanUpdate(int x, int y, Origination origin);
-
-        void onPanEnd(int x, int y, Origination origin);
-
-        void onZoomBegin(float scale, Origination origin);
-
-        void onZoomUpdate(float scale, Origination origin);
-
-        void onZoomEnd(float scale, Origination origin);
-
-        enum Origination {
-            DRAG,
-            FLING,
-            PINCH
-        }
-    }
-
-    private static class ZoomPanAnimator extends ValueAnimator implements
-            ValueAnimator.AnimatorUpdateListener,
-            ValueAnimator.AnimatorListener {
-
-        private WeakReference<ZoomPanLayout> mZoomPanLayoutWeakReference;
-        private ZoomPanState mStartState = new ZoomPanState();
-        private ZoomPanState mEndState = new ZoomPanState();
-        private boolean mHasPendingZoomUpdates;
-        private boolean mHasPendingPanUpdates;
-
-        public ZoomPanAnimator(ZoomPanLayout zoomPanLayout) {
-            super();
-            addUpdateListener(this);
-            addListener(this);
-            setFloatValues(0f, 1f);
-            setInterpolator(new FastEaseInInterpolator());
-            mZoomPanLayoutWeakReference = new WeakReference<ZoomPanLayout>(zoomPanLayout);
-        }
-
-        private boolean setupPanAnimation(int x, int y) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                mStartState.x = zoomPanLayout.getScrollX();
-                mStartState.y = zoomPanLayout.getScrollY();
-                mEndState.x = x;
-                mEndState.y = y;
-                return mStartState.x != mEndState.x || mStartState.y != mEndState.y;
-            }
-            return false;
-        }
-
-        private boolean setupZoomAnimation(float scale) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                mStartState.scale = zoomPanLayout.getScale();
-                mEndState.scale = scale;
-                return mStartState.scale != mEndState.scale;
-            }
-            return false;
-        }
-
-        public void animateZoomPan(int x, int y, float scale) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                mHasPendingZoomUpdates = setupZoomAnimation(scale);
-                mHasPendingPanUpdates = setupPanAnimation(x, y);
-                if (mHasPendingPanUpdates || mHasPendingZoomUpdates) {
-                    start();
-                }
-            }
-        }
-
-        public void animateZoom(float scale) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                mHasPendingZoomUpdates = setupZoomAnimation(scale);
-                if (mHasPendingZoomUpdates) {
-                    start();
-                }
-            }
-        }
-
-        public void animatePan(int x, int y) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                mHasPendingPanUpdates = setupPanAnimation(x, y);
-                if (mHasPendingPanUpdates) {
-                    start();
-                }
-            }
-        }
-
-        @Override
-        public void onAnimationUpdate(ValueAnimator animation) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                float progress = (float) animation.getAnimatedValue();
-                if (mHasPendingZoomUpdates) {
-                    float scale = mStartState.scale + (mEndState.scale - mStartState.scale) * progress;
-                    zoomPanLayout.setScale(scale);
-                    zoomPanLayout.broadcastProgrammaticZoomUpdate();
-                }
-                if (mHasPendingPanUpdates) {
-                    int x = (int) (mStartState.x + (mEndState.x - mStartState.x) * progress);
-                    int y = (int) (mStartState.y + (mEndState.y - mStartState.y) * progress);
-                    zoomPanLayout.scrollTo(x, y);
-                    zoomPanLayout.broadcastProgrammaticPanUpdate();
-                }
-            }
-        }
-
-        @Override
-        public void onAnimationStart(Animator animator) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                if (mHasPendingZoomUpdates) {
-                    zoomPanLayout.mIsScaling = true;
-                    zoomPanLayout.broadcastProgrammaticZoomBegin();
-                }
-                if (mHasPendingPanUpdates) {
-                    zoomPanLayout.mIsSliding = true;
-                    zoomPanLayout.broadcastProgrammaticPanBegin();
-                }
-            }
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animator) {
-            ZoomPanLayout zoomPanLayout = mZoomPanLayoutWeakReference.get();
-            if (zoomPanLayout != null) {
-                if (mHasPendingZoomUpdates) {
-                    mHasPendingZoomUpdates = false;
-                    zoomPanLayout.mIsScaling = false;
-                    zoomPanLayout.broadcastProgrammaticZoomEnd();
-                }
-                if (mHasPendingPanUpdates) {
-                    mHasPendingPanUpdates = false;
-                    zoomPanLayout.mIsSliding = false;
-                    zoomPanLayout.broadcastProgrammaticPanEnd();
-                }
-            }
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animator) {
-            onAnimationEnd(animator);
-        }
-
-        @Override
-        public void onAnimationRepeat(Animator animator) {
-
-        }
-
-        private static class ZoomPanState {
-            public int x;
-            public int y;
-            public float scale;
-        }
-
-        private static class FastEaseInInterpolator implements Interpolator {
-            @Override
-            public float getInterpolation(float input) {
-                return (float) (1 - Math.pow(1 - input, 8));
-            }
-        }
-    }
-}